디렉토리 정리

src/main/java/newCar/event_page/controller/AdminController.java

@@ -5,12 +5,11 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import newCar.event_page.dto.*;
-import newCar.event_page.entity.event.EventId;
+import newCar.event_page.model.dto.*;
+import newCar.event_page.model.entity.event.EventId;
 import newCar.event_page.service.EventService;
 import newCar.event_page.service.QuizService;
 import newCar.event_page.service.RacingService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/newCar/event_page/dto/EventCommonDTO.java → src/main/java/newCar/event_page/model/dto/EventCommonDTO.java

@@ -1,11 +1,11 @@
-package newCar.event_page.dto;
+package newCar.event_page.model.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Data;
-import newCar.event_page.entity.event.EventCommon;
+import newCar.event_page.model.entity.event.EventCommon;
 
 import java.time.LocalDateTime;
 

src/main/java/newCar/event_page/dto/PersonalityTestDTO.java → src/main/java/newCar/event_page/model/dto/PersonalityTestDTO.java

@@ -1,10 +1,10 @@
-package newCar.event_page.dto;
+package newCar.event_page.model.dto;
 
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Data;
-import newCar.event_page.entity.event.racing.PersonalityTest;
+import newCar.event_page.model.entity.event.racing.PersonalityTest;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/newCar/event_page/dto/QuizDTO.java → src/main/java/newCar/event_page/model/dto/QuizDTO.java

@@ -1,11 +1,11 @@
-package newCar.event_page.dto;
+package newCar.event_page.model.dto;
 
 
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Data;
-import newCar.event_page.entity.event.quiz.Quiz;
+import newCar.event_page.model.entity.event.quiz.Quiz;
 
 import java.time.LocalDate;
 import java.util.Arrays;

src/main/java/newCar/event_page/dto/RacingWinnersDTO.java → src/main/java/newCar/event_page/model/dto/RacingWinnersDTO.java

@@ -1,11 +1,10 @@
-package newCar.event_page.dto;
+package newCar.event_page.model.dto;
 
 import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
-import newCar.event_page.entity.Team;
-import newCar.event_page.entity.event.racing.RacingWinner;
+import newCar.event_page.model.entity.Team;
+import newCar.event_page.model.entity.event.racing.RacingWinner;
 
 @Data
 @RequiredArgsConstructor

src/main/java/newCar/event_page/dto/WinnerSettingDTO.java → src/main/java/newCar/event_page/model/dto/WinnerSettingDTO.java

@@ -1,4 +1,4 @@
-package newCar.event_page.dto;
+package newCar.event_page.model.dto;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;

src/main/java/newCar/event_page/entity/LoginType.java → src/main/java/newCar/event_page/model/entity/LoginType.java

@@ -1,4 +1,4 @@
-package newCar.event_page.entity;
+package newCar.event_page.model.entity;
 
 public enum LoginType {
     KAKAO,

src/main/java/newCar/event_page/entity/Team.java → src/main/java/newCar/event_page/model/entity/Team.java

@@ -1,4 +1,4 @@
-package newCar.event_page.entity;
+package newCar.event_page.model.entity;
 
 public enum Team {
     PET,

src/main/java/newCar/event_page/entity/TeamScore.java → src/main/java/newCar/event_page/model/entity/TeamScore.java

@@ -1,4 +1,4 @@
-package newCar.event_page.entity;
+package newCar.event_page.model.entity;
 
 import jakarta.persistence.*;
 import lombok.AccessLevel;

src/main/java/newCar/event_page/entity/User.java → src/main/java/newCar/event_page/model/entity/User.java

@@ -1,4 +1,4 @@
-package newCar.event_page.entity;
+package newCar.event_page.model.entity;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;

src/main/java/newCar/event_page/entity/event/Event.java → src/main/java/newCar/event_page/model/entity/event/Event.java

@@ -1,4 +1,4 @@
-package newCar.event_page.entity.event;
+package newCar.event_page.model.entity.event;
 
 import jakarta.persistence.*;
 import lombok.Getter;

src/main/java/newCar/event_page/entity/event/EventCommon.java → src/main/java/newCar/event_page/model/entity/event/EventCommon.java

@@ -1,10 +1,10 @@
-package newCar.event_page.entity.event;
+package newCar.event_page.model.entity.event;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
-import newCar.event_page.dto.EventCommonDTO;
+import newCar.event_page.model.dto.EventCommonDTO;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;

src/main/java/newCar/event_page/entity/event/EventId.java → src/main/java/newCar/event_page/model/entity/event/EventId.java

@@ -1,4 +1,4 @@
-package newCar.event_page.entity.event;
+package newCar.event_page.model.entity.event;
 
 public enum EventId {
     Racing(1),

src/main/java/newCar/event_page/entity/event/EventUser.java → src/main/java/newCar/event_page/model/entity/event/EventUser.java

@@ -1,8 +1,8 @@
-package newCar.event_page.entity.event;
+package newCar.event_page.model.entity.event;
 
 import jakarta.persistence.*;
 import lombok.Getter;
-import newCar.event_page.entity.User;
+import newCar.event_page.model.entity.User;
 
 
 @Entity

src/main/java/newCar/event_page/entity/event/quiz/Quiz.java → src/main/java/newCar/event_page/model/entity/event/quiz/Quiz.java

@@ -1,10 +1,10 @@
-package newCar.event_page.entity.event.quiz;
+package newCar.event_page.model.entity.event.quiz;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
-import newCar.event_page.dto.QuizDTO;
+import newCar.event_page.model.dto.QuizDTO;
 
 import java.time.LocalDate;
 

src/main/java/newCar/event_page/entity/event/quiz/QuizEvent.java → src/main/java/newCar/event_page/model/entity/event/quiz/QuizEvent.java

@@ -1,8 +1,8 @@
-package newCar.event_page.entity.event.quiz;
+package newCar.event_page.model.entity.event.quiz;
 
 import jakarta.persistence.*;
 import lombok.Getter;
-import newCar.event_page.entity.event.Event;
+import newCar.event_page.model.entity.event.Event;
 
 import java.util.HashSet;
 import java.util.Set;

src/main/java/newCar/event_page/entity/event/quiz/QuizWinner.java → src/main/java/newCar/event_page/model/entity/event/quiz/QuizWinner.java

@@ -1,8 +1,8 @@
-package newCar.event_page.entity.event.quiz;
+package newCar.event_page.model.entity.event.quiz;
 
 import jakarta.persistence.*;
 import lombok.Getter;
-import newCar.event_page.entity.event.EventUser;
+import newCar.event_page.model.entity.event.EventUser;
 
 @Entity
 @Getter

src/main/java/newCar/event_page/entity/event/racing/PersonalityTest.java → src/main/java/newCar/event_page/model/entity/event/racing/PersonalityTest.java

@@ -1,11 +1,10 @@
-package newCar.event_page.entity.event.racing;
+package newCar.event_page.model.entity.event.racing;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
-import newCar.event_page.dto.PersonalityTestDTO;
-import newCar.event_page.entity.Team;
-import newCar.event_page.entity.TeamScore;
+import newCar.event_page.model.dto.PersonalityTestDTO;
+import newCar.event_page.model.entity.TeamScore;
 
 @Entity
 @Getter

src/main/java/newCar/event_page/entity/event/racing/RacingEvent.java → src/main/java/newCar/event_page/model/entity/event/racing/RacingEvent.java

@@ -1,11 +1,11 @@
-package newCar.event_page.entity.event.racing;
+package newCar.event_page.model.entity.event.racing;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
 import jakarta.persistence.OneToMany;
 import lombok.Getter;
-import newCar.event_page.entity.event.Event;
+import newCar.event_page.model.entity.event.Event;
 
 import java.util.HashSet;
 import java.util.Set;

src/main/java/newCar/event_page/entity/event/racing/RacingWinner.java → src/main/java/newCar/event_page/model/entity/event/racing/RacingWinner.java

@@ -1,11 +1,10 @@
-package newCar.event_page.entity.event.racing;
+package newCar.event_page.model.entity.event.racing;
 
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
-import newCar.event_page.entity.event.EventUser;
+import newCar.event_page.model.entity.event.EventUser;
 
 @Entity
 @NoArgsConstructor(access = AccessLevel.PROTECTED)

src/main/java/newCar/event_page/repository/EventCommonRepository.java

@@ -1,6 +1,6 @@
 package newCar.event_page.repository;
 
-import newCar.event_page.entity.event.EventCommon;
+import newCar.event_page.model.entity.event.EventCommon;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 

src/main/java/newCar/event_page/repository/EventRepository.java

@@ -1,6 +1,6 @@
 package newCar.event_page.repository;
 
-import newCar.event_page.entity.event.Event;
+import newCar.event_page.model.entity.event.Event;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 

src/main/java/newCar/event_page/repository/EventUserRepository.java

@@ -1,9 +1,7 @@
 package newCar.event_page.repository;
 
-import newCar.event_page.entity.event.EventUser;
+import newCar.event_page.model.entity.event.EventUser;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 

src/main/java/newCar/event_page/repository/quiz/QuizEventRepository.java

@@ -1,6 +1,6 @@
 package newCar.event_page.repository.quiz;
 
-import newCar.event_page.entity.event.quiz.QuizEvent;
+import newCar.event_page.model.entity.event.quiz.QuizEvent;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface QuizEventRepository extends JpaRepository<QuizEvent,Long> {

src/main/java/newCar/event_page/repository/quiz/QuizRepository.java

@@ -1,11 +1,8 @@
 package newCar.event_page.repository.quiz;
 
-import newCar.event_page.entity.event.quiz.Quiz;
+import newCar.event_page.model.entity.event.quiz.Quiz;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
-import java.time.LocalDate;
 import java.util.List;
 
 

src/main/java/newCar/event_page/repository/racing/PersonalityTestRepository.java

@@ -1,6 +1,6 @@
 package newCar.event_page.repository.racing;
 
-import newCar.event_page.entity.event.racing.PersonalityTest;
+import newCar.event_page.model.entity.event.racing.PersonalityTest;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/newCar/event_page/repository/racing/RacingEventRepository.java

@@ -1,6 +1,6 @@
 package newCar.event_page.repository.racing;
 
-import newCar.event_page.entity.event.racing.RacingEvent;
+import newCar.event_page.model.entity.event.racing.RacingEvent;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface RacingEventRepository extends JpaRepository<RacingEvent,Long> {

src/main/java/newCar/event_page/repository/racing/RacingWinnerRepository.java

@@ -1,6 +1,6 @@
 package newCar.event_page.repository.racing;
 
-import newCar.event_page.entity.event.racing.RacingWinner;
+import newCar.event_page.model.entity.event.racing.RacingWinner;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

src/main/java/newCar/event_page/service/EventService.java

@@ -1,11 +1,11 @@
 package newCar.event_page.service;
 
 import lombok.RequiredArgsConstructor;
-import newCar.event_page.dto.EventCommonDTO;
-import newCar.event_page.entity.event.EventCommon;
-import newCar.event_page.entity.event.EventId;
-import newCar.event_page.entity.event.quiz.Quiz;
-import newCar.event_page.entity.event.quiz.QuizEvent;
+import newCar.event_page.model.dto.EventCommonDTO;
+import newCar.event_page.model.entity.event.EventCommon;
+import newCar.event_page.model.entity.event.EventId;
+import newCar.event_page.model.entity.event.quiz.Quiz;
+import newCar.event_page.model.entity.event.quiz.QuizEvent;
 import newCar.event_page.repository.EventCommonRepository;
 import newCar.event_page.repository.quiz.QuizEventRepository;
 import newCar.event_page.repository.quiz.QuizRepository;

src/main/java/newCar/event_page/service/QuizService.java

@@ -1,9 +1,9 @@
 package newCar.event_page.service;
 
 import lombok.RequiredArgsConstructor;
-import newCar.event_page.dto.QuizDTO;
-import newCar.event_page.entity.event.Event;
-import newCar.event_page.entity.event.quiz.Quiz;
+import newCar.event_page.model.dto.QuizDTO;
+import newCar.event_page.model.entity.event.Event;
+import newCar.event_page.model.entity.event.quiz.Quiz;
 import newCar.event_page.exception.UnmodifiableFieldException;
 import newCar.event_page.repository.EventRepository;
 import newCar.event_page.repository.quiz.QuizRepository;

src/main/java/newCar/event_page/service/RacingService.java

@@ -1,15 +1,14 @@
 package newCar.event_page.service;
 
 import lombok.RequiredArgsConstructor;
-import newCar.event_page.dto.PersonalityTestDTO;
-import newCar.event_page.dto.RacingWinnersDTO;
-import newCar.event_page.dto.WinnerSettingDTO;
-import newCar.event_page.entity.event.EventUser;
-import newCar.event_page.entity.event.racing.PersonalityTest;
-import newCar.event_page.entity.event.racing.RacingWinner;
+import newCar.event_page.model.dto.PersonalityTestDTO;
+import newCar.event_page.model.dto.RacingWinnersDTO;
+import newCar.event_page.model.dto.WinnerSettingDTO;
+import newCar.event_page.model.entity.event.EventUser;
+import newCar.event_page.model.entity.event.racing.PersonalityTest;
+import newCar.event_page.model.entity.event.racing.RacingWinner;
 import newCar.event_page.exception.DrawNotYetConductedException;
 import newCar.event_page.exception.ExcessiveWinnersRequestedException;
-import newCar.event_page.participant.Participant;
 import newCar.event_page.repository.EventUserRepository;
 import newCar.event_page.repository.racing.PersonalityTestRepository;
 import newCar.event_page.repository.racing.RacingEventRepository;
@@ -139,5 +138,14 @@ private Participant findLast(Set<Participant> participantSet){
     private double getWeight(int clickNumber) {
         return 1 + ((Math.log(clickNumber+1))/(Math.log(30)));
     }
+
+    class Participant {
+        public Long userId;
+        public double weight;
+        public Participant(Long userId, double weight) {
+            this.userId=userId;
+            this.weight=weight;
+        }
+    }
 }