login설정 문제 해결

month와 year받아서 달 동 수정

JWT/src/main/java/JWTLogIn/JWT/user/controller/EventController.java

@@ -17,7 +17,6 @@
 import java.util.stream.Collectors;
 
 
-
 @RestController
 @RequiredArgsConstructor
 @Log4j2
@@ -26,8 +25,8 @@ public class EventController {
     private final EventServiceImpl eventServiceImpl;
 
     @GetMapping("/calendar")
-    public ResponseEntity<List<EventDTO>> calendar_home(){
-        return ResponseEntity.ok(eventServiceImpl.findMonthlyEvents());
+    public ResponseEntity<List<EventDTO>> calendar_home(@RequestParam("year") int year, @RequestParam("month") int month){
+        return ResponseEntity.ok(eventServiceImpl.findMonthlyEvents(year, month));
     }
 
     @GetMapping("/calendar/{event_id}")

JWT/src/main/java/JWTLogIn/JWT/user/entity/UserEntity.java

@@ -14,7 +14,7 @@
 @Builder
 @DynamicInsert
 @NoArgsConstructor @AllArgsConstructor
-@Table(name = "user")
+@Table(name = "users")
 public class UserEntity extends BaseEntity{
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY) // 점직적 증가

JWT/src/main/java/JWTLogIn/JWT/user/repository/EventRepository.java

@@ -11,7 +11,6 @@
 
 @Repository
 public interface EventRepository extends JpaRepository<EventEntity, Long> {
-    @Query("SELECT e FROM EventEntity e WHERE YEAR(e.startDate) = YEAR(CURRENT_DATE()) AND MONTH(e.startDate) = MONTH(CURRENT_DATE())")
-    List<EventEntity> findByCurrentMonthEvents();
-
+    @Query("SELECT e FROM EventEntity e WHERE YEAR(e.startDate) = :year AND MONTH(e.startDate) = :month")
+    List<EventEntity> findByCurrentMonthEvents(int year, int month);
 }

JWT/src/main/java/JWTLogIn/JWT/user/service/UserService.java

@@ -109,4 +109,4 @@ public void changeLevel(Long id, Level level) {
         }
     } // 회원의 level 변경
 
-}
+}

JWT/src/main/java/JWTLogIn/JWT/user/service/event/EventService.java

@@ -8,7 +8,7 @@
 import java.util.List;
 
 public interface EventService {
-    List<EventDTO> findMonthlyEvents();
+    List<EventDTO> findMonthlyEvents(int year, int month);
 
 
     EventDTO findDayEvent(Long id);

JWT/src/main/java/JWTLogIn/JWT/user/service/event/EventServiceImpl.java

@@ -21,9 +21,9 @@ public class EventServiceImpl implements EventService{
 
     private final EventRepository eventRepository;
     @Override
-    public List<EventDTO> findMonthlyEvents() {
+    public List<EventDTO> findMonthlyEvents(int year, int month) {
 
-        List<EventEntity> monthlyEvents = eventRepository.findByCurrentMonthEvents();
+        List<EventEntity> monthlyEvents = eventRepository.findByCurrentMonthEvents(year, month);
         if(monthlyEvents == null){
             return null;
         }