adjusted by comment

ls1intum · Oct 27, 2024 · 5048cf8 · 5048cf8
1 parent e1ec400
commit 5048cf8
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/FaqResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/FaqResource.java
@@ -80,9 +80,7 @@ public ResponseEntity<FaqDTO> createFaq(@RequestBody Faq faq, @PathVariable Long
         if (faq.getId() != null) {
             throw new BadRequestAlertException("A new faq cannot already have an ID", ENTITY_NAME, "idExists");
         }
-        if (faq.getFaqState() == FaqState.ACCEPTED) {
-            checkRoleForCourse(courseId, Role.INSTRUCTOR);
-        }
+        checkIsInstructor(faq.getFaqState(), courseId);
         if (faq.getCourse() == null || !faq.getCourse().getId().equals(courseId)) {
             throw new BadRequestAlertException("Course ID in path and FAQ do not match", ENTITY_NAME, "courseIdMismatch");
         }
@@ -107,13 +105,9 @@ public ResponseEntity<FaqDTO> updateFaq(@RequestBody Faq faq, @PathVariable Long
         if (faqId == null || !faqId.equals(faq.getId())) {
             throw new BadRequestAlertException("Id of FAQ and path must match", ENTITY_NAME, "idNull");
         }
-        if (faq.getFaqState() == FaqState.ACCEPTED) {
-            checkRoleForCourse(courseId, Role.INSTRUCTOR);
-        }
+        checkIsInstructor(faq.getFaqState(), courseId);
         Faq existingFaq = faqRepository.findByIdElseThrow(faqId);
-        if (existingFaq.getFaqState() == FaqState.ACCEPTED) {
-            checkRoleForCourse(courseId, Role.INSTRUCTOR);
-        }
+        checkIsInstructor(faq.getFaqState(), courseId);
         if (!Objects.equals(existingFaq.getCourse().getId(), courseId)) {
             throw new BadRequestAlertException("Course ID of the FAQ provided courseID must match", ENTITY_NAME, "idNull");
         }
@@ -235,4 +229,10 @@ private void checkShouldAccessNotAccepted(FaqState faqState, Long courseId) {
         }
     }
 
+    private void checkIsInstructor(FaqState faqState, Long courseId) {
+        if (faqState != FaqState.ACCEPTED) {
+            checkRoleForCourse(courseId, Role.TEACHING_ASSISTANT);
+        }
+    }
+
 }