Merge branch 'dev' into feat/#49-api

.github/workflows/deploy.yml

@@ -1,9 +1,9 @@
 name: Deploy to EC2 with Docker Compose
 
 on:
-  push:
+  pull_request:
     branches:
-      - fix/#44-casper
+      - dev
 
 env:
   AWS_REGION: ap-northeast-2

Server/build.gradle

@@ -44,8 +44,10 @@ dependencies {
 
     implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
-    runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.11.5")}
+    runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.11.5")
+    annotationProcessor('org.projectlombok:lombok')
 
+}
 
 tasks.named('test') {
     useJUnitPlatform()

Server/src/main/java/JGS/CasperEvent/domain/event/controller/eventController/RushEventController.java

@@ -3,6 +3,7 @@
 
 import JGS.CasperEvent.domain.event.dto.ResponseDto.RushEventListAndServerTimeResponse;
 import JGS.CasperEvent.domain.event.service.eventService.RushEventService;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,10 +23,10 @@ public ResponseEntity<RushEventListAndServerTimeResponse> getRushEventListAndSer
     }
 
     // 밸런스 게임 참여 여부 조회
-//    @GetMapping("/{eventId}/applied")
-//    public ResponseEntity<Boolean> checkUserParticipationInRushEvent(@PathVariable Long eventId,
-//                                                                     @CookieValue String userData) {
-//
-//        return ResponseEntity.ok(rushEventService.isExists(eventId, userData));
-//    }
+    @GetMapping("/{eventId}/applied")
+    public ResponseEntity<Boolean> checkUserParticipationInRushEvent(HttpServletRequest httpServletRequest, @PathVariable("eventId") Long eventId) {
+
+        String userId = httpServletRequest.getAttribute("userId").toString();
+        return ResponseEntity.ok(rushEventService.isExists(eventId, userId));
+    }
 }

Server/src/main/java/JGS/CasperEvent/domain/event/repository/participantsRepository/RushParticipantsRepository.java

@@ -1,7 +1,15 @@
 package JGS.CasperEvent.domain.event.repository.participantsRepository;
 
+import JGS.CasperEvent.domain.event.entity.participants.RushParticipants;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface RushParticipantsRepository {
+public interface RushParticipantsRepository extends JpaRepository<RushParticipants, String> {
+    @Query("SELECT CASE WHEN COUNT(rp) > 0 THEN TRUE ELSE FALSE END " +
+            "FROM RushParticipants rp " +
+            "WHERE rp.rushEvent.rushEventId = :eventId AND rp.id = :userId")
+    boolean existsByRushEventIdAndUserId(@Param("eventId") Long eventId, @Param("userId") String userId);
 }

Server/src/main/java/JGS/CasperEvent/domain/event/service/eventService/RushEventService.java

@@ -4,18 +4,20 @@
 import JGS.CasperEvent.domain.event.dto.ResponseDto.RushEventListAndServerTimeResponse;
 import JGS.CasperEvent.domain.event.entity.event.RushEvent;
 import JGS.CasperEvent.domain.event.repository.eventRepository.RushEventRepository;
+import JGS.CasperEvent.domain.event.repository.participantsRepository.RushParticipantsRepository;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
 public class RushEventService {
-
     private final RushEventRepository rushEventRepository;
+    private final RushParticipantsRepository rushParticipantsRepository;
 
-    public RushEventService(RushEventRepository rushEventRepository) {
+    public RushEventService(RushEventRepository rushEventRepository, RushParticipantsRepository rushParticipantsRepository) {
         this.rushEventRepository = rushEventRepository;
+        this.rushParticipantsRepository = rushParticipantsRepository;
     }
 
     public RushEventListAndServerTimeResponse getAllRushEvents() {
@@ -29,10 +31,7 @@ public RushEventListAndServerTimeResponse getAllRushEvents() {
         return new RushEventListAndServerTimeResponse(rushEventDtoList, LocalDateTime.now());
     }
 
-//    public boolean isExists(Long eventId, String userData) {
-//        RushEvent rushEvent = findByIdOrElseThrow(rushEventRepository, eventId, CustomErrorCode.NO_RUSH_EVENT);
-//
-//
-//    }
-
+    public boolean isExists(Long eventId, String userId) {
+        return rushParticipantsRepository.existsByRushEventIdAndUserId(eventId, userId);
+    }
 }

Server/src/main/java/JGS/CasperEvent/global/jwt/filter/JwtAuthorizationFilter.java

@@ -28,7 +28,7 @@
 @RequiredArgsConstructor
 public class JwtAuthorizationFilter implements Filter {
 
-    private final String[] whiteListUris = new String[]{"/event/auth", "/event/rush", "/event/lottery/caspers", "/admin/join", "/admin/auth", "/h2", "/h2/*"};
+    private final String[] whiteListUris = new String[]{"/event/auth", "/event/rush", "/event/lottery/caspers", "/admin/join", "/admin/auth", "/h2", "/h2/*", "/swagger-ui/*", "/v3/api-docs", "/v3/api-docs/*"};
     private final String[] blackListUris = new String[]{"/event/rush/*"};
 
     private final JwtProvider jwtProvider;

Server/src/main/java/JGS/CasperEvent/global/jwt/util/JwtProvider.java

@@ -40,7 +40,7 @@ public Claims getClaims(String token) {
 
 
     public Date getExpireDateAccessToken() {
-        long expireTimeMils = 1000L * 60 * 60 * 24 * 7 * 365;
+        long expireTimeMils = 1000L * 60 * 60 * 24 * 365;
         return new Date(System.currentTimeMillis() + expireTimeMils);
     }