Development: Remove delete all exam room versions (#11441)

Author: SamuelRoettgermann

src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRoomService.java

@@ -352,13 +352,6 @@ public ExamRoomAdminOverviewDTO getExamRoomAdminOverview() {
         return new ExamRoomAdminOverviewDTO(numberOfStoredExamRooms, numberOfStoredExamSeats, numberOfStoredLayoutStrategies, examRoomDTOS);
     }
 
-    /**
-     * Purges the DB of all exam room related data.
-     */
-    public void deleteAllExamRooms() {
-        examRoomRepository.deleteAll();
-    }
-
     /**
      * Deletes all outdated and unused exam rooms.
      * <p/>

src/main/java/de/tum/cit/aet/artemis/exam/web/admin/AdminExamResource.java

@@ -114,19 +114,6 @@ public ResponseEntity<ExamRoomAdminOverviewDTO> getExamRoomAdminOverview() {
         return ResponseEntity.ok(examRoomAdminOverviewDTO);
     }
 
-    /**
-     * DELETE /exam-rooms: Deletes <strong>everything</strong> related to exam rooms.
-     *
-     * @return a response entity with status 204 and empty body.
-     */
-    @DeleteMapping("exam-rooms")
-    public ResponseEntity<Void> deleteAllExamRooms() {
-        log.info("REST request to delete ALL exam rooms");
-
-        examRoomService.deleteAllExamRooms();
-        return ResponseEntity.noContent().build();
-    }
-
     /**
      * DELETE /exam-rooms/outdated-and-unused: Delete all outdated and unused exam rooms.
      *

src/main/webapp/app/core/admin/exam-rooms/exam-rooms.component.html

@@ -13,7 +13,6 @@ <h2><span jhiTranslate="artemisApp.examRooms.adminOverview.title"></span></h2>
             <button id="roomDataUpload" jhiTranslate="entity.action.save" class="btn btn-primary" (click)="upload()" [disabled]="!canUpload()"></button>
         </div>
         <div class="mt-2">
-            <button id="roomDataDeleteAll" jhiTranslate="artemisApp.examRooms.adminOverview.deleteAllExamRooms" class="btn btn-danger" (click)="clearExamRooms()"></button>
             <button
                 id="roomDataDeleteOutdatedAndUnused"
                 jhiTranslate="artemisApp.examRooms.adminOverview.deleteExamRoomsSafe"

src/main/webapp/app/core/admin/exam-rooms/exam-rooms.component.spec.ts

@@ -313,38 +313,6 @@ describe('ExamRoomsComponentTest', () => {
         return examRoom;
     }
 
-    it('should call deletion service on delete all button click', () => {
-        // GIVEN
-        fixture.detectChanges(); // initial render
-        jest.spyOn(service, 'deleteAllExamRooms').mockReturnValue(of(convertBodyToHttpResponse<void>()));
-        const deleteAllButton = fixture.debugElement.nativeElement.querySelector('#roomDataDeleteAll');
-
-        // WHEN
-        deleteAllButton.click();
-        fixture.detectChanges();
-
-        // THEN
-        expect(service.deleteAllExamRooms).toHaveBeenCalledOnce();
-        // once from the initial load, once from the button click
-        expect(service.getAdminOverview).toHaveBeenCalledTimes(2);
-    });
-
-    it('should not reload overview if deletion fails on delete all button click', () => {
-        // GIVEN
-        fixture.detectChanges(); // initial render
-        jest.spyOn(service, 'deleteAllExamRooms').mockReturnValue(throwError(() => new Error()));
-        const deleteAllButton = fixture.debugElement.nativeElement.querySelector('#roomDataDeleteAll');
-
-        // WHEN
-        deleteAllButton.click();
-        fixture.detectChanges();
-
-        // THEN
-        expect(service.deleteAllExamRooms).toHaveBeenCalledOnce();
-        // once from the initial load
-        expect(service.getAdminOverview).toHaveBeenCalledOnce();
-    });
-
     it('should call delete outdated and unused service on delete outdated and unused button click', () => {
         // GIVEN
         fixture.detectChanges(); // initial render

src/main/webapp/app/core/admin/exam-rooms/exam-rooms.component.ts

@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Signal, WritableSignal, computed, effect, inject, signal } from '@angular/core';
+import { Component, Signal, WritableSignal, computed, effect, inject, signal } from '@angular/core';
 import {
     ExamRoomAdminOverviewDTO,
     ExamRoomDTO,
@@ -15,10 +15,6 @@ import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { faSort } from '@fortawesome/free-solid-svg-icons';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { ExamRoomsService } from 'app/core/admin/exam-rooms/exam-rooms.service';
-import { DeleteDialogService } from 'app/shared/delete-dialog/service/delete-dialog.service';
-import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model';
-import { ButtonType } from 'app/shared/components/buttons/button/button.component';
-import { Subject } from 'rxjs';
 import { MAX_FILE_SIZE } from 'app/shared/constants/input.constants';
 import { TranslateService } from '@ngx-translate/core';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
@@ -36,7 +32,6 @@ export class ExamRoomsComponent {
 
     private examRoomsService: ExamRoomsService = inject(ExamRoomsService);
     private sortService: SortService = inject(SortService);
-    private deleteDialogService: DeleteDialogService = inject(DeleteDialogService);
     private translateService: TranslateService = inject(TranslateService);
     private alertService: AlertService = inject(AlertService);
 
@@ -107,10 +102,6 @@ export class ExamRoomsComponent {
     sortAttribute: 'roomNumber' | 'name' | 'building' | 'maxCapacity' = 'roomNumber';
     ascending: boolean = true;
 
-    // Fields for working with DeletionDialogService
-    private dialogErrorSource = new Subject<string>();
-    private dialogError = this.dialogErrorSource.asObservable();
-
     initEffect = effect(() => {
         this.loadExamRoomOverview();
     });
@@ -186,46 +177,6 @@ export class ExamRoomsComponent {
         });
     }
 
-    /**
-     * REST request to delete ALL exam room related data.
-     */
-    clearExamRooms(): void {
-        const deleteEmitter = new EventEmitter<{ [key: string]: boolean }>();
-
-        deleteEmitter.subscribe(() => {
-            this.actionStatus.set('deleting');
-            this.examRoomsService.deleteAllExamRooms().subscribe({
-                next: () => {
-                    this.actionStatus.set('deletionSuccess');
-                    this.actionInformation.set(undefined);
-                    this.loadExamRoomOverview();
-                },
-                error: (errorResponse: HttpErrorResponse) => {
-                    this.showErrorNotification('deletionError', {}, errorResponse.message);
-                    this.actionStatus.set(undefined);
-                },
-                complete: () => {
-                    // We need to call this, or else the deleteDialogService can't progress.
-                    // By doing next('') here, we tell the delete dialog service not to call the alert service.
-                    // We don't want the delete dialog service to call the alert service, as we can do that with
-                    // the 'this.showErrorNotification' function ourselves, which then also allows us to specify
-                    // just a translation key, rather than a hardcoded string.
-                    this.dialogErrorSource.next('');
-                },
-            });
-        });
-
-        this.deleteDialogService.openDeleteDialog({
-            deleteQuestion: `${this.baseTranslationPath}.deleteAllExamRoomsQuestion`,
-            buttonType: ButtonType.ERROR,
-            actionType: ActionType.Delete,
-            delete: deleteEmitter,
-            dialogError: this.dialogError,
-            requireConfirmationOnlyForAdditionalChecks: false,
-            translateValues: {},
-        });
-    }
-
     /**
      * REST request to delete all outdated and unused exam rooms.
      * An exam room is outdated if there exists a newer entry of the same (number, name) combination.

src/main/webapp/app/core/admin/exam-rooms/exam-rooms.service.ts

@@ -28,14 +28,6 @@ export class ExamRoomsService {
         return this.http.post<ExamRoomUploadInformationDTO>(`${this.baseUrl}/upload`, formData, { observe: 'response' });
     }
 
-    /**
-     * Send a DELETE request to remove everything related to exam rooms.
-     * This also removes exam rooms that are connected to an exam.
-     */
-    deleteAllExamRooms(): Observable<HttpResponse<void>> {
-        return this.http.delete<void>(`${this.baseUrl}`, { observe: 'response' });
-    }
-
     /**
      * Send a DELETE request to remove all outdated and unused exam rooms. Besides keeping the newest version of
      * each room, this also keeps all versions that are (still) being connected to an exam.

src/main/webapp/i18n/de/examRooms.json

@@ -8,9 +8,7 @@
                 "invalidFile": "Mit der Datei die du hochgeladen hast ist etwas nicht in Ordnung",
                 "fileSizeTooBig": "Die Dateigröße darf {{ MAX_FILE_SIZE }} MB nicht überschreiten",
                 "noZipFile": "Nur .zip Dateien werden akzeptiert",
-                "deleteAllExamRooms": "Lösche alle Prüfungsraumdaten",
-                "deleteAllExamRoomsQuestion": "Dies wird alle Prüfungsraumdaten löschen, inklusive derer die noch Examina zugeordnet sind. Bist du sicher, dass du fortfahren willst?",
-                "deleteExamRoomsSafe": "Lösche veraltete Prüfungsraumdaten",
+                "deleteExamRoomsSafe": "Lösche veraltete und unbenutzte Prüfungsraumversionen",
                 "uploadError": "Beim Verarbeiten der Räume ist ein Fehler aufgetreten",
                 "deleting": "Löschen...",
                 "deletionError": "Beim Löschen der Räume ist ein Fehler aufgetreten",

src/main/webapp/i18n/en/examRooms.json

@@ -8,9 +8,7 @@
                 "invalidFile": "Something is wrong with the file you selected",
                 "fileSizeTooBig": "File size cannot exceed {{ MAX_FILE_SIZE }} MB",
                 "noZipFile": "Only .zip files are accepted",
-                "deleteAllExamRooms": "Delete all exam rooms",
-                "deleteAllExamRoomsQuestion": "This will delete all exam rooms, including those that may still be in use. Are you sure you want to proceed?",
-                "deleteExamRoomsSafe": "Delete outdated and unused exam rooms",
+                "deleteExamRoomsSafe": "Delete outdated and unused exam room versions",
                 "uploadError": "An error occurred while processing the rooms",
                 "deleting": "Deleting...",
                 "deletionError": "An error occurred while deleting the rooms",

src/test/java/de/tum/cit/aet/artemis/exam/ExamRoomIntegrationTest.java

@@ -337,68 +337,6 @@ void testGetAdminOverviewSingleRoomIntoExistingData() throws Exception {
         validateAdminOverview(adminOverview, 64 + 1, 16_141 + 528, 224 + 4, ExamRoomZipFiles.singleExamRoomName);
     }
 
-    /* Tests for the DELETE /exam-rooms endpoint */
-
-    @Test
-    @WithMockUser(username = STUDENT_LOGIN, roles = "USER")
-    void testDeleteAllExamRoomDataAsStudent() throws Exception {
-        request.delete("/api/exam/admin/exam-rooms", HttpStatus.FORBIDDEN);
-    }
-
-    @Test
-    @WithMockUser(username = TUTOR_LOGIN, roles = "TA")
-    void testDeleteAllExamRoomDataAsTutor() throws Exception {
-        request.delete("/api/exam/admin/exam-rooms", HttpStatus.FORBIDDEN);
-    }
-
-    @Test
-    @WithMockUser(username = EDITOR_LOGIN, roles = "EDITOR")
-    void testDeleteAllExamRoomDataAsEditor() throws Exception {
-        request.delete("/api/exam/admin/exam-rooms", HttpStatus.FORBIDDEN);
-    }
-
-    @Test
-    @WithMockUser(username = INSTRUCTOR_LOGIN, roles = "INSTRUCTOR")
-    void testDeleteAllExamRoomDataAsInstructor() throws Exception {
-        request.delete("/api/exam/admin/exam-rooms", HttpStatus.FORBIDDEN);
-    }
-
-    @Test
-    @WithMockUser(username = "admin", roles = "ADMIN")
-    void testDeleteAllExamRoomDataAsAdmin() throws Exception {
-        request.delete("/api/exam/admin/exam-rooms", HttpStatus.NO_CONTENT);
-    }
-
-    @Test
-    @WithMockUser(username = "admin", roles = "ADMIN")
-    void testDeleteAllExamRoomDataEmpty() throws Exception {
-        request.delete("/api/exam/admin/exam-rooms", HttpStatus.NO_CONTENT);
-        validateDbStoredElementCounts(0, 0, 0);
-    }
-
-    @Test
-    @WithMockUser(username = "admin", roles = "ADMIN")
-    void testDeleteAllRealisticRoomData() throws Exception {
-        request.postMultipartFileOnly("/api/exam/admin/exam-rooms/upload", ExamRoomZipFiles.zipFileRealisticScenario, HttpStatus.OK);
-        assertThat(examRoomRepository.count()).isPositive();
-
-        request.delete("/api/exam/admin/exam-rooms", HttpStatus.NO_CONTENT);
-        validateDbStoredElementCounts(0, 0, 0);
-    }
-
-    @Test
-    @WithMockUser(username = "admin", roles = "ADMIN")
-    void testDeleteAllTonsOfExamRoomData() throws Exception {
-        for (int i = 0; i < 10; i++) {
-            request.postMultipartFileOnly("/api/exam/admin/exam-rooms/upload", ExamRoomZipFiles.zipFileRealisticScenario, HttpStatus.OK);
-        }
-
-        assertThat(examRoomRepository.count()).isPositive();
-
-        request.delete("/api/exam/admin/exam-rooms", HttpStatus.NO_CONTENT);
-        validateDbStoredElementCounts(0, 0, 0);
-    }
-
     /* Tests for the DELETE /exam-rooms/outdated-and-unused endpoint */
 
     @Test