main <- develop

.github/workflows/cd-dev.yml

@@ -63,7 +63,7 @@ jobs:
         with:
           host: ${{ secrets.HOST_NAME }}
           username: ${{ secrets.USER_NAME }}
-          password: ${{ secrets.USER_PASSWORD }}
+          key: ${{ secrets.SSH_KEY }}
           port: ${{ secrets.PORT }}
           script: |
             docker pull ${{ secrets.DOCKER_USER }}/kodaero:latest

.github/workflows/cd.yml

@@ -63,7 +63,7 @@ jobs:
         with:
           host: ${{ secrets.HOST_NAME }}
           username: ${{ secrets.USER_NAME }}
-          password: ${{ secrets.USER_PASSWORD }}
+          key: ${{ secrets.SSH_KEY }}
           port: ${{ secrets.PORT }}
           script: |
             docker pull ${{ secrets.DOCKER_USER }}/kodaero:latest

.gitignore

@@ -40,3 +40,7 @@ out/
 
 ### 환경 변수 ###
 .env
+
+###claude###
+.claude
+.serena

src/main/java/devkor/com/teamcback/domain/ble/dto/response/BLEDeviceListRes.java

@@ -1,5 +1,6 @@
 package devkor.com.teamcback.domain.ble.dto.response;
 
+import devkor.com.teamcback.domain.place.entity.Place;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,11 +12,13 @@ public class BLEDeviceListRes {
     private String deviceName;
     private Long placeId;
     private Integer capacity;
+    private String imageUrl;
 
-    public BLEDeviceListRes(Long id, String deviceName, Long placeId, int capacity) {
+    public BLEDeviceListRes(Long id, String deviceName, Long placeId, int capacity, String imageUrl) {
         this.id = id;
         this.deviceName = deviceName;
         this.placeId = placeId;
         this.capacity = capacity;
+        this.imageUrl = imageUrl;
     }
 }

src/main/java/devkor/com/teamcback/domain/ble/service/BLEService.java

@@ -175,11 +175,13 @@ public List<BLEDeviceListRes> getBLEDeviceList() {
 
         for (BLEDevice device : devices) {
             Long placeId = null;
+            String imageUrl = null;
             if (device.getPlace() != null) {
                 placeId = device.getPlace().getId();
+                imageUrl = device.getPlace().getImageUrl();
             }
 
-            BLEDeviceListRes dto = new BLEDeviceListRes(device.getId(), device.getDeviceName(), placeId, device.getCapacity());
+            BLEDeviceListRes dto = new BLEDeviceListRes(device.getId(), device.getDeviceName(), placeId, device.getCapacity(), imageUrl);
 
             result.add(dto);
         }

src/main/java/devkor/com/teamcback/domain/bookmark/dto/response/CreateBookmarkRes.java

@@ -1,9 +1,6 @@
 package devkor.com.teamcback.domain.bookmark.dto.response;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import devkor.com.teamcback.domain.bookmark.entity.Bookmark;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Getter;
 
 @JsonIgnoreProperties
 public class CreateBookmarkRes {

src/main/java/devkor/com/teamcback/domain/bookmark/service/BookmarkService.java

@@ -45,7 +45,6 @@ public class BookmarkService {
      * 즐겨찾기 업데이트
      */
     @Transactional
-    @UpdateScore(addScore = 1)
     public CreateBookmarkRes createBookmark(Long userId, CreateBookmarkReq req) {
         User user = findUser(userId);
 

src/main/java/devkor/com/teamcback/domain/common/repository/FileRepository.java

@@ -1,12 +1,21 @@
 package devkor.com.teamcback.domain.common.repository;
 
 import devkor.com.teamcback.domain.common.entity.File;
+import devkor.com.teamcback.domain.review.repository.CustomFileRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
 
-public interface FileRepository extends JpaRepository<File, Long> {
+public interface FileRepository extends JpaRepository<File, Long>, CustomFileRepository {
     List<File> findAllByFileUuid(String fileUuid);
 
+    List<File> findTop10AllByFileUuidOrderBySortNumAsc(String fileUuid);
+
+    List<File> findTop5AllByFileUuidOrderBySortNumAsc(String fileUuid);
+
+    List<File> findTop3AllByFileUuidOrderBySortNumAsc(String fileUuid);
+
     File findByFileUuidAndSortNum(String fileUuid, Long sortNum);
+
+    boolean existsByFileUuid(String fileUuid);
 }

src/main/java/devkor/com/teamcback/domain/common/util/FileUtil.java

@@ -137,7 +137,7 @@ public void uploadThumb(File savedFile, MultipartFile file, Integer width, Integ
         InputStream inputStream = new ByteArrayInputStream(os.toByteArray());
 
         // 저장
-        String thumbSavedName = s3Util.uploadFile(inputStream, savedFile.getFileUuid(), filePath, file.getContentType());
+        String thumbSavedName = s3Util.uploadFile(inputStream, savedFile.getFileOriginalName(), filePath, file.getContentType());
         savedFile.setThumbSavedName(thumbSavedName);
     }
 
@@ -167,6 +167,22 @@ public void deleteFile(String fileUuid) {
         fileRepository.deleteAll(savedFileList);
     }
 
+    public List<File> getFiles(String fileUuid) {
+        return fileRepository.findAllByFileUuid(fileUuid);
+    }
+
+    public List<File> getTop10Files(String fileUuid) {
+        return fileRepository.findTop10AllByFileUuidOrderBySortNumAsc(fileUuid);
+    }
+
+    public List<File> getTop5Files(String fileUuid) {
+        return fileRepository.findTop5AllByFileUuidOrderBySortNumAsc(fileUuid);
+    }
+
+    public List<File> getTop3Files(String fileUuid) {
+        return fileRepository.findTop3AllByFileUuidOrderBySortNumAsc(fileUuid);
+    }
+
     public List<String> getOriginalFiles(String fileUuid) {
         List<String> fileList = fileRepository.findAllByFileUuid(fileUuid).stream().map(File::getFileSavedName).toList();
 

src/main/java/devkor/com/teamcback/domain/operatingtime/controller/AdminOperatingTimeController.java

@@ -0,0 +1,66 @@
+package devkor.com.teamcback.domain.operatingtime.controller;
+
+import devkor.com.teamcback.domain.operatingtime.dto.request.SavePlaceOperatingTimeConditionReq;
+import devkor.com.teamcback.domain.operatingtime.dto.request.SavePlaceOperatingTimeReq;
+import devkor.com.teamcback.domain.operatingtime.dto.response.GetPlaceOperatingTimeRes;
+import devkor.com.teamcback.domain.operatingtime.dto.response.SavePlaceOperatingTimeConditionRes;
+import devkor.com.teamcback.domain.operatingtime.dto.response.SavePlaceOperatingTimeRes;
+import devkor.com.teamcback.domain.operatingtime.service.AdminOperatingTimeService;
+import devkor.com.teamcback.global.response.CommonResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/admin/operating-time")
+public class AdminOperatingTimeController {
+    private final AdminOperatingTimeService adminOperatingTimeService;
+
+    @GetMapping("/places/{placeId}")
+    @Operation(summary = "장소의 운영시간 검색",
+            description = "장소 id로 운영시간 검색")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "정상 처리 되었습니다."),
+            @ApiResponse(responseCode = "404", description = "장소를 찾을 수 없습니다.",
+                    content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+      })
+    public CommonResponse<GetPlaceOperatingTimeRes> getPlaceOperatingTime(
+            @Parameter(name = "placeId", description = "장소 ID") @PathVariable Long placeId) {
+        return CommonResponse.success(adminOperatingTimeService.getPlaceOperatingTime(placeId));
+    }
+
+    @PutMapping("/places/{placeId}")
+    @Operation(summary = "장소의 운영시간 저장",
+            description = "장소가 각 요일별로 고정된 운영시간을 가지는 경우(00:00-00:00 형식 포함)")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "정상 처리 되었습니다."),
+            @ApiResponse(responseCode = "404", description = "장소를 찾을 수 없습니다.",
+                    content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+    })
+    public CommonResponse<SavePlaceOperatingTimeRes> savePlaceOperatingTime(
+            @Parameter(name = "placeId", description = "장소 ID") @PathVariable Long placeId,
+            @Parameter(description = "요일별 운영 시간") @RequestBody SavePlaceOperatingTimeReq req) {
+        return CommonResponse.success(adminOperatingTimeService.savePlaceOperatingTime(placeId, req));
+    }
+
+    @PostMapping("/places/{placeId}")
+    @Operation(summary = "장소의 조건 및 운영시간 저장(별도로 요일별 대표 운영 시간도 저장해야 함)",
+            description = "장소가 조건에 따라 유동적인 운영시간을 가지는 경우")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "정상 처리 되었습니다."),
+            @ApiResponse(responseCode = "404", description = "장소를 찾을 수 없습니다.",
+                    content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+    })
+    public CommonResponse<SavePlaceOperatingTimeConditionRes> savePlaceOperatingTimeCondition(
+            @Parameter(name = "placeId", description = "장소 ID") @PathVariable Long placeId,
+            @Parameter(description = "조건 및 운영 시간") @RequestBody @Valid SavePlaceOperatingTimeConditionReq req) {
+        return CommonResponse.success(adminOperatingTimeService.savePlaceOperatingTimeCondition(placeId, req));
+    }
+}

src/main/java/devkor/com/teamcback/domain/operatingtime/dto/request/SavePlaceOperatingTimeConditionReq.java

@@ -0,0 +1,26 @@
+package devkor.com.teamcback.domain.operatingtime.dto.request;
+
+import devkor.com.teamcback.domain.operatingtime.entity.DayOfWeek;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Schema(description = "저장할 운영시간 정보(상관없는 조건은 null로 표시)")
+@Getter
+@Setter
+public class SavePlaceOperatingTimeConditionReq {
+    @Schema(description = "요일", example = "WEEKDAY")
+    private DayOfWeek dayOfWeek;
+    @Schema(description = "짝수주 여부", example = "null")
+    private Boolean isEvenWeek;
+    @Schema(description = "공휴일 여부", example = "false")
+    private Boolean isHoliday;
+    @Schema(description = "방학 여부", example = "null")
+    private Boolean isVacation;
+    @Schema(description = "조건에 해당하는 운영시간 목록")
+    @NotEmpty(message = "최소 1개의 운영시간이 있어야 합니다.")
+    private List<SavePlaceOperatingTimeConditionTimeReq> timeList;
+}

src/main/java/devkor/com/teamcback/domain/operatingtime/dto/request/SavePlaceOperatingTimeConditionTimeReq.java

@@ -0,0 +1,23 @@
+package devkor.com.teamcback.domain.operatingtime.dto.request;
+
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SavePlaceOperatingTimeConditionTimeReq {
+    @Min(value = 0)
+    @Max(value = 23)
+    private int StartHour;
+    @Min(value = 0)
+    @Max(value = 59)
+    private int StartMinute;
+    @Min(value = 0)
+    @Max(value = 23)
+    private int endHour;
+    @Min(value = 0)
+    @Max(value = 59)
+    private int endMinute;
+}

src/main/java/devkor/com/teamcback/domain/operatingtime/dto/request/SavePlaceOperatingTimeReq.java

@@ -0,0 +1,27 @@
+package devkor.com.teamcback.domain.operatingtime.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+@Schema(description = "저장할 운영시간 정보")
+@Getter
+@Setter
+public class SavePlaceOperatingTimeReq {
+    @Schema(description = "평일 운영시간", example = "09:00-21:00")
+    private String weekDayOperatingTime;
+    @Schema(description = "월요일 운영시간(평일 모두 같다면 없어도 됨)", example = "09:00-21:00")
+    private String mondayOperatingTime;
+    @Schema(description = "화요일 운영시간(평일 모두 같다면 없어도 됨)", example = "09:00-21:00")
+    private String tuesdayOperatingTime;
+    @Schema(description = "수요일 운영시간(평일 모두 같다면 없어도 됨)", example = "09:00-21:00")
+    private String wednesdayOperatingTime;
+    @Schema(description = "목요일 운영시간(평일 모두 같다면 없어도 됨)", example = "09:00-21:00")
+    private String thursdayOperatingTime;
+    @Schema(description = "금요일 운영시간(평일 모두 같다면 없어도 됨)", example = "09:00-21:00")
+    private String fridayOperatingTime;
+    @Schema(description = "토요일 운영시간", example = "09:00-20:00")
+    private String saturdayOperatingTime;
+    @Schema(description = "일요일 운영시간", example = "휴무")
+    private String sundayOperatingTime;
+}

src/main/java/devkor/com/teamcback/domain/operatingtime/dto/response/GetPlaceOperatingTimeRes.java

@@ -0,0 +1,34 @@
+package devkor.com.teamcback.domain.operatingtime.dto.response;
+
+import devkor.com.teamcback.domain.place.entity.Place;
+import lombok.Getter;
+
+@Getter
+public class GetPlaceOperatingTimeRes {
+    private Long placeId;
+    private String placeName;
+    private String todayOperatingTime;
+    private String weekDayOperatingTime;
+    private String mondayOperatingTime;
+    private String tuesdayOperatingTime;
+    private String wednesdayOperatingTime;
+    private String thursdayOperatingTime;
+    private String fridayOperatingTime;
+    private String saturdayOperatingTime;
+    private String sundayOperatingTime;
+
+
+    public GetPlaceOperatingTimeRes(Place place) {
+        this.placeId = place.getId();
+        this.placeName = place.getName();
+        this.todayOperatingTime = place.getOperatingTime();
+        this.weekDayOperatingTime = place.getWeekdayOperatingTime();
+        this.mondayOperatingTime = place.getMondayOperatingTime();
+        this.tuesdayOperatingTime = place.getTuesdayOperatingTime();
+        this.wednesdayOperatingTime = place.getWednesdayOperatingTime();
+        this.thursdayOperatingTime = place.getThursdayOperatingTime();
+        this.fridayOperatingTime = place.getFridayOperatingTime();
+        this.saturdayOperatingTime = place.getSaturdayOperatingTime();
+        this.sundayOperatingTime = place.getSundayOperatingTime();
+    }
+}

src/main/java/devkor/com/teamcback/domain/operatingtime/dto/HolidayResDto.java → src/main/java/devkor/com/teamcback/domain/operatingtime/dto/response/HolidayResDto.java

@@ -1,4 +1,4 @@
-package devkor.com.teamcback.domain.operatingtime.dto;
+package devkor.com.teamcback.domain.operatingtime.dto.response;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -16,7 +16,7 @@ public class HolidayResDto {
     public HolidayResDto(JSONObject itemJson) {
         this.name = itemJson.getString("dateName");
         String holidayOrNot = itemJson.getString("isHoliday");
-        this.isHoliday = holidayOrNot.equals("Y") ? true : false;
+        this.isHoliday = holidayOrNot.equals("Y");
         String dateString = itemJson.getBigInteger("locdate").toString();
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
         this.date = LocalDate.parse(dateString, formatter);

src/main/java/devkor/com/teamcback/domain/operatingtime/dto/response/SavePlaceOperatingTimeConditionRes.java

@@ -0,0 +1,9 @@
+package devkor.com.teamcback.domain.operatingtime.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "장소 운영시간 저장 완료")
+@JsonIgnoreProperties
+public class SavePlaceOperatingTimeConditionRes {
+}

src/main/java/devkor/com/teamcback/domain/operatingtime/dto/response/SavePlaceOperatingTimeRes.java

@@ -0,0 +1,9 @@
+package devkor.com.teamcback.domain.operatingtime.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "장소 운영시간 저장 완료")
+@JsonIgnoreProperties
+public class SavePlaceOperatingTimeRes {
+}