Merge branch 'develop' into feat/FU-346-daily-schedule-api

src/main/java/com/foru/freebe/auth/service/KakaoUnlinkService.java

@@ -13,6 +13,7 @@
 import org.springframework.web.reactive.function.client.WebClientException;
 
 import com.foru.freebe.auth.dto.UnlinkRequest;
+import com.foru.freebe.schedule.service.BaseScheduleService;
 import com.foru.freebe.errors.errorcode.MemberErrorCode;
 import com.foru.freebe.errors.exception.RestApiException;
 import com.foru.freebe.jwt.service.JwtService;
@@ -45,6 +46,7 @@ public class KakaoUnlinkService {
     private final DeletedMemberRepository deletedMemberRepository;
     private final PhotographerNoticeService photographerNoticeService;
     private final JwtService jwtService;
+    private final BaseScheduleService baseScheduleService;
 
     @Value("${KAKAO_API_ADMIN_KEY}")
     private String adminKey;
@@ -81,6 +83,7 @@ private void deleteInfoOfPhotographer(Member member) {
             deletePhotographerProducts(member);
             photographerNoticeService.deleteAllNotices(member);
             photographerProfileService.deleteProfile(member);
+            baseScheduleService.deleteBaseSchedule(member);
         }
     }
 

src/main/java/com/foru/freebe/member/entity/Member.java

@@ -51,6 +51,17 @@ public class Member extends BaseEntity {
 
     private String instagramId;
 
+    @Enumerated(EnumType.STRING)
+    private ScheduleUnit scheduleUnit;
+
+    public void initializeScheduleUnit() {
+        this.scheduleUnit = ScheduleUnit.SIXTY_MINUTES;
+    }
+
+    public void updateScheduleUnit(ScheduleUnit scheduleUnit) {
+        this.scheduleUnit = scheduleUnit;
+    }
+
     public void assignRole(Role role) {
         this.role = role;
     }

src/main/java/com/foru/freebe/member/entity/ScheduleUnit.java

@@ -0,0 +1,11 @@
+package com.foru.freebe.member.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public enum ScheduleUnit {
+
+    @JsonProperty("THIRTY_MINUTES")
+    THIRTY_MINUTES,
+    @JsonProperty("SIXTY_MINUTES")
+    SIXTY_MINUTES
+}

src/main/java/com/foru/freebe/member/service/PhotographerJoinService.java

@@ -4,6 +4,7 @@
 
 import com.foru.freebe.auth.model.ServiceTermsAgreement;
 import com.foru.freebe.auth.service.KakaoAuthService;
+import com.foru.freebe.schedule.service.BaseScheduleService;
 import com.foru.freebe.member.dto.PhotographerJoinRequest;
 import com.foru.freebe.member.entity.Member;
 import com.foru.freebe.member.entity.MemberTermAgreement;
@@ -23,6 +24,7 @@ public class PhotographerJoinService {
     private final MemberRepository memberRepository;
     private final MemberTermAgreementRepository memberTermAgreementRepository;
     private final KakaoAuthService kakaoAuthService;
+    private final BaseScheduleService baseScheduleService;
 
     @Transactional
     public String joinPhotographer(Member member, PhotographerJoinRequest request) {
@@ -33,9 +35,16 @@ public String joinPhotographer(Member member, PhotographerJoinRequest request) {
         Profile profile = profileService.initialProfileSetting(photographer, request.getProfileName(),
             request.getContact());
 
+        initializeScheduleInfo(photographer);
+
         return profile.getProfileName();
     }
 
+    private void initializeScheduleInfo(Member photographer) {
+        baseScheduleService.createDefaultSchedule(photographer);
+        photographer.initializeScheduleUnit();
+    }
+
     private Member completePhotographerSignup(Member member) {
         member.assignRole(Role.PHOTOGRAPHER);
         return memberRepository.save(member);

src/main/java/com/foru/freebe/schedule/controller/BaseScheduleController.java

@@ -0,0 +1,95 @@
+package com.foru.freebe.schedule.controller;
+
+import java.util.List;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.foru.freebe.auth.model.MemberAdapter;
+import com.foru.freebe.schedule.dto.BaseScheduleDto;
+import com.foru.freebe.schedule.dto.ScheduleUnitDto;
+import com.foru.freebe.schedule.service.BaseScheduleService;
+import com.foru.freebe.common.dto.ResponseBody;
+import com.foru.freebe.member.entity.Member;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/photographer")
+public class BaseScheduleController {
+
+    private final BaseScheduleService baseScheduleService;
+
+    @GetMapping("/schedule/base")
+    public ResponseEntity<ResponseBody<List<BaseScheduleDto>>> getBaseSchedules(
+        @AuthenticationPrincipal MemberAdapter memberAdapter) {
+        Member photographer = memberAdapter.getMember();
+        List<BaseScheduleDto> responseData = baseScheduleService.getBaseSchedules(photographer.getId());
+
+        ResponseBody<List<BaseScheduleDto>> responseBody = ResponseBody
+            .<List<BaseScheduleDto>>builder()
+            .message("Successfully retrieve basic schedules.")
+            .data(responseData)
+            .build();
+
+        return ResponseEntity.status(HttpStatus.OK.value())
+            .body(responseBody);
+    }
+
+    @PutMapping("/schedule/base")
+    public ResponseEntity<ResponseBody<Void>> updateBaseSchedule(@AuthenticationPrincipal MemberAdapter memberAdapter,
+        @Valid @RequestBody List<BaseScheduleDto> request) {
+
+        Member photographer = memberAdapter.getMember();
+        baseScheduleService.updateBaseSchedule(request, photographer.getId());
+
+        ResponseBody<Void> responseBody = ResponseBody.<Void>builder()
+            .message("Basic schedule successfully changed")
+            .data(null)
+            .build();
+
+        return ResponseEntity.status(HttpStatus.OK.value())
+            .body(responseBody);
+    }
+
+    @GetMapping("/schedule/unit")
+    public ResponseEntity<ResponseBody<ScheduleUnitDto>> getScheduleUnit(
+        @AuthenticationPrincipal MemberAdapter memberAdapter) {
+
+        Member photographer = memberAdapter.getMember();
+        ScheduleUnitDto responseData = baseScheduleService.getScheduleUnit(photographer.getId());
+
+        ResponseBody<ScheduleUnitDto> responseBody = ResponseBody
+            .<ScheduleUnitDto>builder()
+            .message("Successfully retrieve schedule unit.")
+            .data(responseData)
+            .build();
+
+        return ResponseEntity.status(HttpStatus.OK.value())
+            .body(responseBody);
+    }
+
+
+    @PutMapping("/schedule/unit")
+    public ResponseEntity<ResponseBody<Void>> updateScheduleUnit(@Valid @RequestBody ScheduleUnitDto request, @AuthenticationPrincipal MemberAdapter memberAdapter) {
+
+        Member photographer = memberAdapter.getMember();
+        baseScheduleService.updateScheduleUnit(photographer.getId(), request);
+
+        ResponseBody<Void> responseBody = ResponseBody.<Void>builder()
+            .message("Schedule Unit successfully changed")
+            .data(null)
+            .build();
+
+        return ResponseEntity.status(HttpStatus.OK.value())
+            .body(responseBody);
+    }
+}

src/main/java/com/foru/freebe/schedule/dto/BaseScheduleDto.java

@@ -0,0 +1,37 @@
+package com.foru.freebe.schedule.dto;
+
+import java.time.LocalTime;
+
+import com.foru.freebe.schedule.entity.DayOfWeek;
+import com.foru.freebe.schedule.entity.OperationStatus;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class BaseScheduleDto {
+
+    @NotNull
+    private DayOfWeek dayOfWeek;
+
+    @NotNull
+    private LocalTime startTime;
+
+    @NotNull
+    private LocalTime endTime;
+
+    @NotNull
+    private OperationStatus operationStatus;
+
+    @Builder
+    public BaseScheduleDto(DayOfWeek dayOfWeek, LocalTime startTime, LocalTime endTime,
+        OperationStatus operationStatus) {
+        this.dayOfWeek = dayOfWeek;
+        this.startTime = startTime;
+        this.endTime = endTime;
+        this.operationStatus = operationStatus;
+    }
+}

src/main/java/com/foru/freebe/schedule/dto/ScheduleUnitDto.java

@@ -0,0 +1,19 @@
+package com.foru.freebe.schedule.dto;
+
+import com.foru.freebe.member.entity.ScheduleUnit;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class ScheduleUnitDto {
+
+    @NotNull
+    ScheduleUnit scheduleUnit;
+
+    public ScheduleUnitDto(ScheduleUnit scheduleUnit) {
+        this.scheduleUnit = scheduleUnit;
+    }
+}

src/main/java/com/foru/freebe/schedule/entity/BaseSchedule.java

@@ -0,0 +1,79 @@
+package com.foru.freebe.schedule.entity;
+
+
+import java.time.LocalTime;
+
+import com.foru.freebe.common.entity.BaseEntity;
+import com.foru.freebe.member.entity.Member;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.validation.constraints.NotNull;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+public class BaseSchedule extends BaseEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "base_schedule_id")
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "photographer_id")
+    @NotNull(message = "Photographer must not be null")
+    private Member photographer;
+
+    @NotNull(message = "DayOfWeek must not be null")
+    @Enumerated(EnumType.STRING)
+    private DayOfWeek dayOfWeek;
+
+    @NotNull(message = "Start time must not be null")
+    private LocalTime startTime;
+
+    @NotNull(message = "End time must not be null")
+    private LocalTime endTime;
+
+    @NotNull(message = "Operation status must not be null")
+    @Enumerated(EnumType.STRING)
+    private OperationStatus operationStatus;
+
+    public void updateScheduleTime(LocalTime startTime, LocalTime endTime, OperationStatus operationStatus) {
+        if (operationStatus == OperationStatus.INACTIVE) {
+            this.startTime = LocalTime.of(9,0,0);
+            this.endTime = LocalTime.of(18,0,0);
+        } else {
+            this.startTime = startTime;
+            this.endTime = endTime;
+        }
+        this.operationStatus = operationStatus;
+    }
+
+    public void initializeSchedule() {
+        this.startTime = LocalTime.of(9,0,0);
+        this.endTime = LocalTime.of(18,0,0);
+        this.operationStatus = OperationStatus.ACTIVE;
+    }
+
+    @Builder
+    public BaseSchedule(Member photographer, DayOfWeek dayOfWeek, LocalTime startTime, LocalTime endTime,
+        OperationStatus operationStatus) {
+        this.photographer = photographer;
+        this.dayOfWeek = dayOfWeek;
+        this.startTime = startTime;
+        this.endTime = endTime;
+        this.operationStatus = operationStatus;
+    }
+}

src/main/java/com/foru/freebe/schedule/entity/DayOfWeek.java

@@ -0,0 +1,12 @@
+package com.foru.freebe.schedule.entity;
+
+public enum DayOfWeek {
+
+    MONDAY,
+    TUESDAY,
+    WEDNESDAY,
+    THURSDAY,
+    FRIDAY,
+    SATURDAY,
+    SUNDAY;
+}

src/main/java/com/foru/freebe/schedule/entity/OperationStatus.java

@@ -0,0 +1,11 @@
+package com.foru.freebe.schedule.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public enum OperationStatus {
+
+    @JsonProperty("ACTIVE")
+    ACTIVE,
+    @JsonProperty("INACTIVE")
+    INACTIVE
+}

src/main/java/com/foru/freebe/schedule/repository/BaseScheduleRepository.java

@@ -0,0 +1,14 @@
+package com.foru.freebe.schedule.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.foru.freebe.schedule.entity.BaseSchedule;
+import com.foru.freebe.schedule.entity.DayOfWeek;
+
+public interface BaseScheduleRepository extends JpaRepository<BaseSchedule, Long> {
+    List<BaseSchedule> findByPhotographerId(Long photographerId);
+
+    BaseSchedule findByDayOfWeekAndPhotographerId(DayOfWeek dayOfWeek, Long photographerId);
+}