Merge branch 'release/v1.0.3'

Author: bumooo

api/build.gradle.kts

@@ -1,4 +1,3 @@
-
 extra["springCloudVersion"] = "2024.0.0"
 
 dependencies {
@@ -9,7 +8,7 @@ dependencies {
 
     // Spring
     implementation("org.springframework.boot:spring-boot-starter-web")
-    implementation("org.springframework.boot:spring-boot-starter-actuator")
+    implementation("org.springframework.boot:spring-boot-starter-validation")
 
     // Swagger
     implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.3")

api/src/main/java/com/mbtips/MbtipsApplication.java

@@ -5,11 +5,11 @@
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 
 
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication
 @ConfigurationPropertiesScan
-@EntityScan("com.embitips")
+@EnableJpaRepositories(basePackages = {"com.mbtips"})
 public class MbtipsApplication {
 
     public static void main(String[] args) {

api/src/main/java/com/mbtips/common/configuration/SwaggerConfiguration.java

@@ -1,8 +1,11 @@
 package com.mbtips.common.configuration;
 
+import com.mbtips.common.constant.Constant;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -16,7 +19,8 @@ public class SwaggerConfiguration {
     @Bean
     public OpenAPI openAPI() {
         return new OpenAPI()
-                .components(new Components())
+                .addSecurityItem(new SecurityRequirement().addList("Bearer Authentication"))
+                .components(new Components().addSecuritySchemes("Bearer Authentication", createAPIKeyScheme()))
                 .info(apiInfo());
     }
 
@@ -27,4 +31,10 @@ public Info apiInfo() {
                 .version(API_VERSION);
     }
 
+    private SecurityScheme createAPIKeyScheme() {
+        return new SecurityScheme().type(SecurityScheme.Type.HTTP)
+                .bearerFormat("JWT")
+                .scheme("Bearer");
+    }
+
 }

api/src/main/java/com/mbtips/common/exception/handler/GlobalExceptionHandler.java

@@ -4,9 +4,14 @@
 import com.mbtips.common.exception.enums.CommonException;
 import com.mbtips.common.response.ApiResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Slf4j
 @RestControllerAdvice
 public class GlobalExceptionHandler {
@@ -29,4 +34,23 @@ public ApiResponse<Void> exceptionHandler(Exception e) {
         return ApiResponse.fail(CommonException.INTERNAL_SERVER_ERROR);
     }
 
+    /**
+     * to-do customexception 적용하기
+     */
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ApiResponse<Void> exceptionsHandler(MethodArgumentNotValidException e) {
+
+        List<String> errorMessages = e.getBindingResult().getFieldErrors().stream()
+                .map(FieldError::getDefaultMessage)
+                .collect(Collectors.toList());
+
+        log.error("### Validation Errors: {}", errorMessages);
+
+        return ApiResponse.fail(CommonException.INVALID_REQUEST_ERROR);
+    }
+
+    /**
+     * VirtualFriendNotFoundException 구현 변경
+     */
+
 }

api/src/main/java/com/mbtips/common/properties/KakaoProperties.java

@@ -0,0 +1,12 @@
+package com.mbtips.common.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(value = "kakao")
+public record KakaoProperties(
+        String authorizeUrl,
+        String appKey,
+        String redirectUrl
+) {
+
+}

api/src/main/java/com/mbtips/domain/conversation/ConversationService.java

@@ -0,0 +1,30 @@
+package com.mbtips.domain.conversation;
+
+import com.mbtips.conversation.ConversationRepository;
+import com.mbtips.conversation.entity.Conversation;
+import com.mbtips.user.entity.UserEntity;
+import com.mbtips.virtualfriend.entity.VirtualFriend;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class ConversationService {
+
+    private final ConversationRepository conversationRepository;
+    public Conversation createConversation(VirtualFriend friend, UserEntity userEntity) {
+        Conversation conversation = Conversation.builder()
+                .virtualFriend(friend)
+                .user(userEntity).build();
+        Conversation saveConversation = conversationRepository.save(conversation);
+        return saveConversation;
+    }
+
+    public void deleteConversation(VirtualFriend friend) {
+        Conversation conversation = conversationRepository.findByFriendId(friend);
+        conversationRepository.delete(conversation);
+        log.debug("{} 대화방이 삭제되었습니다.", conversation.getConversationId());
+    }
+}

api/src/main/java/com/mbtips/domain/fastfriend/controller/FastFriendController.java

@@ -0,0 +1,35 @@
+package com.mbtips.domain.fastfriend.controller;
+
+import com.mbtips.common.response.ApiResponse;
+import com.mbtips.domain.fastfriend.controller.dto.request.FastFriendMessageRequest;
+import com.mbtips.domain.fastfriend.controller.dto.request.FastFriendRequest;
+import com.mbtips.domain.fastfriend.controller.dto.response.FastFriendResponse;
+import com.mbtips.domain.fastfriend.service.FastFriendService;
+import com.mbtips.message.response.MessageResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.validation.Valid;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/fastfriend")
+@RequiredArgsConstructor
+public class FastFriendController {
+
+    private final FastFriendService fastFriendService;
+    @PostMapping
+    @Operation(summary = "빠른대화 생성", description = "빠른 대화 생성을 요청한 후 가상친구Id를 반환받습니다.")
+    public ApiResponse<Long> createFastFriendRequest(@Valid @RequestBody FastFriendRequest fastFriendRequest){
+        Long fastFriendId = fastFriendService.createFastFriend(fastFriendRequest);
+        return ApiResponse.success(fastFriendId);
+    }
+
+    @PostMapping("/message")
+    @Operation(summary = "빠른대화 메시지 요청", description = "빠른 대화 친구에게 메시지를 보내고 응답을 받습니다.")
+    public ApiResponse<String> fastFriendMessageRequest(@RequestBody FastFriendMessageRequest request) {
+
+        String result = fastFriendService.messageRequest(request);
+        return ApiResponse.success(result);
+    }
+}

api/src/main/java/com/mbtips/domain/fastfriend/controller/dto/request/FastFriendMessageRequest.java

@@ -0,0 +1,7 @@
+package com.mbtips.domain.fastfriend.controller.dto.request;
+
+public record FastFriendMessageRequest(
+        Long fastFriendId,
+        String content
+) {
+}

api/src/main/java/com/mbtips/domain/fastfriend/controller/dto/request/FastFriendRequest.java

@@ -0,0 +1,28 @@
+package com.mbtips.domain.fastfriend.controller.dto.request;
+
+import com.mbtips.fastfriend.entity.FastFriend;
+
+public record FastFriendRequest(
+        String EorI,
+        String NorS,
+        String TorF,
+        String JorP,
+        String fastFriendName,
+        int fastFriendAge,
+        String fastFriendSex,
+        String fastFriendRelationship
+) {
+
+    public FastFriend toEntity(FastFriendRequest request) {
+        return FastFriend.builder()
+                .EorI(request.EorI)
+                .NorS(request.NorS)
+                .TorF(request.TorF)
+                .JorP(request.JorP)
+                .fastFriendName(request.fastFriendName)
+                .fastFriendAge(request.fastFriendAge)
+                .fastFriendSex(request.fastFriendSex)
+                .fastFriendRelationship(request.fastFriendRelationship)
+                .build();
+    }
+}

api/src/main/java/com/mbtips/domain/fastfriend/controller/dto/response/FastFriendResponse.java

@@ -0,0 +1,30 @@
+package com.mbtips.domain.fastfriend.controller.dto.response;
+
+import com.mbtips.fastfriend.entity.FastFriend;
+
+public record FastFriendResponse (
+        Long fastFriendId,
+        String EorI,
+        String NorS,
+        String TorF,
+        String JorP,
+        String fastFriendName,
+        int fastFriendAge,
+        String fastFriendSex,
+        String fastFriendRelationship
+){
+
+    public static FastFriendResponse from(FastFriend saveFriend) {
+        return new FastFriendResponse(
+                saveFriend.getFastFriendId(),
+                saveFriend.getEorI(),
+                saveFriend.getNorS(),
+                saveFriend.getTorF(),
+                saveFriend.getJorP(),
+                saveFriend.getFastFriendName(),
+                saveFriend.getFastFriendAge(),
+                saveFriend.getFastFriendSex(),
+                saveFriend.getFastFriendRelationship()
+        );
+    }
+}