Merge branch 'be-dev' into feature/#282

server/build.gradle

@@ -51,31 +51,36 @@ ext {
     snippetsDir = file('build/generated-snippets')
 }
 
-tasks.named('test') {
+test {
     useJUnitPlatform()
     outputs.dir snippetsDir
 }
 
 asciidoctor {
     inputs.dir snippetsDir
     configurations 'asciidoctorExt'
-    dependsOn test
     baseDirFollowsSourceFile()
+    dependsOn test
+}
+
+tasks.resolveMainClassName {
+    dependsOn 'copyApiDocuments'
 }
 
 tasks.register('copyApiDocuments', Copy) {
-    doFirst {
-        delete file('src/main/resources/static/docs')
-    }
     dependsOn asciidoctor
     from file("build/docs/asciidoc")
-    into file("src/main/resources/static/docs")
+    into file("build/resources/main/static/docs")
 }
 
 bootJar {
     dependsOn copyApiDocuments
 }
 
+jar {
+    enabled = false
+}
+
 build {
     dependsOn copyApiDocuments
 }

server/src/docs/asciidoc/event.adoc

@@ -106,6 +106,15 @@ operation::updateEventMemberName[snippets="path-parameters,http-request,request-
 [source,json,options="nowrap"]
 ----
 [
+
+   {
+      "code":"MEMBER_NAME_CHANGE_DUPLICATE",
+      "message":"중복된 참여 인원 이름 변경 요청이 존재합니다."
+   },
+   {
+      "code":"MEMBER_NOT_EXIST",
+      "message":"현재 참여하고 있지 않는 인원이 존재합니다."
+   },
    {
       "code":"REQUEST_EMPTY",
       "message":"멤버 이름은 공백일 수 없습니다."
@@ -128,7 +137,7 @@ operation::updateEventMemberName[snippets="path-parameters,http-request,request-
    },
    {
       "code":"TOKEN_EXPIRED",
-      "message":"토큰이 존재하지 않습니다."
+      "message":"만료된 토큰입니다."
    },
    {
       "code":"TOKEN_INVALID",

server/src/main/java/server/haengdong/HaengdongApplication.java

@@ -1,12 +1,15 @@
 package server.haengdong;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+@Slf4j
 @SpringBootApplication
 public class HaengdongApplication {
 
     public static void main(String[] args) {
+        log.error("################### 안녕하세요. CI/CD 테스트입니다. ###################");
         SpringApplication.run(HaengdongApplication.class, args);
     }
 

server/src/main/java/server/haengdong/application/EventService.java

@@ -3,12 +3,14 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Set;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import server.haengdong.application.request.EventAppRequest;
 import server.haengdong.application.request.EventLoginAppRequest;
-import server.haengdong.application.request.MemberUpdateAppRequest;
+import server.haengdong.application.request.MemberNameUpdateAppRequest;
+import server.haengdong.application.request.MemberNamesUpdateAppRequest;
 import server.haengdong.application.response.ActionAppResponse;
 import server.haengdong.application.response.EventAppResponse;
 import server.haengdong.application.response.EventDetailAppResponse;
@@ -100,22 +102,55 @@ public MembersAppResponse findAllMembers(String token) {
     }
 
     @Transactional
-    public void updateMember(String token, String memberName, MemberUpdateAppRequest request) {
+    public void updateMember(String token, MemberNamesUpdateAppRequest request) {
         Event event = getEvent(token);
-        String updatedMemberName = request.name();
-        validateMemberNameUnique(event, updatedMemberName);
+        List<MemberNameUpdateAppRequest> members = request.members();
 
-        memberActionRepository.findAllByAction_EventAndMemberName(event, memberName)
-                .forEach(memberAction -> memberAction.updateMemberName(updatedMemberName));
+        validateBeforeNames(members, event);
+        validateAfterNames(members, event);
+
+        members.forEach(member -> updateMemberName(event, member.before(), member.after()));
+    }
+
+    private void validateBeforeNames(List<MemberNameUpdateAppRequest> members, Event event) {
+        List<String> beforeNames = members.stream()
+                .map(MemberNameUpdateAppRequest::before)
+                .toList();
+        if (beforeNames.size() != Set.copyOf(beforeNames).size()) {
+            throw new HaengdongException(HaengdongErrorCode.MEMBER_NAME_CHANGE_DUPLICATE);
+        }
+        beforeNames.forEach(beforeName -> validateBeforeMemberNameExist(event, beforeName));
+    }
+
+    private void validateBeforeMemberNameExist(Event event, String beforeName) {
+        boolean isMemberNameExist = memberActionRepository.existsByAction_EventAndMemberName(event, beforeName);
+        if (!isMemberNameExist) {
+            throw new HaengdongException(HaengdongErrorCode.MEMBER_NOT_EXIST);
+        }
+    }
+
+    private void validateAfterNames(List<MemberNameUpdateAppRequest> members, Event event) {
+        List<String> afterNames = members.stream()
+                .map(MemberNameUpdateAppRequest::after)
+                .toList();
+        if (afterNames.size() != Set.copyOf(afterNames).size()) {
+            throw new HaengdongException(HaengdongErrorCode.MEMBER_NAME_CHANGE_DUPLICATE);
+        }
+        afterNames.forEach(afterName -> validateAfterMemberNameNotExist(event, afterName));
     }
 
-    private void validateMemberNameUnique(Event event, String updatedMemberName) {
-        boolean isMemberNameExist = memberActionRepository.existsByAction_EventAndMemberName(event, updatedMemberName);
+    private void validateAfterMemberNameNotExist(Event event, String afterName) {
+        boolean isMemberNameExist = memberActionRepository.existsByAction_EventAndMemberName(event, afterName);
         if (isMemberNameExist) {
             throw new HaengdongException(HaengdongErrorCode.MEMBER_NAME_DUPLICATE);
         }
     }
 
+    private void updateMemberName(Event event, String beforeName, String afterName) {
+        memberActionRepository.findAllByAction_EventAndMemberName(event, beforeName)
+                .forEach(memberAction -> memberAction.updateMemberName(afterName));
+    }
+
     public void validatePassword(EventLoginAppRequest request) throws HaengdongException {
         Event event = getEvent(request.token());
         if (event.isNotSamePassword(request.password())) {

server/src/main/java/server/haengdong/application/request/MemberNameUpdateAppRequest.java

@@ -0,0 +1,7 @@
+package server.haengdong.application.request;
+
+public record MemberNameUpdateAppRequest(
+        String before,
+        String after
+) {
+}

server/src/main/java/server/haengdong/application/request/MemberNamesUpdateAppRequest.java

@@ -0,0 +1,8 @@
+package server.haengdong.application.request;
+
+import java.util.List;
+
+public record MemberNamesUpdateAppRequest(
+        List<MemberNameUpdateAppRequest> members
+) {
+}

server/src/main/java/server/haengdong/exception/HaengdongErrorCode.java

@@ -25,6 +25,7 @@ public enum HaengdongErrorCode {
     MEMBER_NAME_DUPLICATE("중복된 행사 참여 인원 이름이 존재합니다."),
     MEMBER_NOT_EXIST("현재 참여하고 있지 않는 인원이 존재합니다."),
     MEMBER_ALREADY_EXIST("현재 참여하고 있는 인원이 존재합니다."),
+    MEMBER_NAME_CHANGE_DUPLICATE("중복된 참여 인원 이름 변경 요청이 존재합니다."),
 
     MEMBER_ACTION_NOT_FOUND("존재하지 않는 멤버 액션입니다."),
     MEMBER_ACTION_STATUS_INVALID("멤버 액션은 IN, OUT만 가능합니다. 입력한 멤버 액션: %s"),

server/src/main/java/server/haengdong/presentation/EventController.java

@@ -2,6 +2,7 @@
 
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseCookie;
@@ -17,12 +18,13 @@
 import server.haengdong.infrastructure.auth.CookieProperties;
 import server.haengdong.presentation.request.EventLoginRequest;
 import server.haengdong.presentation.request.EventSaveRequest;
-import server.haengdong.presentation.request.MemberUpdateRequest;
+import server.haengdong.presentation.request.MemberNamesUpdateRequest;
 import server.haengdong.presentation.response.EventDetailResponse;
 import server.haengdong.presentation.response.EventResponse;
 import server.haengdong.presentation.response.MembersResponse;
 import server.haengdong.presentation.response.StepsResponse;
 
+@Slf4j
 @RequiredArgsConstructor
 @EnableConfigurationProperties(CookieProperties.class)
 @RestController
@@ -34,6 +36,8 @@ public class EventController {
 
     @PostMapping("/api/events")
     public ResponseEntity<EventResponse> saveEvent(@Valid @RequestBody EventSaveRequest request) {
+        log.error("################### 안녕하세요. CI/CD 테스트입니다. ###################");
+
         EventResponse eventResponse = EventResponse.of(eventService.saveEvent(request.toAppRequest()));
 
         String jwtToken = authService.createToken(eventResponse.eventId());
@@ -65,13 +69,12 @@ public ResponseEntity<MembersResponse> findAllMembers(@PathVariable("eventId") S
         return ResponseEntity.ok(response);
     }
 
-    @PutMapping("/api/events/{eventId}/members/{memberName}")
+    @PutMapping("/api/events/{eventId}/members/nameChange")
     public ResponseEntity<Void> updateMember(
             @PathVariable("eventId") String token,
-            @PathVariable("memberName") String memberName,
-            @Valid @RequestBody MemberUpdateRequest request
+            @Valid @RequestBody MemberNamesUpdateRequest request
     ) {
-        eventService.updateMember(token, memberName, request.toAppRequest());
+        eventService.updateMember(token, request.toAppRequest());
 
         return ResponseEntity.ok().build();
     }
@@ -90,7 +93,7 @@ public ResponseEntity<Void> loginEvent(
                 .build();
     }
 
-    @GetMapping("/api/events/{eventId}/auth")
+    @PostMapping("/api/events/{eventId}/auth")
     public ResponseEntity<Void> authenticate(@PathVariable("eventId") String token) {
         return ResponseEntity.ok().build();
     }

server/src/main/java/server/haengdong/presentation/request/MemberNameUpdateRequest.java

@@ -0,0 +1,18 @@
+package server.haengdong.presentation.request;
+
+import jakarta.validation.constraints.NotBlank;
+import server.haengdong.application.request.MemberNameUpdateAppRequest;
+
+public record MemberNameUpdateRequest(
+
+        @NotBlank(message = "멤버 이름은 공백일 수 없습니다.")
+        String before,
+
+        @NotBlank(message = "멤버 이름은 공백일 수 없습니다.")
+        String after
+) {
+
+    public MemberNameUpdateAppRequest toAppRequest() {
+        return new MemberNameUpdateAppRequest(before, after);
+    }
+}

server/src/main/java/server/haengdong/presentation/request/MemberNamesUpdateRequest.java

@@ -0,0 +1,16 @@
+package server.haengdong.presentation.request;
+
+import jakarta.validation.Valid;
+import java.util.List;
+import server.haengdong.application.request.MemberNamesUpdateAppRequest;
+
+public record MemberNamesUpdateRequest(
+        @Valid List<MemberNameUpdateRequest> members
+) {
+
+    public MemberNamesUpdateAppRequest toAppRequest() {
+        return new MemberNamesUpdateAppRequest(members.stream()
+                .map(MemberNameUpdateRequest::toAppRequest)
+                .toList());
+    }
+}

server/src/main/resources/application.yml

@@ -39,14 +39,19 @@ management:
   endpoints:
     web:
       exposure:
-        include: logfile
+        include: logfile, metrics
 
 logging:
   level:
     root: debug
     org.springframework.web: debug
     server.haengdong: debug
 
+  file:
+    name: logs/spring-boot-application.log
+    path: logs
+  config: classpath:logback-spring.xml
+
 server:
   servlet:
     encoding: