Merge branch 'dev' of https://github.com/prgrms-web-devcourse-final-project/WEB5_7_OronaminC_BE into style/67-codeStyle

Author: chcch529

.github/workflows/release-workflow.yml

@@ -0,0 +1,77 @@
+name: OromaminC Backend Service Release
+
+on:
+  push:
+    branches:
+      - release
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+
+  tagging:
+    name: 태깅 및 릴리즈
+    runs-on: ubuntu-latest
+    outputs:
+      tag_name: ${{ steps.tag_version.outputs.new_tag }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: versioning and tagging
+        id: tag_version
+        uses: mathieudutour/[email protected]
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: releasing
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ steps.tag_version.outputs.new_tag }}
+          name: ${{ steps.tag_version.outputs.new_tag }}
+          body: ${{ steps.tag_version.outputs.changelog }}
+
+  build-image:
+    name: 도커 이미지 빌드
+    runs-on: ubuntu-latest
+    needs: tagging
+
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
+
+    steps:
+      - name: Check out Repository
+        uses: actions/checkout@v4
+
+      - name: Setting for Developent
+        run: echo "${{ secrets.APPLICATION_DEV_YML }}" > src/main/resources/application-dev.yml
+
+      - name: Sign in github container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=sha
+            type=raw,value=${{ needs.tagging.outputs.tag_name }}
+            type=raw,value=latest
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -0,0 +1,24 @@
+FROM gradle:jdk21 as builder
+
+WORKDIR /libs
+
+COPY gradlew .
+COPY gradle gradle
+COPY build.gradle .
+COPY settings.gradle .
+
+RUN ./gradlew dependencies --no-daemon || true
+
+COPY src src
+
+RUN ./gradlew build --no-daemon -x test
+
+
+FROM openjdk:21-slim
+
+WORKDIR /app
+
+COPY --from=builder /libs/build/libs/*.jar app.jar
+
+ENTRYPOINT ["java", "-Dspring.profiles.active=dev", "-jar", "app.jar"]
+

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'com.oronaminc'
-version = '0.0.1-SNAPSHOT'
+version = '0.1'
 
 java {
     toolchain {

src/main/java/com/oronaminc/join/document/service/DocumentService.java

@@ -1,6 +1,9 @@
 package com.oronaminc.join.document.service;
 
+import java.util.UUID;
+
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.oronaminc.join.document.dao.DocumentRepository;
 import com.oronaminc.join.document.dto.DocumentRequest;
@@ -11,20 +14,17 @@
 import com.oronaminc.join.infra.service.S3Service;
 import com.oronaminc.join.member.domain.MemberType;
 import com.oronaminc.join.room.domain.Room;
-import jakarta.transaction.Transactional;
 
 import lombok.RequiredArgsConstructor;
 
-import java.util.UUID;
-
-
 @Service
 @RequiredArgsConstructor
 public class DocumentService {
 
     private final DocumentRepository documentRepository;
     private final S3Service s3Service;
 
+    @Transactional
     public void deleteByRoomId(Long roomId) {
         documentRepository.deleteByRoomId(roomId);
     }

src/main/java/com/oronaminc/join/member/domain/Member.java

@@ -30,4 +30,8 @@ public class Member extends BaseEntity {
     public void updateNickname(String nickname) {
         this.nickname = nickname;
     }
+
+    public void registerGuest() {
+        this.email = "GUEST_" + this.id;
+    }
 }

src/main/java/com/oronaminc/join/member/security/AuthService.java

@@ -1,5 +1,7 @@
 package com.oronaminc.join.member.security;
 
+import static com.oronaminc.join.member.util.MemberMapper.*;
+
 import java.util.Map;
 import java.util.Optional;
 
@@ -12,7 +14,6 @@
 
 import com.oronaminc.join.member.dao.MemberRepository;
 import com.oronaminc.join.member.domain.Member;
-import com.oronaminc.join.member.domain.MemberType;
 import com.oronaminc.join.member.dto.GuestLoginRequest;
 import com.oronaminc.join.member.service.MemberReader;
 
@@ -39,45 +40,19 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
 
         Optional<Member> optionalMember = memberReader.findByEmail(kakaoAccount.get("email").toString());
 
-        Member member = optionalMember.orElseGet(
-                () -> memberRepository.save(
-                        Member.builder()
-                                .email(kakaoAccount.get("email").toString())
-                                .nickname(profile.get("nickname").toString())
-                                .profileImage(profile.get("profile_image_url").toString())
-                                .memberType(MemberType.MEMBER)
-                                .build()
-                )
-        );
-
-        return MemberDetails.builder()
-                .id(member.getId())
-                .name(member.getEmail())
-                .nickname(member.getNickname())
-                .role(member.getMemberType())
-                .build();
+        Member member = optionalMember.orElseGet(() -> memberRepository.save(toKakaoMember(kakaoAccount, profile)));
+
+        return toOAuth2MemberDetails(member);
     }
 
     @Transactional
     public MemberDetails loadGuest(GuestLoginRequest guestLoginRequest) {
-        Member guest = Member.builder()
-                .email(null)
-                .nickname(guestLoginRequest.nickname())
-                .profileImage(null)
-                .memberType(MemberType.GUEST)
-                .build();
+        Member guest = toGuestMember(guestLoginRequest);
 
         memberRepository.save(guest);
+        guest.registerGuest();
 
-        // 1. 비회원 MemberDetails 생성
-        MemberDetails memberDetails = MemberDetails.builder()
-                .id(guest.getId())
-                .name("GUEST_" + guest.getId())
-                .nickname(guest.getNickname())
-                .role(MemberType.GUEST)
-                .build();
-
-        return memberDetails;
+        return toGuestMemberDetails(guest);
     }
 
 }

src/main/java/com/oronaminc/join/member/util/MemberMapper.java

@@ -0,0 +1,50 @@
+package com.oronaminc.join.member.util;
+
+import java.util.Map;
+
+import com.oronaminc.join.member.domain.Member;
+import com.oronaminc.join.member.domain.MemberType;
+import com.oronaminc.join.member.dto.GuestLoginRequest;
+import com.oronaminc.join.member.security.MemberDetails;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class MemberMapper {
+    public static MemberDetails toOAuth2MemberDetails(Member member) {
+        return MemberDetails.builder()
+                .id(member.getId())
+                .name(member.getEmail())
+                .nickname(member.getNickname())
+                .role(member.getMemberType())
+                .build();
+    }
+
+    public static MemberDetails toGuestMemberDetails(Member guest) {
+        return MemberDetails.builder()
+                .id(guest.getId())
+                .name(guest.getEmail())
+                .nickname(guest.getNickname())
+                .role(MemberType.GUEST)
+                .build();
+    }
+
+    public static Member toGuestMember(GuestLoginRequest guestLoginRequest) {
+        return Member.builder()
+                .email(null)
+                .nickname(guestLoginRequest.nickname())
+                .profileImage(null)
+                .memberType(MemberType.GUEST)
+                .build();
+    }
+
+    public static Member toKakaoMember(Map<String, Object> kakaoAccount, Map<String, Object> profile) {
+        return Member.builder()
+                .email(kakaoAccount.get("email").toString())
+                .nickname(profile.get("nickname").toString())
+                .profileImage(profile.get("profile_image_url").toString())
+                .memberType(MemberType.MEMBER)
+                .build();
+    }
+}

src/main/java/com/oronaminc/join/participant/domain/Participant.java

@@ -1,15 +1,23 @@
 package com.oronaminc.join.participant.domain;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.Index;
-import jakarta.persistence.Table;
 import java.time.LocalDateTime;
 
 import com.oronaminc.join.global.entity.BaseEntity;
 import com.oronaminc.join.member.domain.Member;
 import com.oronaminc.join.room.domain.Room;
-import jakarta.persistence.*;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -44,4 +52,8 @@ public class Participant extends BaseEntity {
     private ParticipantType participantType;
 
     private LocalDateTime exitedAt;
+
+    public void updateExitAt() {
+        this.exitedAt = LocalDateTime.now();
+    }
 }

src/main/java/com/oronaminc/join/participant/event/ParticipantEventHandler.java

@@ -0,0 +1,21 @@
+package com.oronaminc.join.participant.event;
+
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+import com.oronaminc.join.participant.service.ParticipantService;
+import com.oronaminc.join.room.event.RoomExitEvent;
+
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor
+public class ParticipantEventHandler {
+
+    private final ParticipantService participantService;
+
+    @EventListener
+    public void exitRoomEvent(RoomExitEvent roomExitEvent) {
+        participantService.updateExitAt(roomExitEvent.roomId(), roomExitEvent.memberId());
+    }
+}

src/main/java/com/oronaminc/join/participant/service/ParticipantService.java

@@ -20,20 +20,22 @@
 import lombok.RequiredArgsConstructor;
 
 @Service
-@Transactional
+@Transactional(readOnly=true)
 @RequiredArgsConstructor
 public class ParticipantService {
     private final ParticipantRepository participantRepository;
     private final ParticipantReader participantReader;
     private final MemberReader memberReader;
 
+    @Transactional
     public void savePresenterAndTeam(String presenterEmail, List<String> teamEmail, Room room) {
         saveMemberParticipantByEmail(presenterEmail, room, ParticipantType.PRESENTER);
         for (String email : teamEmail) {
             saveMemberParticipantByEmail(email, room, ParticipantType.TEAM);
         }
     }
 
+    @Transactional
     public void saveMemberParticipantByEmail(String email, Room room, ParticipantType participantType) {
         Member participantMember = memberReader.getByEmail(email);
         if (participantMember.getMemberType().equals(MemberType.GUEST)) {
@@ -42,7 +44,8 @@ public void saveMemberParticipantByEmail(String email, Room room, ParticipantTyp
         Participant participant = ParticipantMapper.toParticipant(participantMember, room, participantType);
         participantRepository.save(participant);
     }
-    
+
+    @Transactional
     public void saveParticipantById(Long memberId, Room room, ParticipantType participantType) {
         Member participantMember = memberReader.getById(memberId);
         if (participantReader.existsByRoomIdAndMemberId(room.getId(), participantMember.getId())) {
@@ -67,6 +70,7 @@ public List<Participant> getTeam(Long roomId) {
         return participantReader.findAllByRoomIdAndParticipantType(roomId, ParticipantType.TEAM);
     }
 
+    @Transactional
     public void updateTeam(Room room, List<String> emails) {
         List<Participant> team = this.getTeam(room.getId());
         for (Participant participant : team) {
@@ -87,7 +91,14 @@ public void validatePresenter(Long roomId, Long memberId) {
         }
     }
 
+    @Transactional
     public void deleteParticipantByRoomId(Long roomId) {
         participantRepository.deleteByRoomId(roomId);
     }
+
+    @Transactional
+    public void updateExitAt(Long roomId, Long memberId) {
+        Participant participant = participantReader.getByRoomIdAndMemberId(roomId, memberId);
+        participant.updateExitAt();
+    }
 }