Fix/#74 cors

Server/src/main/java/JGS/CasperEvent/domain/event/dto/ResponseDto/LotteryEventResponseDto.java

@@ -3,15 +3,18 @@
 import JGS.CasperEvent.domain.event.entity.event.LotteryEvent;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 
-public record LotteryEventResponseDto(Long lotteryEventId, LocalDate startDate, LocalDate endDate,
-                                      int winnerCount) {
-    public static LotteryEventResponseDto of(LotteryEvent lotteryEvent) {
+public record LotteryEventResponseDto(LocalDateTime serverDateTime, LocalDate eventStartDate, LocalDate eventEndDate,
+                                      long activePeriod) {
+    public static LotteryEventResponseDto of(LocalDateTime serverDateTime, LotteryEvent lotteryEvent) {
         return new LotteryEventResponseDto(
-                lotteryEvent.getLotteryEventId(),
-                lotteryEvent.getStartDate(),
-                lotteryEvent.getEndDate(),
-                lotteryEvent.getWinnerCount()
+                serverDateTime,
+                lotteryEvent.getEventStartDate(),
+                lotteryEvent.getEventEndDate(),
+                ChronoUnit.DAYS.between(lotteryEvent.getEventStartDate(), lotteryEvent.getEventEndDate())
         );
     }
+
 }

Server/src/main/java/JGS/CasperEvent/domain/event/dto/ResponseDto/RushEventResponseDto.java

@@ -12,8 +12,8 @@ public record RushEventResponseDto(Long rushEventId, LocalDate startDate, LocalD
     public static RushEventResponseDto of (RushEvent rushEvent){
         return new RushEventResponseDto(
                 rushEvent.getRushEventId(),
-                rushEvent.getStartDate(),
-                rushEvent.getEndDate(),
+                rushEvent.getEventStartDate(),
+                rushEvent.getEventEndDate(),
                 rushEvent.getWinnerCount(),
                 rushEvent.getPrizeImageUrl(),
                 rushEvent.getPrizeDescription(),

Server/src/main/java/JGS/CasperEvent/domain/event/entity/event/BaseEvent.java

@@ -5,16 +5,16 @@
 import java.time.LocalDate;
 
 public class BaseEvent extends BaseEntity {
-    protected LocalDate startDate;
-    protected LocalDate endDate;
+    protected LocalDate eventStartDate;
+    protected LocalDate eventEndDate;
     protected int winnerCount;
 
-    public LocalDate getStartDate() {
-        return startDate;
+    public LocalDate getEventStartDate() {
+        return eventStartDate;
     }
 
-    public LocalDate getEndDate() {
-        return endDate;
+    public LocalDate getEventEndDate() {
+        return eventEndDate;
     }
 
     public int getWinnerCount() {

Server/src/main/java/JGS/CasperEvent/domain/event/entity/participants/LotteryParticipants.java

@@ -33,13 +33,13 @@ public LotteryParticipants() {
     }
 
     public void expectationAdded() {
-        expectations++;
-        appliedCount = Math.max(10, appliedCount + 1);
+        if(expectations == 0) expectations++;
+        appliedCount = Math.min(10, 1 + expectations + linkClickedCount);
     }
 
     public void linkClickedCountAdded() {
         linkClickedCount++;
-        appliedCount = Math.max(10, appliedCount + 1);
+        appliedCount = Math.min(10, 1 + expectations + linkClickedCount);
     }
 
     public LotteryParticipants(BaseUser baseUser) {

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

@@ -14,23 +14,24 @@
 import JGS.CasperEvent.global.enums.CustomErrorCode;
 import JGS.CasperEvent.global.error.exception.CustomException;
 import JGS.CasperEvent.global.jwt.repository.UserRepository;
-import org.apache.coyote.BadRequestException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.file.attribute.UserPrincipalNotFoundException;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 
 @Service
 @Transactional
 public class LotteryEventService {
 
     private final UserRepository userRepository;
-    private LotteryEventRepository lotteryEventRepository;
-    private LotteryParticipantsRepository lotteryParticipantsRepository;
-    private CasperBotRepository casperBotRepository;
-    private RedisService redisService;
+    private final LotteryEventRepository lotteryEventRepository;
+    private final LotteryParticipantsRepository lotteryParticipantsRepository;
+    private final CasperBotRepository casperBotRepository;
+    private final RedisService redisService;
 
     @Autowired
     public LotteryEventService(LotteryEventRepository lotteryEventRepository,
@@ -44,13 +45,13 @@ public LotteryEventService(LotteryEventRepository lotteryEventRepository,
         this.userRepository = userRepository;
     }
 
-    public CasperBotResponseDto postCasperBot(BaseUser user, CasperBotRequestDto postCasperBot) throws CustomException, BadRequestException {
+    public CasperBotResponseDto postCasperBot(BaseUser user, CasperBotRequestDto postCasperBot) throws CustomException {
         LotteryParticipants participants = registerUserIfNeed(user);
 
         CasperBot casperBot = new CasperBot(postCasperBot, participants.getBaseUser().getId());
         participants.updateCasperId(casperBot.getCasperId());
 
-        if (casperBot.getExpectation() != null) participants.expectationAdded();
+        if (!casperBot.getExpectation().isEmpty()) participants.expectationAdded();
         lotteryParticipantsRepository.save(participants);
         casperBotRepository.save(casperBot);
 
@@ -72,7 +73,7 @@ public CasperBotResponseDto getCasperBot(Long casperId) {
     }
 
 
-    public LotteryParticipants registerUserIfNeed(BaseUser user)  {
+    public LotteryParticipants registerUserIfNeed(BaseUser user) {
         LotteryParticipants participant = lotteryParticipantsRepository.findByBaseUser(user).orElse(null);
 
         if (participant == null) {
@@ -87,8 +88,11 @@ public LotteryParticipants registerUserIfNeed(BaseUser user)  {
     }
 
     // TODO: 가짜 API, DB 접속되도록 수정
-    public LotteryEventResponseDto getLotteryEvent(){
-        return new LotteryEventResponseDto(1L, LocalDate.of(2000, 9, 27), LocalDate.of(2100, 9, 27), 363);
+    public LotteryEventResponseDto getLotteryEvent() {
+        return new LotteryEventResponseDto(LocalDateTime.now(),
+                LocalDate.of(2000, 9, 27),
+                LocalDate.of(2100, 9, 27),
+                ChronoUnit.DAYS.between(LocalDate.of(2000, 9, 27), LocalDate.of(2100, 9, 27)));
     }
 
 }

Server/src/main/java/JGS/CasperEvent/global/config/WebConfig.java

@@ -22,14 +22,14 @@
 @Configuration
 public class WebConfig implements WebMvcConfigurer {
 
-    @Override
-    public void addCorsMappings(CorsRegistry registration) {
-        registration.addMapping("/**")
-                .allowCredentials(true)
-                .allowedOrigins("http://localhost:5173", "https://d3phfzvzx3wm4l.cloudfront.net/")
-                .allowedMethods("GET", "POST", "PUT", "DELETE")
-                .allowedHeaders("*");
-    }
+//    @Override
+//    public void addCorsMappings(CorsRegistry registration) {
+//        registration.addMapping("/**")
+//                .allowCredentials(true)
+//                .allowedOrigins("http://localhost:5173", "https://d3phfzvzx3wm4l.cloudfront.net/")
+//                .allowedMethods("GET", "POST", "PUT", "DELETE")
+//                .allowedHeaders("*");
+//    }
 
     @Bean
     public FilterRegistrationBean<CorsFilter> corsFilterRegistrationBean() {
@@ -44,8 +44,9 @@ public UrlBasedCorsConfigurationSource corsConfigurationSource() {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         CorsConfiguration config = new CorsConfiguration();
         config.setAllowCredentials(true);
-        config.addAllowedOrigin("http://localhost:5173"); // 허용할 출처를 명시
-        config.addAllowedOrigin("https://d3phfzvzx3wm4l.cloudfront.net/"); // 허용할 출처를 명시
+        config.addAllowedOrigin("http://localhost:5173");
+        config.addAllowedOrigin("https://d3phfzvzx3wm4l.cloudfront.net/");
+        config.addAllowedOrigin("https://hybrid-jgs.shop");
         config.addAllowedHeader("*");
         config.addAllowedMethod("*");
         source.registerCorsConfiguration("/**", config);