fix: develop 브랜치 merge 및 충돌 해결

Author: leesanghuu

build.gradle

@@ -38,6 +38,7 @@ dependencies {
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 	implementation 'org.mapstruct:mapstruct:1.5.5.Final'
 	annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
 }
 
 tasks.named('test') {

src/main/java/com/ODG/ODG_back/controller/MeetingController.java

@@ -1,4 +1,26 @@
 package com.ODG.ODG_back.controller;
 
+import com.ODG.ODG_back.dto.meeting.request.MeetingCreateRequestDto;
+import com.ODG.ODG_back.dto.meeting.response.MeetingCreateResponseDto;
+import com.ODG.ODG_back.dto.meeting.response.MeetingInfoResponseDto;
+import com.ODG.ODG_back.service.MeetingService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/meetings")
+@RequiredArgsConstructor
 public class MeetingController {
+    private final MeetingService meetingService;
+
+    @PostMapping("/")
+    public ResponseEntity<MeetingCreateResponseDto> createMeeting(@RequestBody MeetingCreateRequestDto dto) {
+        return ResponseEntity.ok(meetingService.addMeeting(dto));
+    }
+
+    @GetMapping("/{linkCode}")
+    public ResponseEntity<MeetingInfoResponseDto> getMeeting(@PathVariable String linkCode) {
+        return ResponseEntity.ok(meetingService.getMeeting(linkCode));
+    }
 }

src/main/java/com/ODG/ODG_back/controller/ParticipantController.java

@@ -1,4 +1,48 @@
 package com.ODG.ODG_back.controller;
 
+import com.ODG.ODG_back.dto.participant.request.ParticipantDeletionRequestDto;
+import com.ODG.ODG_back.dto.participant.request.ParticipantRegisterRequestDto;
+import com.ODG.ODG_back.dto.participant.request.ParticipantUpdateRequestDto;
+import com.ODG.ODG_back.dto.participant.response.ParticipantListResponseDto;
+import com.ODG.ODG_back.dto.participant.response.ParticipantRegisterResponseDto;
+import com.ODG.ODG_back.service.MeetingService;
+import com.ODG.ODG_back.service.ParticipantService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+@RestController
+@RequestMapping("/meetings/{linkCode}/participants")
+@RequiredArgsConstructor
 public class ParticipantController {
+
+    private final ParticipantService participantService;
+    private final MeetingService meetingService;
+
+    @PostMapping("/register")
+    public ResponseEntity<ParticipantRegisterResponseDto> addParticipant(@PathVariable String linkCode, @RequestBody ParticipantRegisterRequestDto participantRegisterRequestDto){
+        ParticipantRegisterResponseDto participantRegisterResponseDto = participantService.addParticipant(linkCode, participantRegisterRequestDto);
+        return ResponseEntity.ok(participantRegisterResponseDto);
+    }
+
+    @DeleteMapping("/delete")
+    public ResponseEntity<Void> deleteParticipant(@PathVariable String linkCode, @RequestBody ParticipantDeletionRequestDto participantDeletionRequestDto){
+        participantService.deleteParticipant(linkCode, participantDeletionRequestDto);
+        return ResponseEntity.ok().build();
+    }
+
+    @PutMapping("/update")
+    public ResponseEntity<Void> updateParticipant(@PathVariable String linkCode, @RequestBody ParticipantUpdateRequestDto participantUpdateRequestDto){
+        participantService.modifyParticipant(linkCode, participantUpdateRequestDto);
+        return ResponseEntity.ok().build();
+    }
+
+    @GetMapping("/")
+    public ResponseEntity<List<ParticipantListResponseDto>> getParticipants(@PathVariable String linkCode){
+        List<ParticipantListResponseDto> participants = meetingService.getParticipants(linkCode);
+        return ResponseEntity.ok(participants);
+    }
 }

src/main/java/com/ODG/ODG_back/controller/PlaceController.java

@@ -1,4 +1,26 @@
 package com.ODG.ODG_back.controller;
 
+import com.ODG.ODG_back.dto.place.response.PlaceResponseDto;
+import com.ODG.ODG_back.service.PlaceService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/meetings/{inviteCode}")
+@RequiredArgsConstructor
 public class PlaceController {
+
+    private final PlaceService placeService;
+
+    @GetMapping("/places")
+    public ResponseEntity<List<PlaceResponseDto>> getPlacesByMidpoint(@PathVariable String inviteCode) {
+        return ResponseEntity.ok(placeService.getPlacesByMidpoint(inviteCode));
+    }
+
 }

src/main/java/com/ODG/ODG_back/controller/VoteController.java

@@ -1,4 +1,43 @@
 package com.ODG.ODG_back.controller;
 
+import com.ODG.ODG_back.dto.vote.request.VoteRequestDto;
+import com.ODG.ODG_back.dto.vote.response.VoteResultDto;
+import com.ODG.ODG_back.service.VoteService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/meetings/{inviteCode}")
+@RequiredArgsConstructor
 public class VoteController {
-}
+
+    private final VoteService voteService;
+
+    @PostMapping("/vote")
+    public ResponseEntity<String> vote(@PathVariable String inviteCode,
+                                       @RequestBody VoteRequestDto voteRequest) {
+        try {
+            voteService.vote(inviteCode, voteRequest);
+            return ResponseEntity.ok().body("OK");
+        } catch (RuntimeException e) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getMessage());
+        }
+
+
+    }
+
+    @GetMapping("/result")
+    public ResponseEntity<?> getVoteResults(@PathVariable String inviteCode) {
+        try {
+            List<VoteResultDto> voteResults = voteService.getVoteResults(inviteCode);
+            return ResponseEntity.ok(voteResults);
+        } catch (RuntimeException e) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getMessage());
+        }
+    }
+
+}

src/main/java/com/ODG/ODG_back/domain/Meeting.java

@@ -2,15 +2,20 @@
 
 import com.ODG.ODG_back.domain.enums.MeetingType;
 import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
 @Entity
+@NoArgsConstructor
+@AllArgsConstructor
 @Getter
 @Setter
+@Table(indexes = { @Index(name = "idx_meeting_invite_code", columnList = "inviteCode") })
 public class Meeting {
 
     @Id
@@ -22,6 +27,7 @@ public class Meeting {
     @Enumerated(EnumType.STRING)
     private MeetingType type;
 
+    @Column(unique = true)
     private String inviteCode;
 
     private LocalDateTime createdAt;
@@ -36,4 +42,13 @@ public class Meeting {
 
     @OneToMany(mappedBy = "meeting")
     private List<RecommendedMidpoint> recommendedMidpoints;
+
+
+    @PrePersist
+    private void generateInviteCode() {
+        if (this.inviteCode == null) {
+            this.inviteCode = java.util.Base64.getUrlEncoder().withoutPadding()
+                    .encodeToString(java.util.UUID.randomUUID().toString().getBytes());
+        }
+    }
 }

src/main/java/com/ODG/ODG_back/domain/Participant.java

@@ -2,19 +2,17 @@
 
 import com.ODG.ODG_back.domain.enums.TransportType;
 import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Entity
-@Getter
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@Getter
+@Setter
+@Builder
 public class Participant {
 
     @Id
@@ -26,15 +24,14 @@ public class Participant {
     @Column(columnDefinition = "TEXT")
     private String address;
 
-    private BigDecimal latitude;
-
-    private BigDecimal longitude;
-
     @Enumerated(EnumType.STRING)
-    private TransportType transport;
+    private TransportType transportType;
 
     private LocalDateTime joinedAt;
 
+    private BigDecimal latitude;
+    private BigDecimal longitude;
+
     @ManyToOne
     private Meeting meeting;
 }

src/main/java/com/ODG/ODG_back/domain/Place.java

@@ -2,11 +2,13 @@
 
 import com.ODG.ODG_back.domain.enums.PlaceCategory;
 import jakarta.persistence.*;
+import lombok.Getter;
 
 import java.math.BigDecimal;
 import java.util.List;
 
 @Entity
+@Getter
 public class Place {
 
     @Id

src/main/java/com/ODG/ODG_back/domain/RecommendedMidpoint.java

@@ -16,7 +16,7 @@ public class RecommendedMidpoint {
     private Long id;
 
     private double score;
-
+    @Column(name = "midpoint_rank")
     private int rank;
 
     private LocalDateTime recommendedAt;

src/main/java/com/ODG/ODG_back/domain/Vote.java

@@ -1,16 +1,19 @@
 package com.ODG.ODG_back.domain;
 
 import jakarta.persistence.*;
-
 import java.time.LocalDateTime;
 
+@AllArgsConstructor
+@NoArgsConstructor
 @Entity
+@Getter
 public class Vote {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @Setter
     private Integer voteValue;
 
     private LocalDateTime votedAt;
@@ -23,5 +26,16 @@ public class Vote {
 
     @ManyToOne
     private Participant participant;
+
+    public Vote(Meeting meeting, Place place, Participant participant) {
+        this.meeting = meeting;
+        this.place = place;
+        this.participant = participant;
+        this.voteValue = 1; // 새 투표 시 voteValue를 1로 고정
+        this.votedAt = LocalDateTime.now(); // 투표 생성 시간 설정
+    }
+    public void toggleVoteValue() {
+        this.voteValue = (this.voteValue == 1) ? 0 : 1;
+    }
 }