Merge pull request #217 from DevKor-github/develop

main <- develop

Author: Yyang-YE

.gitignore

@@ -5,6 +5,7 @@ build/
 !**/src/main/**/build/
 !**/src/test/**/build/
 application-test.yml
+logback-spring.xml
 
 ### STS ###
 .apt_generated

build.gradle

@@ -117,6 +117,12 @@ dependencies {
 
     // Logging
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
+
+    // thumbnail
+    implementation 'net.coobird:thumbnailator:0.4.19'
+
+    // elasticsearch
+//    implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
 }
 
 dependencyManagement {

src/main/java/devkor/com/teamcback/domain/bookmark/entity/Bookmark.java

@@ -1,7 +1,7 @@
 package devkor.com.teamcback.domain.bookmark.entity;
 
 import devkor.com.teamcback.domain.bookmark.dto.request.CreateBookmarkReq;
-import devkor.com.teamcback.domain.common.BaseEntity;
+import devkor.com.teamcback.domain.common.entity.BaseEntity;
 import devkor.com.teamcback.domain.common.LocationType;
 import jakarta.persistence.*;
 import java.util.ArrayList;

src/main/java/devkor/com/teamcback/domain/bookmark/entity/Category.java

@@ -2,7 +2,7 @@
 
 import devkor.com.teamcback.domain.bookmark.dto.request.CreateCategoryReq;
 import devkor.com.teamcback.domain.bookmark.dto.request.ModifyCategoryReq;
-import devkor.com.teamcback.domain.common.BaseEntity;
+import devkor.com.teamcback.domain.common.entity.BaseEntity;
 import devkor.com.teamcback.domain.user.entity.User;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;

src/main/java/devkor/com/teamcback/domain/bookmark/entity/CategoryBookmark.java

@@ -1,14 +1,13 @@
 package devkor.com.teamcback.domain.bookmark.entity;
 
-import devkor.com.teamcback.domain.common.BaseEntity;
+import devkor.com.teamcback.domain.common.entity.BaseEntity;
 import jakarta.persistence.Entity;
 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.persistence.PostRemove;
 import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/devkor/com/teamcback/domain/building/controller/AdminBuildingController.java

@@ -0,0 +1,45 @@
+package devkor.com.teamcback.domain.building.controller;
+
+import devkor.com.teamcback.domain.building.dto.response.SaveBuildingImageRes;
+import devkor.com.teamcback.domain.building.dto.response.SaveBuildingMainImageRes;
+import devkor.com.teamcback.domain.building.service.AdminBuildingService;
+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 lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/admin/buildings")
+public class AdminBuildingController {
+
+    private final AdminBuildingService adminBuildingService;
+
+    @PostMapping(value = "/{buildingId}/image", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @Operation(summary = "건물 대표 사진 저장", description = "건물 대표 사진 저장")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "정상 처리 되었습니다."),
+            @ApiResponse(responseCode = "404", description = "건물을 찾을 수 없습니다.",
+                    content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+            @ApiResponse(responseCode = "401", description = "권한이 없습니다.",
+                    content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+            @ApiResponse(responseCode = "403", description = "잘못된 입력입니다.",
+                    content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+    })
+    public CommonResponse<SaveBuildingMainImageRes> saveBuildingMainImage(
+            @Parameter(name = "buildingId", description = "건물 ID")
+            @PathVariable Long buildingId,
+            @Parameter(description = "저장할 사진 파일")
+            @RequestPart("image") MultipartFile image
+    ) {
+        return CommonResponse.success(
+                adminBuildingService.saveBuildingMainImage(buildingId, image));
+    }
+}

src/main/java/devkor/com/teamcback/domain/building/dto/response/GetBuildingImageRes.java

@@ -0,0 +1,9 @@
+package devkor.com.teamcback.domain.building.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "건물 메인 사진 저장 완료")
+@JsonIgnoreProperties
+public class SaveBuildingMainImageRes {
+}

src/main/java/devkor/com/teamcback/domain/building/dto/response/SaveBuildingMainImageRes.java

@@ -20,4 +20,12 @@ public SearchBuildingImageRes(BuildingImage buildingImage) {
         this.floor = buildingImage.getFloor();
         this.image = buildingImage.getImage();
     }
+
+    public SearchBuildingImageRes(BuildingImage buildingImage, String image) {
+        this.buildingImageId = buildingImage.getId();
+        this.buildingId = buildingImage.getBuilding().getId();
+        this.buildingName = buildingImage.getBuilding().getName();
+        this.floor = buildingImage.getFloor();
+        this.image = image;
+    }
 }

src/main/java/devkor/com/teamcback/domain/building/dto/response/SearchBuildingImageRes.java

@@ -1,6 +1,6 @@
 package devkor.com.teamcback.domain.building.entity;
 
-import devkor.com.teamcback.domain.common.BaseEntity;
+import devkor.com.teamcback.domain.common.entity.BaseEntity;
 import devkor.com.teamcback.domain.routes.entity.Node;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -27,7 +27,10 @@ public class Building extends BaseEntity {
     @Column(nullable = false)
     private String name;
 
-    private String imageUrl;
+    private String imageUrl; // 추후 삭제
+
+    @Setter
+    private String fileUuid;
 
     @Column(nullable = false)
     private String detail;