Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/run/backend/BackendApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;

@EnableJpaAuditing
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

오 이거 좋다~

@SpringBootApplication
public class BackendApplication {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ public TokenResponse completeSignup(SignupRequest signupRequest, MultipartFile p
.age(signupRequest.age())
.oauthId(oauthId)
.oauthType(OAuthType.valueOf(providerName.toUpperCase()))
.role(Role.USER)
.profileImage(profileImageName)
.build();
memberRepository.save(newMember);
Expand Down
59 changes: 59 additions & 0 deletions src/main/java/run/backend/domain/crew/entity/Crew.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package run.backend.domain.crew.entity;

import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import run.backend.global.common.BaseEntity;

import java.math.BigDecimal;
import java.util.UUID;

@Entity
@Getter
@Table(name = "crews")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Crew extends BaseEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

private String name;

private String description;

private String image;

@Column(name = "invite_code")
private String inviteCode;

@Column(name = "member_count")
private Long memberCount;

@Column(name = "monthly_distance_total")
private BigDecimal monthlyDistanceTotal;

@Column(name = "monthly_time_total")
private Long monthlyTimeTotal;

@Column(name = "monthly_score_total")
private BigDecimal monthlyScoreTotal;

@Builder
public Crew (
String name,
String description,
String image
) {
this.name = name;
this.description = description;
this.image = image;
this.inviteCode = UUID.randomUUID().toString();
this.memberCount = 1L;
this.monthlyDistanceTotal = BigDecimal.ZERO;
this.monthlyTimeTotal = 0L;
this.monthlyScoreTotal = BigDecimal.ZERO;
}
}
60 changes: 60 additions & 0 deletions src/main/java/run/backend/domain/crew/entity/JoinCrew.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package run.backend.domain.crew.entity;

import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import run.backend.domain.crew.enums.JoinStatus;
import run.backend.domain.member.entity.Member;
import run.backend.domain.member.enums.Role;
import run.backend.global.common.BaseEntity;

import java.time.LocalDate;


@Entity
@Getter
@Table(name = "join_crews")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class JoinCrew extends BaseEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Enumerated(EnumType.STRING)
@Column(name = "join_status")
private JoinStatus joinStatus;

@Enumerated(EnumType.STRING)
@Column(name = "crew_role")
private Role role;

@Column(name = "joined_date")
private LocalDate joinedDate;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "member_id")
private Member member;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "crew_id")
private Crew crew;

void approveJoin() {
this.role = Role.MEMBER;
this.joinedDate = LocalDate.now();
this.joinStatus = JoinStatus.APPROVED;
}

@Builder
public JoinCrew(
Member member,
Crew crew
) {
this.crew = crew;
this.member = member;
this.joinStatus = JoinStatus.APPLIED;
}
}

This file was deleted.

16 changes: 16 additions & 0 deletions src/main/java/run/backend/domain/crew/enums/JoinStatus.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package run.backend.domain.crew.enums;

import lombok.Getter;

@Getter
public enum JoinStatus {

APPLIED("가입 요청"),
APPROVED("가입 승인");

private final String description;

JoinStatus(String description) {
this.description = description;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import run.backend.domain.crew.dto.request.CrewInfoRequest;
import run.backend.domain.crew.dto.response.*;
import run.backend.domain.crew.enumerate.CrewMemberRole;
import run.backend.domain.member.enums.Role;

import java.time.YearMonth;

Expand All @@ -20,7 +20,7 @@ public interface CrewService {

CrewMemberResponse getCrewMemberProfile(Long crewId);

void updateCrewMemberRole(Long memberId, CrewMemberRole crewMemberRole);
void updateCrewMemberRole(Long memberId, Role role);

CrewSearchResponse getRankCrew();
}
79 changes: 79 additions & 0 deletions src/main/java/run/backend/domain/event/entity/Event.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
package run.backend.domain.event.entity;

import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import run.backend.domain.crew.entity.Crew;
import run.backend.domain.member.entity.Member;
import run.backend.domain.record.entity.CrewRecord;
import run.backend.global.common.BaseEntity;

import java.time.LocalDate;
import java.time.LocalTime;


@Entity
@Getter
@Table(name = "events")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Event extends BaseEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

private String title;

private LocalDate date;

@Column(name = "start_time")
private LocalTime startTime;

@Column(name = "end_time")
private LocalTime endTime;

private String place;

@Column(name = "expected_participants")
private Long expectedParticipants;

@Column(name = "actual_participants")
private Long actualParticipants;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "crew_id")
private Crew crew;

@OneToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "record_id")
private CrewRecord record;

@OneToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "running_captain")
private Member member;

@Builder
public Event(
String title,
LocalDate date,
LocalTime startTime,
LocalTime endTime,
String place,
Crew crew,
CrewRecord record,
Member member
) {
this.title = title;
this.date = date;
this.startTime = startTime;
this.endTime = endTime;
this.place = place;
this.expectedParticipants = 1L;
this.actualParticipants = 0L;
this.crew = crew;
this.record = record;
this.member = member;
}
}
40 changes: 40 additions & 0 deletions src/main/java/run/backend/domain/event/entity/JoinEvent.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package run.backend.domain.event.entity;

import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import run.backend.domain.member.entity.Member;

@Entity
@Getter
@Table(name = "join_events")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class JoinEvent {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Column(name = "is_running")
private boolean isRunning;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "member_id")
private Member member;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "event_id")
private Event event;

@Builder
public JoinEvent(
Member member,
Event event
) {
this.isRunning = false;
this.member = member;
this.event = event;
}
}
71 changes: 71 additions & 0 deletions src/main/java/run/backend/domain/event/entity/PeriodicEvent.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
package run.backend.domain.event.entity;

import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import run.backend.domain.crew.entity.Crew;
import run.backend.domain.event.enums.RepeatCycle;
import run.backend.domain.event.enums.WeekDay;
import run.backend.global.common.BaseEntity;

import java.time.LocalDate;
import java.time.LocalTime;

@Entity
@Getter
@Table(name = "periodic_events")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class PeriodicEvent extends BaseEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

private String title;

@Column(name = "base_date")
private LocalDate baseDate;

@Enumerated(EnumType.STRING)
@Column(name = "repeat_cycle")
private RepeatCycle repeatCycle;

@Enumerated(EnumType.STRING)
@Column(name = "repeat_days")
private WeekDay repeatDays;

@Column(name = "start_time")
private LocalTime startTime;

@Column(name = "end_time")
private LocalTime endTime;

private String place;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "crew_id")
private Crew crew;

@Builder
public PeriodicEvent(
String title,
LocalDate baseDate,
RepeatCycle repeatCycle,
WeekDay repeatDays,
LocalTime startTime,
LocalTime endTime,
String place,
Crew crew
) {
this.title = title;
this.baseDate = baseDate;
this.repeatCycle = repeatCycle;
this.repeatDays = repeatDays;
this.startTime = startTime;
this.endTime = endTime;
this.place = place;
this.crew = crew;
}
}
16 changes: 16 additions & 0 deletions src/main/java/run/backend/domain/event/enums/RepeatCycle.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package run.backend.domain.event.enums;

import lombok.Getter;

@Getter
public enum RepeatCycle {

NONE("주기 없음"),
WEEKLY("1주 마다");

private final String description;

RepeatCycle(String description) {
this.description = description;
}
}
Loading