[BE] 운영 서버 배포

.github/workflows/be_cd-test.yml

@@ -51,7 +51,7 @@ jobs:
 
   deploy:
     environment: test
-    runs-on: coduo_runner_test-server
+    runs-on: test-ec2-runner
     needs: build
     defaults:
       run:
@@ -75,10 +75,6 @@ jobs:
           DOCKER_REPO_NAME=${{ secrets.DOCKER_REPO_NAME }}
 
           # DB Configuration secrets info from Github Secrets
-          MYSQL_DB_NAME=${{ secrets.MYSQL_DB_NAME }}
-          MYSQL_TIME_ZONE=${{ secrets.MYSQL_TIME_ZONE }}
-          DB_BINDING_PORT=${{ secrets.DB_BINDING_PORT }}
-          DOCKER_DATA_PATH=${{ secrets.DOCKER_DATA_PATH }}
           DB_URL=${{ secrets.DB_URL }}
           DB_USERNAME=${{ secrets.DB_USERNAME }}
           DB_PASSWORD=${{ secrets.DB_PASSWORD }}

backend/src/main/java/site/coduo/member/controller/MemberController.java

@@ -22,7 +22,7 @@ public class MemberController implements MemberControllerDocs {
     public ResponseEntity<MemberReadResponse> getMember(
             @CookieValue(SIGN_IN_COOKIE_NAME) final String token
     ) {
-        final MemberReadResponse response = memberService.findMemberByCredential(token);
+        final MemberReadResponse response = memberService.findMemberNameByCredential(token);
 
         return ResponseEntity.ok(response);
     }

backend/src/main/java/site/coduo/member/domain/Member.java

@@ -76,4 +76,3 @@ public int hashCode() {
         return Objects.hash(id);
     }
 }
-

backend/src/main/java/site/coduo/member/service/MemberService.java

@@ -34,11 +34,17 @@ public void createMember(final String username, final String accessToken) {
         memberRepository.save(member);
     }
 
-    public MemberReadResponse findMemberByCredential(final String token) {
+    public MemberReadResponse findMemberNameByCredential(final String token) {
         final String userId = jwtProvider.extractSubject(token);
         final Member member = memberRepository.findByUserId(userId)
                 .orElseThrow(() -> new MemberNotFoundException(String.format("%s는 찾을 수 없는 회원 아이디입니다.", userId)));
 
         return new MemberReadResponse(member.getUsername());
     }
+
+    public Member findMemberByCredential(final String token) {
+        final String userId = jwtProvider.extractSubject(token);
+        return memberRepository.findByUserId(userId)
+                .orElseThrow(() -> new MemberNotFoundException(String.format("%s는 찾을 수 없는 회원 아이디입니다.", userId)));
+    }
 }

backend/src/main/java/site/coduo/pairroom/controller/PairRoomController.java

@@ -1,10 +1,14 @@
 package site.coduo.pairroom.controller;
 
+import static site.coduo.common.config.filter.SignInCookieFilter.SIGN_IN_COOKIE_NAME;
+
 import java.net.URI;
+import java.util.List;
 
 import jakarta.validation.Valid;
 
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -20,6 +24,7 @@
 import site.coduo.pairroom.service.dto.PairRoomReadRequest;
 import site.coduo.pairroom.service.dto.PairRoomReadResponse;
 import site.coduo.pairroom.service.dto.PairRoomStatusUpdateRequest;
+import site.coduo.pairroom.service.dto.PairRoomMemberResponse;
 
 @RequiredArgsConstructor
 @RestController
@@ -29,19 +34,18 @@ public class PairRoomController implements PairRoomDocs {
 
     @PostMapping("/pair-room")
     public ResponseEntity<PairRoomCreateResponse> createPairRoom(
-            @Valid @RequestBody final PairRoomCreateRequest request
+            @Valid @RequestBody final PairRoomCreateRequest request,
+            @CookieValue(value = SIGN_IN_COOKIE_NAME, required = false) final String token
     ) {
-        final PairRoomCreateResponse response = new PairRoomCreateResponse(
-                pairRoomService.save(request));
+        final String accessCode = pairRoomService.savePairRoom(request, token);
+        final PairRoomCreateResponse response = new PairRoomCreateResponse(accessCode);
 
         return ResponseEntity.created(URI.create("/"))
                 .body(response);
     }
 
     @PatchMapping("/pair-room/{accessCode}/pair-swap")
-    public ResponseEntity<Void> updatePairRole(
-            @PathVariable("accessCode") final String accessCode
-    ) {
+    public ResponseEntity<Void> updatePairRole(@PathVariable("accessCode") final String accessCode) {
         pairRoomService.updateNavigatorWithDriver(accessCode);
 
         return ResponseEntity.noContent()
@@ -67,4 +71,14 @@ public ResponseEntity<PairRoomReadResponse> getPairRoom(
 
         return ResponseEntity.ok(response);
     }
+
+    @GetMapping("/my-pair-rooms")
+    public ResponseEntity<List<PairRoomMemberResponse>> getPairRooms(
+            @CookieValue(SIGN_IN_COOKIE_NAME) final String token
+    ) {
+        final List<PairRoomMemberResponse> pairRooms = pairRoomService.findPairRooms(token);
+
+        return ResponseEntity.ok()
+                .body(pairRooms);
+    }
 }

backend/src/main/java/site/coduo/pairroom/controller/docs/PairRoomDocs.java

@@ -1,10 +1,13 @@
 package site.coduo.pairroom.controller.docs;
 
+import java.util.List;
+
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -14,6 +17,7 @@
 import site.coduo.pairroom.service.dto.PairRoomReadRequest;
 import site.coduo.pairroom.service.dto.PairRoomReadResponse;
 import site.coduo.pairroom.service.dto.PairRoomStatusUpdateRequest;
+import site.coduo.pairroom.service.dto.PairRoomMemberResponse;
 
 @Tag(name = "페어룸 API")
 public interface PairRoomDocs {
@@ -31,7 +35,9 @@ ResponseEntity<PairRoomReadResponse> getPairRoom(
             schema = @Schema(implementation = PairRoomCreateResponse.class)))
     ResponseEntity<PairRoomCreateResponse> createPairRoom(
             @Parameter(description = "페어 프로그래밍에 참여하는 드라이버 이름, 내비게이터 이름, 타이머 시간, 타이머 남은 시간", required = true)
-            PairRoomCreateRequest pairRoomCreateRequest
+            PairRoomCreateRequest pairRoomCreateRequest,
+            @Parameter(description = "로그인 유저 토큰")
+            String token
     );
 
     @Operation(summary = "드라이버 내비게이터 역할을 바꾼다.")
@@ -49,4 +55,17 @@ ResponseEntity<Void> updatePairRoomStatus(
             @Parameter(description = "변경할 페어룸 상태", required = true)
             PairRoomStatusUpdateRequest request
     );
+
+    @Operation(summary = "자신의 페어룸을 조회한다.")
+    @ApiResponse(responseCode = "200", description = "페어룸 조회 성공", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+            schema = @Schema(implementation = PairRoomMemberResponse.class)))
+    ResponseEntity<List<PairRoomMemberResponse>> getPairRooms(
+            @Parameter(
+                    in = ParameterIn.COOKIE,
+                    name = "coduo_whoami",
+                    description = "사용자가 인증에 성공하면 서버에서 발급하는 쿠키",
+                    schema = @Schema(type = "string"),
+                    required = true
+            )
+            String signInToken);
 }

backend/src/main/java/site/coduo/pairroom/repository/PairRoomEntity.java

@@ -100,4 +100,15 @@ public boolean equals(final Object o) {
     public int hashCode() {
         return Objects.hash(id);
     }
+
+    @Override
+    public String toString() {
+        return "PairRoomEntity{" +
+               "id=" + id +
+               ", status=" + status +
+               ", navigator='" + navigator + '\'' +
+               ", driver='" + driver + '\'' +
+               ", accessCode='" + accessCode + '\'' +
+               '}';
+    }
 }

backend/src/main/java/site/coduo/pairroom/repository/PairRoomMemberEntity.java

@@ -0,0 +1,56 @@
+package site.coduo.pairroom.repository;
+
+import java.util.Objects;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import site.coduo.member.domain.Member;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Table(name = "PAIR_ROOM_MEMBER")
+@Entity
+public class PairRoomMemberEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "PAIR_ROOM_ID")
+    private PairRoomEntity pairRoom;
+
+    @ManyToOne
+    @JoinColumn(name = "MEMBER_ID")
+    private Member member;
+
+    public PairRoomMemberEntity(final PairRoomEntity pairRoom, final Member member) {
+        this.pairRoom = pairRoom;
+        this.member = member;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof final PairRoomMemberEntity that)) {
+            return false;
+        }
+        return Objects.equals(getId(), that.getId());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(getId());
+    }
+}

backend/src/main/java/site/coduo/pairroom/repository/PairRoomMemberRepository.java

@@ -0,0 +1,12 @@
+package site.coduo.pairroom.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import site.coduo.member.domain.Member;
+
+public interface PairRoomMemberRepository extends JpaRepository<PairRoomMemberEntity, Long> {
+
+    List<PairRoomMemberEntity> findByMember(Member member);
+}

backend/src/main/java/site/coduo/pairroom/service/PairRoomService.java

@@ -2,10 +2,14 @@
 
 import java.util.List;
 
+import jakarta.annotation.Nullable;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import lombok.RequiredArgsConstructor;
+import site.coduo.member.domain.Member;
+import site.coduo.member.service.MemberService;
 import site.coduo.pairroom.domain.Pair;
 import site.coduo.pairroom.domain.PairName;
 import site.coduo.pairroom.domain.PairRoom;
@@ -14,8 +18,11 @@
 import site.coduo.pairroom.domain.accesscode.AccessCodeFactory;
 import site.coduo.pairroom.domain.accesscode.UUIDAccessCodeStrategy;
 import site.coduo.pairroom.repository.PairRoomEntity;
+import site.coduo.pairroom.repository.PairRoomMemberEntity;
+import site.coduo.pairroom.repository.PairRoomMemberRepository;
 import site.coduo.pairroom.repository.PairRoomRepository;
 import site.coduo.pairroom.service.dto.PairRoomCreateRequest;
+import site.coduo.pairroom.service.dto.PairRoomMemberResponse;
 import site.coduo.pairroom.service.dto.PairRoomReadResponse;
 import site.coduo.timer.domain.Timer;
 import site.coduo.timer.repository.TimerEntity;
@@ -28,9 +35,25 @@ public class PairRoomService {
 
     private final PairRoomRepository pairRoomRepository;
     private final TimerRepository timerRepository;
+    private final PairRoomMemberRepository pairRoomMemberRepository;
+    private final MemberService memberService;
 
     @Transactional
-    public String save(final PairRoomCreateRequest request) {
+    public String savePairRoom(final PairRoomCreateRequest request, @Nullable final String token) {
+        final PairRoom pairRoom = createPairRoom(request);
+        final PairRoomEntity pairRoomEntity = pairRoomRepository.save(PairRoomEntity.from(pairRoom));
+
+        final Timer timer = new Timer(pairRoom.getAccessCode(), request.timerDuration(), request.timerRemainingTime());
+        timerRepository.save(new TimerEntity(timer, pairRoomEntity));
+
+        if (token != null) {
+            final Member member = memberService.findMemberByCredential(token);
+            pairRoomMemberRepository.save(new PairRoomMemberEntity(pairRoomEntity, member));
+        }
+        return pairRoom.getAccessCodeText();
+    }
+
+    private PairRoom createPairRoom(final PairRoomCreateRequest request) {
         final PairRoomStatus status = PairRoomStatus.findByName(request.status());
         final Pair pair = new Pair(new PairName(request.navigator()), new PairName(request.driver()));
         final List<AccessCode> accessCodes = pairRoomRepository.findAll()
@@ -40,12 +63,7 @@ public String save(final PairRoomCreateRequest request) {
                 .toList();
 
         final AccessCodeFactory accessCodeFactory = new AccessCodeFactory(new UUIDAccessCodeStrategy());
-        final PairRoom pairRoom = new PairRoom(status, pair, accessCodeFactory.generate(accessCodes));
-
-        final PairRoomEntity pairRoomEntity = pairRoomRepository.save(PairRoomEntity.from(pairRoom));
-        final Timer timer = new Timer(pairRoom.getAccessCode(), request.timerDuration(), request.timerRemainingTime());
-        timerRepository.save(new TimerEntity(timer, pairRoomEntity));
-        return pairRoom.getAccessCodeText();
+        return new PairRoom(status, pair, accessCodeFactory.generate(accessCodes));
     }
 
     @Transactional
@@ -66,4 +84,15 @@ public PairRoomReadResponse findPairRoomAndTimer(final String accessCode) {
         final TimerEntity timerEntity = timerRepository.fetchTimerByPairRoomId(pairRoomEntity.getId());
         return PairRoomReadResponse.of(pairRoomEntity.toDomain(), timerEntity.toDomain());
     }
+
+    public List<PairRoomMemberResponse> findPairRooms(final String token) {
+        final Member member = memberService.findMemberByCredential(token);
+
+        final List<PairRoomMemberEntity> pairRooms = pairRoomMemberRepository.findByMember(member);
+
+        return pairRooms.stream()
+                .map(PairRoomMemberEntity::getPairRoom)
+                .map(PairRoomMemberResponse::from)
+                .toList();
+    }
 }

backend/src/main/java/site/coduo/pairroom/service/dto/PairRoomMemberResponse.java

@@ -0,0 +1,17 @@
+package site.coduo.pairroom.service.dto;
+
+import site.coduo.pairroom.repository.PairRoomEntity;
+
+public record PairRoomMemberResponse(
+        Long id,
+        String status,
+        String navigator,
+        String driver,
+        String accessCode
+) {
+
+    public static PairRoomMemberResponse from(final PairRoomEntity pairRoom) {
+        return new PairRoomMemberResponse(pairRoom.getId(), pairRoom.getStatus().name(), pairRoom.getNavigator(),
+                pairRoom.getDriver(), pairRoom.getAccessCode());
+    }
+}