[FEAT]: GPT API 구현 (#11)

sejineer · web-flow · commit 2355ccbb4849 · 2024-08-13T22:22:05.000+09:00
diff --git a/src/main/java/org/khtml/hexagonal/domain/ai/application/GptService.java b/src/main/java/org/khtml/hexagonal/domain/ai/application/GptService.java
@@ -1,4 +1,4 @@
-package org.khtml.hexagonal.domain.building;
+package org.khtml.hexagonal.domain.ai.application;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -7,52 +7,29 @@
 import org.khtml.hexagonal.domain.building.dto.BuildingUpdate;
 import org.khtml.hexagonal.domain.building.dto.ImageRequest;
 import org.khtml.hexagonal.domain.building.dto.MaterialInfo;
-import org.khtml.hexagonal.domain.auth.JwtValidator;
-import org.khtml.hexagonal.domain.building.application.BuildingService;
-import org.khtml.hexagonal.domain.user.User;
-import org.khtml.hexagonal.global.support.response.ApiResponse;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@RequestMapping("/api/v1/buildings")
+@Transactional(readOnly = true)
 @RequiredArgsConstructor
-@RestController
-public class BuildingController {
-
-    private final BuildingService buildingService;
-    private final JwtValidator jwtValidator;
+@Service
+public class GptService {
 
     @Value("${openai.api.url}")
     private String openAiApiUrl;
 
     @Value("${openai.api.key}")
     private String openAiApiKey;
 
-    @GetMapping("/{building-id}")
-    public ApiResponse<BuildingDetailResponse> getBuildingDetail(
-            @PathVariable(name = "building-id") String buildingId
-    ) {
-        return ApiResponse.success(BuildingDetailResponse.toResponse(buildingService.getBuilding(buildingId)));
-    }
-
-    @PostMapping("/{building-id}/register")
-    public ApiResponse<?> registerBuilding(
-            @RequestHeader("Authorization") String token,
-            @RequestParam("images") List<MultipartFile> multipartFiles,
-            @PathVariable(name = "building-id") String buildingId
-
-    ) throws IOException {
-        User requestUser = jwtValidator.getUserFromToken(token);
-        List<String> urls = buildingService.registerBuilding(buildingId, requestUser, multipartFiles);
+    public BuildingUpdate analyzeBuilding(List<String> urls) throws JsonProcessingException {
         BuildingUpdate buildingUpdate;
         ImageRequest imageRequest = new ImageRequest();
         List<ImageRequest.Content> contentList = new ArrayList<>();
@@ -71,14 +48,9 @@ public ApiResponse<?> registerBuilding(
         }
 
         imageRequest.setContent(contentList);
-
-
-        buildingUpdate = analyzeHouseImages(imageRequest);
-
-        return ApiResponse.success(buildingUpdate);
+        return analyzeHouseImages(imageRequest);
     }
 
-
     public BuildingUpdate analyzeHouseImages(ImageRequest imageRequest) throws JsonProcessingException {
 
         // 시스템 메시지
diff --git a/src/main/java/org/khtml/hexagonal/domain/auth/AuthService.java b/src/main/java/org/khtml/hexagonal/domain/auth/AuthService.java
@@ -17,17 +17,22 @@ public class AuthService {
 
     @Transactional
     public TokenResult login(LoginRequest loginRequest) {
-        User newUser = User.builder()
-                .providerId(loginRequest.providerId())
-                .locationConsent(loginRequest.locationConsent())
-                .numberOfPersons(loginRequest.numberOfPersons())
-                .phoneNumber(loginRequest.phoneNumber())
-                .username(loginRequest.username())
-                .userType(UserType.valueOf(loginRequest.userType()))
-                .build();
-
-        User savedUser = userRepository.save(newUser);
-        String accessToken = jwtGenerator.generateAccessToken(savedUser.getId());
+        User user;
+        if (!userRepository.existsByProviderId(loginRequest.providerId())) {
+            user = User.builder()
+                    .providerId(loginRequest.providerId())
+                    .locationConsent(loginRequest.locationConsent())
+                    .numberOfPersons(loginRequest.numberOfPersons())
+                    .phoneNumber(loginRequest.phoneNumber())
+                    .username(loginRequest.username())
+                    .userType(UserType.valueOf(loginRequest.userType()))
+                    .build();
+        } else {
+            user = userRepository.findByProviderId(loginRequest.providerId())
+                    .orElseThrow(() -> new IllegalArgumentException("User not found"));
+        }
+        userRepository.save(user);
+        String accessToken = jwtGenerator.generateAccessToken(user.getId());
         String refreshToken = jwtGenerator.generateRefreshToken();
 
         return new TokenResult(accessToken, refreshToken);
diff --git a/src/main/java/org/khtml/hexagonal/domain/building/application/BlobManager.java b/src/main/java/org/khtml/hexagonal/domain/building/application/BlobManager.java
@@ -1,4 +1,4 @@
-package org.khtml.hexagonal.domain.building;
+package org.khtml.hexagonal.domain.building.application;
 
 import com.azure.storage.blob.BlobClient;
 import com.azure.storage.blob.BlobContainerClient;
diff --git a/src/main/java/org/khtml/hexagonal/domain/building/application/BuildingService.java b/src/main/java/org/khtml/hexagonal/domain/building/application/BuildingService.java
@@ -1,17 +1,25 @@
 package org.khtml.hexagonal.domain.building.application;
 
 import lombok.RequiredArgsConstructor;
+import org.khtml.hexagonal.domain.building.ImageType;
 import org.khtml.hexagonal.domain.building.dto.BuildingUpdate;
-import org.khtml.hexagonal.domain.building.*;
+import org.khtml.hexagonal.domain.building.entity.Building;
+import org.khtml.hexagonal.domain.building.entity.BuildingImage;
+import org.khtml.hexagonal.domain.building.entity.Image;
+import org.khtml.hexagonal.domain.building.repository.BuildingImageRepository;
+import org.khtml.hexagonal.domain.building.repository.BuildingRepository;
+import org.khtml.hexagonal.domain.building.repository.ImageRepository;
 import org.khtml.hexagonal.domain.user.User;
 import org.khtml.hexagonal.domain.user.UserRepository;
+import org.khtml.hexagonal.global.support.error.ErrorType;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -64,7 +72,7 @@ public Building updateBuilding(String buildingId, BuildingUpdate buildingUpdate)
     @Transactional
     public List<String> registerBuilding(String buildingId, User requestUser, List<MultipartFile> multipartFiles) throws IOException {
         List<String> ret = new ArrayList<>();
-        for(MultipartFile file : multipartFiles) {
+        for (MultipartFile file : multipartFiles) {
             String url = blobManager.storeFile(file.getOriginalFilename(), file.getInputStream(), file.getSize());
 
             User user = userRepository.findById(requestUser.getId()).orElseThrow(() -> new IllegalArgumentException("User not found"));
@@ -75,6 +83,7 @@ public List<String> registerBuilding(String buildingId, User requestUser, List<M
 
             Image image = Image.builder()
                     .url(url)
+                    .imageType(ImageType.BUILDING)
                     .user(user)
                     .build();
 
@@ -92,4 +101,24 @@ public List<String> registerBuilding(String buildingId, User requestUser, List<M
         return ret;
     }
 
+    @Transactional
+    public void updateAnalyzedBuilding(String buildingId, BuildingUpdate buildingUpdate) {
+        Building building = buildingRepository.findBuildingByGisBuildingId(buildingId)
+                .orElseThrow(() -> new IllegalArgumentException("Building not found"));
+
+        building.updateAnalyzedData(buildingUpdate);
+    }
+
+    @Transactional
+    public void updateBuildingDescription(String buildingId, Long userId, String description) {
+        Building building = buildingRepository.findBuildingByGisBuildingId(buildingId)
+                .orElseThrow(() -> new IllegalArgumentException("Building not found"));
+
+        if(!Objects.equals(building.getUser().getId(), userId)) {
+            throw new IllegalArgumentException(ErrorType.DEFAULT_ERROR.getMessage());
+        }
+
+        building.setDescription(description);
+    }
+
 }
diff --git a/src/main/java/org/khtml/hexagonal/domain/building/controller/BuildingController.java b/src/main/java/org/khtml/hexagonal/domain/building/controller/BuildingController.java
@@ -0,0 +1,60 @@
+package org.khtml.hexagonal.domain.building.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.khtml.hexagonal.domain.ai.application.GptService;
+import org.khtml.hexagonal.domain.building.dto.*;
+import org.khtml.hexagonal.domain.auth.JwtValidator;
+import org.khtml.hexagonal.domain.building.application.BuildingService;
+import org.khtml.hexagonal.domain.user.User;
+import org.khtml.hexagonal.global.support.response.ApiResponse;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+@RequestMapping("/api/v1/buildings")
+@RequiredArgsConstructor
+@RestController
+public class BuildingController {
+
+    private final BuildingService buildingService;
+    private final JwtValidator jwtValidator;
+    private final GptService gptService;
+
+    @GetMapping("/{building-id}")
+    public ApiResponse<BuildingDetailResponse> getBuildingDetail(
+            @PathVariable(name = "building-id") String buildingId
+    ) {
+        return ApiResponse.success(BuildingDetailResponse.toResponse(buildingService.getBuilding(buildingId)));
+    }
+
+    @PostMapping("/{building-id}/register")
+    public ApiResponse<?> registerBuilding(
+            @RequestHeader("Authorization") String token,
+            @RequestParam("images") List<MultipartFile> multipartFiles,
+            @PathVariable(name = "building-id") String buildingId
+    ) throws IOException {
+        User requestUser = jwtValidator.getUserFromToken(token);
+        List<String> urls = buildingService.registerBuilding(buildingId, requestUser, multipartFiles);
+
+        BuildingUpdate buildingUpdate = gptService.analyzeBuilding(urls);
+        buildingService.updateAnalyzedBuilding(buildingId, buildingUpdate);
+
+        return ApiResponse.success(buildingUpdate);
+    }
+
+    @PostMapping("/{building-id}/register/description")
+    public ApiResponse<?> registerBuilding(
+            @RequestHeader("Authorization") String token,
+            @PathVariable(name = "building-id") String buildingId,
+            @RequestBody BuildingDescriptionRequest buildingDescriptionRequest
+            ) throws IOException {
+        User requestUser = jwtValidator.getUserFromToken(token);
+        buildingService.updateBuildingDescription(buildingId, requestUser.getId(), buildingDescriptionRequest.description());
+
+        return ApiResponse.success();
+    }
+
+
+}
diff --git a/src/main/java/org/khtml/hexagonal/domain/building/dto/BuildingDescriptionRequest.java b/src/main/java/org/khtml/hexagonal/domain/building/dto/BuildingDescriptionRequest.java
@@ -0,0 +1,6 @@
+package org.khtml.hexagonal.domain.building.dto;
+
+public record BuildingDescriptionRequest(
+        String description
+) {
+}
diff --git a/src/main/java/org/khtml/hexagonal/domain/building/dto/BuildingDetailResponse.java b/src/main/java/org/khtml/hexagonal/domain/building/dto/BuildingDetailResponse.java
@@ -1,4 +1,6 @@
-package org.khtml.hexagonal.domain.building;
+package org.khtml.hexagonal.domain.building.dto;
+
+import org.khtml.hexagonal.domain.building.entity.Building;
 
 public record BuildingDetailResponse(
         String buildingId,
diff --git a/src/main/java/org/khtml/hexagonal/domain/building/entity/Building.java b/src/main/java/org/khtml/hexagonal/domain/building/entity/Building.java
@@ -1,13 +1,13 @@
-package org.khtml.hexagonal.domain.building;
+package org.khtml.hexagonal.domain.building.entity;
 
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.khtml.hexagonal.domain.building.BuildingStatus;
+import org.khtml.hexagonal.domain.building.dto.BuildingUpdate;
 import org.khtml.hexagonal.domain.user.User;
 
-import java.util.List;
-
 @Table(name = "building")
 @Getter
 @Setter
@@ -18,6 +18,7 @@ public class Building {
     @Id
     private String gisBuildingId;
 
+    @Enumerated(EnumType.STRING)
     @Column(name = "building_status")
     private BuildingStatus buildingStatus = BuildingStatus.NOT_REGISTERED;
 
@@ -105,6 +106,9 @@ public class Building {
     @Column(name = "description")
     private String description;
 
+    @Column(name = "is_analyzed")
+    private Boolean isAnalyzed = false;
+
     @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
     private User user;
@@ -113,4 +117,24 @@ public void updateUser(User user) {
         this.user = user;
     }
 
+    public void updateAnalyzedData(BuildingUpdate buildingUpdate) {
+        this.structureReason = buildingUpdate.getStructureReason();
+        this.roofMaterial = buildingUpdate.getRoofMaterial();
+        this.roofCondition = buildingUpdate.getRoofCondition();
+        this.wallMaterial = buildingUpdate.getWallMaterial();
+        this.wallCondition = buildingUpdate.getWallCondition();
+        this.windowDoorMaterial = buildingUpdate.getWindowDoorMaterial();
+        this.windowDoorCondition = buildingUpdate.getWindowDoorCondition();
+        this.overallCondition = buildingUpdate.getOverallCondition();
+        this.conditionReason = buildingUpdate.getConditionReason();
+        this.crackScore = buildingUpdate.getCrackScore();
+        this.leakScore = buildingUpdate.getLeakScore();
+        this.corrosionScore = buildingUpdate.getCorrosionScore();
+        this.agingScore = buildingUpdate.getAgingScore();
+        this.totalScore = buildingUpdate.getTotalScore();
+        this.repairList = buildingUpdate.getRepairList();
+        this.isAnalyzed = true;
+        this.buildingStatus = BuildingStatus.REGISTERED;
+    }
+
 }
diff --git a/src/main/java/org/khtml/hexagonal/domain/building/entity/BuildingImage.java b/src/main/java/org/khtml/hexagonal/domain/building/entity/BuildingImage.java
@@ -1,4 +1,4 @@
-package org.khtml.hexagonal.domain.building;
+package org.khtml.hexagonal.domain.building.entity;
 
 
 import jakarta.persistence.*;
diff --git a/src/main/java/org/khtml/hexagonal/domain/building/entity/Image.java b/src/main/java/org/khtml/hexagonal/domain/building/entity/Image.java
@@ -1,10 +1,11 @@
-package org.khtml.hexagonal.domain.building;
+package org.khtml.hexagonal.domain.building.entity;
 
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.khtml.hexagonal.domain.building.ImageType;
 import org.khtml.hexagonal.domain.common.BaseEntity;
 import org.khtml.hexagonal.domain.user.User;
 
diff --git a/src/main/java/org/khtml/hexagonal/domain/building/repository/BuildingImageRepository.java b/src/main/java/org/khtml/hexagonal/domain/building/repository/BuildingImageRepository.java
@@ -1,5 +1,6 @@
-package org.khtml.hexagonal.domain.building;
+package org.khtml.hexagonal.domain.building.repository;
 
+import org.khtml.hexagonal.domain.building.entity.BuildingImage;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface BuildingImageRepository extends JpaRepository<BuildingImage, Long> {
diff --git a/src/main/java/org/khtml/hexagonal/domain/building/repository/BuildingRepository.java b/src/main/java/org/khtml/hexagonal/domain/building/repository/BuildingRepository.java
@@ -1,5 +1,6 @@
-package org.khtml.hexagonal.domain.building;
+package org.khtml.hexagonal.domain.building.repository;
 
+import org.khtml.hexagonal.domain.building.entity.Building;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 
diff --git a/src/main/java/org/khtml/hexagonal/domain/building/repository/ImageRepository.java b/src/main/java/org/khtml/hexagonal/domain/building/repository/ImageRepository.java
@@ -1,5 +1,6 @@
-package org.khtml.hexagonal.domain.building;
+package org.khtml.hexagonal.domain.building.repository;
 
+import org.khtml.hexagonal.domain.building.entity.Image;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ImageRepository extends JpaRepository<Image, Long> {
diff --git a/src/main/java/org/khtml/hexagonal/domain/material/Material.java b/src/main/java/org/khtml/hexagonal/domain/material/Material.java
@@ -5,7 +5,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.khtml.hexagonal.domain.building.Building;
+import org.khtml.hexagonal.domain.building.entity.Building;
 import org.khtml.hexagonal.domain.common.BaseEntity;
 
 @Table(name = "material")
diff --git a/src/main/java/org/khtml/hexagonal/domain/material/MaterialService.java b/src/main/java/org/khtml/hexagonal/domain/material/MaterialService.java
@@ -2,6 +2,13 @@
 
 import lombok.RequiredArgsConstructor;
 import org.khtml.hexagonal.domain.building.*;
+import org.khtml.hexagonal.domain.building.application.BlobManager;
+import org.khtml.hexagonal.domain.building.entity.Building;
+import org.khtml.hexagonal.domain.building.entity.BuildingImage;
+import org.khtml.hexagonal.domain.building.entity.Image;
+import org.khtml.hexagonal.domain.building.repository.BuildingImageRepository;
+import org.khtml.hexagonal.domain.building.repository.BuildingRepository;
+import org.khtml.hexagonal.domain.building.repository.ImageRepository;
 import org.khtml.hexagonal.domain.user.User;
 import org.khtml.hexagonal.domain.user.UserRepository;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/khtml/hexagonal/domain/user/UserRepository.java b/src/main/java/org/khtml/hexagonal/domain/user/UserRepository.java
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.khtml.hexagonal.domain.building;`
	`1`	`+package org.khtml.hexagonal.domain.building.application;`
`2`	`2`
`3`	`3`	`import com.azure.storage.blob.BlobClient;`
`4`	`4`	`import com.azure.storage.blob.BlobContainerClient;`