Delete method for eventcontroller

EspadaKomanda · Nov 25, 2024 · 76362e8 · 76362e8
1 parent a00aef5
commit 76362e8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/MainService/src/main/java/ru/espada/ep/iptip/event/EventController.java b/MainService/src/main/java/ru/espada/ep/iptip/event/EventController.java
@@ -30,13 +30,18 @@ public ResponseEntity<?> createEventForStudyGroups(Principal principal, @Valid @
         return ResponseEntity.ok().body(eventEntity);
     }
 
-    @PatchMapping("event/")
+    @PatchMapping("/event")
     public ResponseEntity<?> modifyEvent(Principal principal, @Valid @RequestBody ModifyEventRequest request) {
         EventEntity eventEntity = eventService.modifyEvent(principal, request);
         return ResponseEntity.ok().body(eventEntity);
     }
 
-    // TODO: getter, setter, remover
+    // TODO: getter, setter
+    @DeleteMapping("/event")
+    public ResponseEntity<?> deleteEvent(Principal principal, Long id) {
+        eventService.deleteEvent(principal, id);
+        return ResponseEntity.ok().build();
+    }
 
     @Autowired
     public void setEventService(EventService eventService) {

diff --git a/MainService/src/main/java/ru/espada/ep/iptip/event/EventServiceImpl.java b/MainService/src/main/java/ru/espada/ep/iptip/event/EventServiceImpl.java
@@ -28,7 +28,7 @@ public class EventServiceImpl implements EventService{
 
     @Override
     public EventEntity createEvent(Principal principal, CreateEventRequest request) {
-        //TODO: check permission
+        // TODO: check permission
 
         EventEntity eventEntity = EventEntity.builder()
                 .name(request.getName())
@@ -45,7 +45,7 @@ public EventEntity createEvent(Principal principal, CreateEventRequest request)
     @Override
     @Transactional
     public EventEntity createEventForStudyGroups(Principal principal, CreateEventForStudyGroupsRequest request) {
-        //TODO: check permission
+        // TODO: check permission
 
         EventEntity eventEntity = EventEntity.builder()
                 .name(request.getName())
@@ -72,7 +72,7 @@ public EventEntity createEventForStudyGroups(Principal principal, CreateEventFor
 
     @Override
     public EventEntity modifyEvent(Principal principal, ModifyEventRequest request) {
-        //TODO: check permission
+        // TODO: check permission
         EventEntity eventEntity = eventRepository.findById(request.getId()).orElseThrow();
 
         eventEntity.setName(Optional.ofNullable(request.getName()).orElse(eventEntity.getName()));
@@ -89,20 +89,27 @@ public EventEntity modifyEvent(Principal principal, ModifyEventRequest request)
 
     @Override
     public EventEntity getEvent(Principal principal, Long id) {
-        //TODO: check permission
+        // TODO: check permission
         return null;
     }
 
     @Override
     public List<StudyGroupEntity> eventStudyGroups(Principal principal, Long id) {
-        //TODO: check permission
+        // TODO: check permission
         return List.of();
     }
 
     @Override
     public void deleteEvent(Principal principal, Long id) {
-        //TODO: check permission
+        EventEntity eventEntity = eventRepository.findById(id).orElseThrow();
 
+        // Remove study group events
+        List<StudyGroupEventEntity> studyGroupEventEntities = studyGroupEventRepository.findAllByEventId(eventEntity.getId());
+        if (!studyGroupEventEntities.isEmpty()) {
+            studyGroupEventRepository.deleteAll(studyGroupEventEntities);
+        }
+
+        eventRepository.delete(eventEntity);
     }
 
     @Autowired

diff --git a/...ain/java/ru/espada/ep/iptip/study_groups/study_group_event/StudyGroupEventRepository.java b/...ain/java/ru/espada/ep/iptip/study_groups/study_group_event/StudyGroupEventRepository.java
@@ -3,7 +3,11 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface StudyGroupEventRepository extends JpaRepository<StudyGroupEventEntity, Long> {
     StudyGroupEventEntity findByEventIdAndStudyGroupId(Long eventId, Long studyGroupId);
+
+    List<StudyGroupEventEntity> findAllByEventId(Long eventId);
 }