Merge pull request #45 from FatePet/dev

deploy

Author: sj0320

Dockerfile

@@ -9,3 +9,4 @@ FROM openjdk:17-jdk-alpine
 COPY --from=builder /app/build/libs/*.jar /app.jar
 
 ENTRYPOINT ["java", "-jar", "/app.jar"]
+

docker-compose.prod.yml

@@ -11,6 +11,7 @@ services:
       SPRING_DATASOURCE_URL: ${SPRING_DATASOURCE_URL}
       SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME}
       SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD}
+      SPRING_PROFILES_ACTIVE: prod
     volumes:
       - gradle-cache:/root/.gradle
     networks:

src/main/java/com/fatepet/petrest/SmsService.java

@@ -57,10 +57,10 @@ public void sendSMS(String businessPhoneNumber, String customerPhoneNumber, Stri
         } catch (NurigoMessageNotReceivedException e) {
             log.error("문자 발송 실패 목록={}", e.getFailedMessageList());
             log.error("오류 메세지={}", e.getMessage());
-            throw new SmsException("문자 전송 잔액 부족");
+            throw new SmsException(ResponseCode.INTERNAL_ERROR);
         } catch (Exception e) {
             log.error("기타 오류 메세지={}", e.getMessage());
-            throw new SmsException(ResponseCode.INTERNAL_ERROR);
+            throw new SmsException("문자 전송 잔액 부족");
         }
     }
 

src/main/java/com/fatepet/petrest/business/controller/dto/response/FuneralBusinessDetailsResponse.java

@@ -5,6 +5,7 @@
 import com.fatepet.petrest.business.FuneralBusiness;
 import com.fatepet.petrest.funeralproduct.FuneralProduct;
 import com.fatepet.petrest.funeralproduct.controller.dto.response.FuneralProductResponse;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -29,14 +30,14 @@ public class FuneralBusinessDetailsResponse {
 
     private List<FuneralProductResponse> services;
 
-    private String additionalInfo;
-
-    private List<AdditionalImageResponse> additionalImages;
+    private AdditionalInfoResponse additionalInfo;
 
     @Builder
     private FuneralBusinessDetailsResponse(String name, String address, String category, String mainImageUrl, String businessHours, String phoneNumber,
                                            String email, List<FuneralProductResponse> services,
-                                           String additionalInfo, List<AdditionalImageResponse> additionalImages) {
+                                           String additionalInfo, List<AdditionalImageResponse> images) {
+
+        AdditionalInfoResponse additionalInfoResponse = new AdditionalInfoResponse(additionalInfo, images);
         this.name = name;
         this.address = address;
         this.category = category;
@@ -45,8 +46,7 @@ private FuneralBusinessDetailsResponse(String name, String address, String categ
         this.phoneNumber = phoneNumber;
         this.email = email;
         this.services = services;
-        this.additionalInfo = additionalInfo;
-        this.additionalImages = additionalImages;
+        this.additionalInfo = additionalInfoResponse;
     }
 
     public static FuneralBusinessDetailsResponse from(FuneralBusiness business, List<FuneralProduct> products,
@@ -69,7 +69,15 @@ public static FuneralBusinessDetailsResponse from(FuneralBusiness business, List
                 .email(business.getEmail())
                 .services(services)
                 .additionalInfo(business.getAdditionalInfo())
-                .additionalImages(additionalImages)
+                .images(additionalImages)
                 .build();
     }
+
+    @Getter
+    @AllArgsConstructor
+    public static class AdditionalInfoResponse {
+        private String additionalInfo;
+        List<AdditionalImageResponse> images;
+    }
+
 }

src/main/java/com/fatepet/petrest/counseling/Counseling.java

@@ -3,6 +3,7 @@
 import com.fatepet.petrest.business.FuneralBusiness;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
@@ -24,6 +25,15 @@ public class Counseling {
 
     private String message;
 
+    @Builder
+    private Counseling(FuneralBusiness business, ContactType contactType, String phoneNumber, LocalDateTime createdAt, String message) {
+        this.business = business;
+        this.contactType = contactType;
+        this.phoneNumber = phoneNumber;
+        this.createdAt = createdAt;
+        this.message = message;
+    }
+
     private LocalDateTime createdAt;
 
 }

src/main/java/com/fatepet/petrest/counseling/CounselingService.java

@@ -31,10 +31,16 @@ public void sendCounselingRequest(Long businessId, String customerPhoneNumber, S
         String businessEmail = business.getEmail();
         String contactTypeName = ContactType.getDisplayNameByKey(contactType);
 
-
         smsService.sendSMS(businessPhoneNumber, customerPhoneNumber, contactTypeName, inquiry);
-        mailService.sendMail(businessEmail,customerPhoneNumber, contactTypeName, inquiry);
-
+        mailService.sendMail(businessEmail, customerPhoneNumber, contactTypeName, inquiry);
+
+        Counseling counseling = Counseling.builder()
+                .business(business)
+                .contactType(ContactType.valueOf(contactType))
+                .phoneNumber(customerPhoneNumber)
+                .message(inquiry)
+                .build();
+        counselingRepository.save(counseling);
     }
 
 

src/main/java/com/fatepet/petrest/global/exception/GlobalExceptionHandler.java

@@ -18,7 +18,14 @@ public ResponseEntity<ApiResponse<Void>> FuneralBusinessExceptionHandler(Funeral
         return ResponseEntity.status(e.getStatusCode()).body(response);
     }
 
-
+    @ExceptionHandler(SmsException.class)
+    public ResponseEntity<ApiResponse<Void>> handleSmsException(SmsException e){
+        System.out.println(e.getMessage());
+        System.out.println(e.getStatusCode());
+        ApiResponse<Void> response = ApiResponse.of(e.getStatusCode(), e.getMessage());
+        System.out.println(response);
+        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
+    }
 
     @ExceptionHandler(IllegalArgumentException.class)
     public ResponseEntity<ApiResponse<Void>> handleIllegalArgumentException(IllegalArgumentException e) {