bugfix

src/main/java/at/ac/uibk/gitsearch/domain/Review.java

@@ -59,7 +59,7 @@ public class Review implements Serializable {
     @JsonIgnoreProperties(value = { "review", "reviewRating" }, allowSetters = true)
     private Set<ReviewHistoryEntry> histories = new HashSet<>();
 
-    @OneToMany(mappedBy = "review")
+    @OneToMany(mappedBy = "review", cascade = CascadeType.REMOVE)
     private Set<ChatMessage> chatMessages = new HashSet<>();
 
     // jhipster-needle-entity-add-field - JHipster will add fields here

src/main/java/at/ac/uibk/gitsearch/service/ChatMessageService.java

@@ -115,9 +115,15 @@ public class ChatMessageService {
         chatMessageDTO.setSentByUser(chatMessage.getSender().equals(userService.getUserWithAuthorities().get()));
         if (chatMessage.getSender().equals(userService.getUserWithAuthorities().get())) {
             chatMessageDTO.setSenderName(you);
-        } else {
-            chatMessageDTO.setSenderName("Reviewer " + generateHash(chatMessage.getSender().getLogin()));
+            return chatMessageDTO;
         }
+        if (chatMessage.getReview().getRequestedBy().equals(chatMessage.getSender().getId())) {
+            chatMessageDTO.setSenderName("Creator");
+            return chatMessageDTO;
+        }
+
+        chatMessageDTO.setSenderName("Reviewer " + generateHash(chatMessage.getSender().getLogin()));
+
         return chatMessageDTO;
     }
 
@@ -139,7 +145,7 @@ public class ChatMessageService {
             .stream()
             .map(ChatMessageDTO::getSenderName)
             .distinct()
-            .filter(senderName -> !senderName.equals(you))
+            .filter(senderName -> !senderName.equals(you) && !senderName.equals("Creator"))
             .sorted()
             .collect(Collectors.toList());
 
@@ -162,7 +168,12 @@ public class ChatMessageService {
             // Replace senderName if it's not "You"
             if (dto.getSenderName().equals(you)) {
                 updatedDTO.setSenderName(you);
-            } else {
+            }
+            if (dto.getSenderName().equals("Creator")) {
+                updatedDTO.setSenderName("Creator");
+            }
+
+            if (!dto.getSenderName().equals(you) && !dto.getSenderName().equals("Creator")) {
                 String newReviewerName = senderNameToReviewerMap.get(dto.getSenderName());
                 updatedDTO.setSenderName(newReviewerName);
             }

src/main/resources/.h2.server.properties

 #H2 Server Properties
-#Wed Aug 09 17:31:52 CEST 2023
+#Thu Aug 10 09:57:52 CEST 2023
 0=JHipster H2 (Disk)|org.h2.Driver|jdbc\:h2\:file\:./target/h2db/db/gitsearch|gitsearch
 webSSL=false
 webAllowOthers=true

src/main/webapp/app/account/peer-reviewing/peer-reviewing.component.html

@@ -137,7 +137,7 @@
                     <span class="d-none d-md-inline" jhiTranslate="review.create.resourceDelete">Delete Request</span>
                   </button>
                   <button
-                    *ngIf="!review.status || review.status.length === 0"
+                    *ngIf="!review.status || review.status.length !== 0"
                     class="btn p-1 ml-1 btn-warning btn-sm"
                     type="button"
                     (click)="openChat(review)"