dev -> main

docker-compose.yml

@@ -1,25 +1,43 @@
 version: '3.7'
 services:
-  db:
-    image: mysql:8-oracle
-    restart: always
-    environment:
-      MYSQL_DATABASE: '{MYSQL_DATABASE}'
-      MYSQL_USER: '${MYSQL_USER}'
-      MYSQL_PASSWORD: '${MYSQL_PASSWORD}'
-      MYSQL_ROOT_PASSWORD: '${MYSQL_ROOT_PASSWORD}'
+  database:
+    container_name: mysql_db
+    image: mysql:8
+    restart: unless-stopped
+    env_file:
+      - .env
     ports:
-      - '3306:3306'
+      - "3306:3306"
     volumes:
-      - db_data:/var/lib/mysql
+      - ./mysql/conf.d:/etc/mysql/conf.d
+    command:
+      - "mysqld"
+      - "--character-set-server=utf8mb4"
+      - "--collation-server=utf8mb4_unicode_ci"
+    networks:
+      - backend_network
+
+  application:
+    container_name: backend
+    deploy:
+      restart_policy:
+        condition: on-failure
+        max_attempts: 5
+        delay: 3s
 
-  app:
     image: syw5141/dnd-10th-2-backend:latest
     ports:
       - "8080:8080"
+    env_file:
+      - .env
+    environment:
+      SPRING_DATASOURCE_URL: jdbc:mysql://mysql_db:3306/${MYSQL_DATABASE}?useSSL=false&allowPublicKeyRetrieval=true
+      SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME}
+      SPRING_DATASOURCE_PASSWORD: ${MYSQL_ROOT_PASSWORD}
     depends_on:
-      - db
+      - database
+    networks:
+      - backend_network
 
-# 볼륨 정의 (기본 설정 사용)
-volumes:
-  db_data:
+networks:
+  backend_network:

src/main/java/org/dnd/timeet/agenda/application/AgendaService.java

@@ -3,6 +3,7 @@
 import java.time.Duration;
 import java.time.LocalTime;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.dnd.timeet.agenda.domain.Agenda;
@@ -13,6 +14,8 @@
 import org.dnd.timeet.agenda.dto.AgendaActionResponse;
 import org.dnd.timeet.agenda.dto.AgendaCreateRequest;
 import org.dnd.timeet.agenda.dto.AgendaInfoResponse;
+import org.dnd.timeet.agenda.dto.AgendaPatchRequest;
+import org.dnd.timeet.agenda.dto.AgendaPatchResponse;
 import org.dnd.timeet.common.exception.BadRequestError;
 import org.dnd.timeet.common.exception.NotFoundError;
 import org.dnd.timeet.common.exception.NotFoundError.ErrorCode;
@@ -33,17 +36,22 @@ public class AgendaService {
     private final AgendaRepository agendaRepository;
     private final ParticipantRepository participantRepository;
 
+    @Transactional
     public Long createAgenda(Long meetingId, AgendaCreateRequest createDto, Member member) {
         Meeting meeting = meetingRepository.findById(meetingId)
             .orElseThrow(() -> new NotFoundError(ErrorCode.RESOURCE_NOT_FOUND,
                 Collections.singletonMap("MeetingId", "Meeting not found")));
 
         // 회의에 참가한 멤버인지 확인
-        participantRepository.findByMeetingIdAndMemberId(meetingId, member.getId())
-            .orElseThrow(() -> new BadRequestError(BadRequestError.ErrorCode.VALIDATION_FAILED,
-                Collections.singletonMap("MemberId", "Member is not a participant of the meeting")));
+        boolean isParticipantExists = participantRepository.existsByMeetingIdAndMemberId(meetingId, member.getId());
+        if (!isParticipantExists) {
+            throw new BadRequestError(BadRequestError.ErrorCode.VALIDATION_FAILED,
+                Collections.singletonMap("MemberId", "Member is not a participant of the meeting"));
+        }
 
         Agenda agenda = createDto.toEntity(meeting);
+        List<Agenda> agendaList = agendaRepository.findByMeetingId(meetingId);
+        agenda.setOrderNum(agendaList.size() + 1);
         agenda = agendaRepository.save(agenda);
 
         // 회의 시간 추가
@@ -59,6 +67,10 @@ public List<Agenda> findAll(Long meetingId) {
     }
 
     public AgendaActionResponse changeAgendaStatus(Long meetingId, Long agendaId, AgendaActionRequest actionRequest) {
+        Meeting meeting = meetingRepository.findById(meetingId)
+            .orElseThrow(() -> new NotFoundError(ErrorCode.RESOURCE_NOT_FOUND,
+                Collections.singletonMap("MeetingId", "Meeting not found")));
+
         Agenda agenda = agendaRepository.findByIdAndMeetingId(agendaId, meetingId)
             .orElseThrow(() -> new NotFoundError(ErrorCode.RESOURCE_NOT_FOUND,
                 Collections.singletonMap("AgendaId", "Agenda not found")));
@@ -73,31 +85,47 @@ public AgendaActionResponse changeAgendaStatus(Long meetingId, Long agendaId, Ag
                 Collections.singletonMap("Action", "Invalid action"));
         }
 
+        // 안건 시작 요청 전 첫 번째 안건이 시작되었는지 확인
+        if (action == AgendaAction.START && agenda.getOrderNum() != 1) {
+            // 첫 번째 안건의 시작 여부 확인
+            boolean isFirstAgendaStarted = agendaRepository.existsByMeetingIdAndOrderNumAndStatus(
+                meetingId, 1, AgendaStatus.COMPLETED);
+
+            if (!isFirstAgendaStarted) {
+                throw new BadRequestError(BadRequestError.ErrorCode.WRONG_REQUEST_TRANSMISSION,
+                    Collections.singletonMap("AgendaOrder", "First agenda has not been started yet"));
+            }
+        }
+
         switch (action) {
-            case START:
+            case START -> {
+                // 첫번째 안건의 시작 시간을 회의 시작 시간으로 설정
+                meeting.updateStartTimeOnFirstAgendaStart(agenda);
                 agenda.start();
-                break;
-            case PAUSE:
-                agenda.pause();
-                break;
-            case RESUME:
-                agenda.resume();
-                break;
-            case END:
-                agenda.complete();
-                break;
-            case MODIFY:
+            }
+            case PAUSE -> agenda.pause();
+            case RESUME -> agenda.resume();
+            case END -> agenda.complete();
+            case EXTEND -> {
                 LocalTime modifiedDuration = LocalTime.parse(actionRequest.getModifiedDuration());
                 Duration duration = DurationUtils.convertLocalTimeToDuration(modifiedDuration);
                 agenda.extendDuration(duration);
                 // 회의 시간 추가
                 addMeetingTotalActualDuration(meetingId, duration);
-                break;
-            default:
-                throw new BadRequestError(BadRequestError.ErrorCode.VALIDATION_FAILED,
-                    Collections.singletonMap("Action", "Invalid action"));
+            }
+            case REDUCE -> {
+                LocalTime modifiedDuration = LocalTime.parse(actionRequest.getModifiedDuration());
+                Duration duration = DurationUtils.convertLocalTimeToDuration(modifiedDuration);
+                agenda.reduceDuration(duration);
+                // 회의 시간 감소
+                subtractMeetingTotalActualDuration(meetingId, duration);
+            }
+            default -> throw new BadRequestError(BadRequestError.ErrorCode.VALIDATION_FAILED,
+                Collections.singletonMap("Action", "Invalid action"));
         }
+        // 변경 사항 저장
         Agenda savedAgenda = agendaRepository.save(agenda);
+        meetingRepository.save(meeting);
 
         Duration currentDuration = savedAgenda.calculateCurrentDuration();
         Duration remainingDuration = agenda.calculateRemainingTime();
@@ -143,7 +171,59 @@ public AgendaInfoResponse findAgendas(Long meetingId) {
             .orElseThrow(() -> new NotFoundError(ErrorCode.RESOURCE_NOT_FOUND,
                 Collections.singletonMap("MeetingId", "Meeting not found")));
         List<Agenda> agendaList = agendaRepository.findByMeetingId(meetingId);
+        agendaList.sort(Comparator.comparing(Agenda::getOrderNum));
+        return new AgendaInfoResponse(meeting, agendaList);
+    }
+
+    public AgendaInfoResponse changeAgendaOrder(Long meetingId, List<Long> agendaIds) {
+        Meeting meeting = meetingRepository.findById(meetingId)
+            .orElseThrow(() -> new NotFoundError(ErrorCode.RESOURCE_NOT_FOUND,
+                Collections.singletonMap("MeetingId", "Meeting not found")));
+        List<Agenda> agendaList = agendaRepository.findByMeetingId(meetingId);
+
+        if (agendaList.size() != agendaIds.size()) {
+            throw new BadRequestError(BadRequestError.ErrorCode.VALIDATION_FAILED,
+                Collections.singletonMap("AgendaIds", "Agenda Ids size is not matched"));
+        }
+
+        if (agendaList.size() != agendaIds.stream().distinct().count()) {
+            throw new BadRequestError(BadRequestError.ErrorCode.VALIDATION_FAILED,
+                Collections.singletonMap("AgendaIds", "Agenda Ids are not unique"));
+        }
+
+        for (int i = 0; i < agendaIds.size(); i++) {
+            Long agendaId = agendaIds.get(i);
+            Agenda agenda = agendaList.stream()
+                .filter(a -> a.getId().equals(agendaId))
+                .findFirst()
+                .orElseThrow(() -> new NotFoundError(ErrorCode.RESOURCE_NOT_FOUND,
+                    Collections.singletonMap("AgendaId", "Agenda Id " + agendaId + " not found")));
+            agenda.setOrderNum(i + 1);
+        }
+        agendaList.sort(Comparator.comparing(Agenda::getOrderNum));
 
         return new AgendaInfoResponse(meeting, agendaList);
     }
+
+    public AgendaPatchResponse patchAgenda(Long meetingId, Long agendaId, AgendaPatchRequest patchRequest) {
+        // 회의 존재 여부만 확인
+        boolean meetingExists = meetingRepository.existsById(meetingId);
+        if (!meetingExists) {
+            throw new NotFoundError(ErrorCode.RESOURCE_NOT_FOUND,
+                Collections.singletonMap("MeetingId", "Meeting not found"));
+        }
+
+        Agenda agenda = agendaRepository.findByIdAndMeetingId(agendaId, meetingId)
+            .orElseThrow(() -> new NotFoundError(ErrorCode.RESOURCE_NOT_FOUND,
+                Collections.singletonMap("AgendaId", "Agenda not found")));
+        if (agenda.getStatus() != AgendaStatus.PENDING) {
+            throw new BadRequestError(BadRequestError.ErrorCode.WRONG_REQUEST_TRANSMISSION,
+                Collections.singletonMap("AgendaStatus", "Agenda is not PENDING status"));
+        }
+
+        agenda.update(patchRequest.getTitle(),
+            DurationUtils.convertLocalTimeToDuration(patchRequest.getAllocatedDuration()));
+
+        return new AgendaPatchResponse(agenda);
+    }
 }

src/main/java/org/dnd/timeet/agenda/controller/AgendaController.java

@@ -9,6 +9,9 @@
 import org.dnd.timeet.agenda.dto.AgendaActionResponse;
 import org.dnd.timeet.agenda.dto.AgendaCreateRequest;
 import org.dnd.timeet.agenda.dto.AgendaInfoResponse;
+import org.dnd.timeet.agenda.dto.AgendaOrderRequest;
+import org.dnd.timeet.agenda.dto.AgendaPatchRequest;
+import org.dnd.timeet.agenda.dto.AgendaPatchResponse;
 import org.dnd.timeet.common.security.CustomUserDetails;
 import org.dnd.timeet.common.utils.ApiUtils;
 import org.dnd.timeet.common.utils.ApiUtils.ApiResult;
@@ -19,6 +22,7 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -81,4 +85,25 @@ public ResponseEntity deleteAgenda(
 
         return ResponseEntity.noContent().build();
     }
+
+    @PatchMapping("/{meeting-id}/agendas/order")
+    @Operation(summary = "안건 순서 변경", description = "안건의 순서를 변경한다.")
+    public ResponseEntity<ApiResult<AgendaInfoResponse>> changeAgendaOrder(
+        @PathVariable("meeting-id") Long meetingId,
+        @RequestBody @Valid AgendaOrderRequest agendaOrderRequest) {
+        AgendaInfoResponse agendaInfoResponse = agendaService.changeAgendaOrder(meetingId,
+            agendaOrderRequest.getAgendaIds());
+        return ResponseEntity.ok(ApiUtils.success(agendaInfoResponse));
+    }
+
+    @PatchMapping("/{meeting-id}/agendas/{agenda-id}")
+    @Operation(summary = "안건 수정", description = "지정된 ID에 해당하는 안건을 수정한다.")
+    public ResponseEntity<ApiResult<AgendaPatchResponse>> deleteAgenda(
+        @PathVariable("meeting-id") Long meetingId,
+        @PathVariable("agenda-id") Long agendaId,
+        @RequestBody AgendaPatchRequest patchRequest) {
+        AgendaPatchResponse response = agendaService.patchAgenda(meetingId, agendaId, patchRequest);
+
+        return ResponseEntity.ok(ApiUtils.success(response));
+    }
 }

src/main/java/org/dnd/timeet/agenda/domain/Agenda.java

@@ -75,6 +75,9 @@ public Agenda(Meeting meeting, String title, AgendaType type, Duration allocated
         this.orderNum = orderNum;
     }
 
+    public void setOrderNum(Integer orderNum) {
+        this.orderNum = orderNum;
+    }
 
     public void start() {
         validateTransition(AgendaStatus.PENDING);
@@ -102,6 +105,15 @@ public void extendDuration(Duration extension) {
         }
     }
 
+    public void reduceDuration(Duration reduction) {
+        if (this.status != AgendaStatus.COMPLETED && this.allocatedDuration.compareTo(reduction) > 0) {
+            this.allocatedDuration = this.allocatedDuration.minus(reduction);
+        } else {
+            throw new BadRequestError(BadRequestError.ErrorCode.WRONG_REQUEST_TRANSMISSION,
+                Collections.singletonMap("AgendaDuration", "Invalid duration reduction"));
+        }
+    }
+
     public void complete() {
         validateTransition(AgendaStatus.INPROGRESS, AgendaStatus.PAUSED);
 
@@ -158,5 +170,10 @@ public void cancel() {
         this.delete();
     }
 
+    public void update(String title, Duration allocatedDuration) {
+        this.title = title;
+        this.allocatedDuration = allocatedDuration;
+    }
+
 }
 

src/main/java/org/dnd/timeet/agenda/domain/AgendaAction.java

@@ -1,7 +1,7 @@
 package org.dnd.timeet.agenda.domain;
 
 public enum AgendaAction {
-    START, PAUSE, RESUME, END, MODIFY;
+    START, PAUSE, RESUME, END, EXTEND, REDUCE;
 
     @Override
     public String toString() {

src/main/java/org/dnd/timeet/agenda/domain/AgendaRepository.java

@@ -9,4 +9,9 @@ public interface AgendaRepository extends JpaRepository<Agenda, Long> {
     List<Agenda> findByMeetingId(Long meetingId);
 
     Optional<Agenda> findByIdAndMeetingId(Long agendaId, Long meetingId);
+
+    boolean existsByMeetingIdAndOrderNum(Long meetingId, Integer orderNum);
+
+    boolean existsByMeetingIdAndOrderNumAndStatus(Long meetingId, Integer orderNum, AgendaStatus status);
+
 }

src/main/java/org/dnd/timeet/agenda/dto/AgendaActionRequest.java

@@ -10,7 +10,8 @@
 @Setter
 @NoArgsConstructor
 public class AgendaActionRequest {
+
     private String action;
-    private String modifiedDuration; // "HH:MM" 형식, optional
+    private String modifiedDuration;
 
 }

src/main/java/org/dnd/timeet/agenda/dto/AgendaActionResponse.java

@@ -24,7 +24,6 @@ public class AgendaActionResponse {
     private String currentDuration; // 현재까지 진행된 시간
     private String remainingDuration; // 남은 시간
 
-    private Integer orderNum;
     private String timestamp; // 수정 시간
 
     public AgendaActionResponse(Agenda agenda, Duration currentDuration, Duration remainingDuration) {
@@ -35,8 +34,6 @@ public AgendaActionResponse(Agenda agenda, Duration currentDuration, Duration re
 
         this.currentDuration = DurationUtils.formatDuration(currentDuration);
         this.remainingDuration = DurationUtils.formatDuration(remainingDuration);
-
-        this.orderNum = agenda.getOrderNum();
         this.timestamp = DateTimeUtils.formatLocalDateTime(LocalDateTime.now());
     }
 

src/main/java/org/dnd/timeet/agenda/dto/AgendaCreateRequest.java

@@ -32,17 +32,12 @@ public class AgendaCreateRequest {
     @Schema(description = "안건 소요 시간", example = "01:20:00")
     private LocalTime allocatedDuration;
 
-    @NotNull(message = "안건 순서는 반드시 입력되어야 합니다")
-    @Schema(description = "안건 순서", example = "1")
-    private Integer orderNum;
-
     public Agenda toEntity(Meeting meeting) {
         return Agenda.builder()
             .meeting(meeting)
             .title(this.title)
             .type(this.type.equals("AGENDA") ? AgendaType.AGENDA : AgendaType.BREAK)
             .allocatedDuration(DurationUtils.convertLocalTimeToDuration(this.allocatedDuration))
-            .orderNum(this.orderNum)
             .build();
     }
 }