Merge branch 'fix/recursive-tostrings' into 'dev'

Fix recursive tostrings in models

See merge request !113

src/main/java/NTNU/IDATT1002/models/GeoLocation.java

@@ -78,7 +78,6 @@ public class GeoLocation {
     public String toString() {
         return "GeoLocation{" +
                 "geoLocationId=" + geoLocationId +
-                ", metadata=" + metadata +
                 ", latitude='" + latitude + '\'' +
                 ", longitude='" + longitude + '\'' +
                 '}';

src/main/java/NTNU/IDATT1002/models/Histogram.java

@@ -57,7 +57,6 @@ public class Histogram {
     public String toString() {
         return "Histogram{" +
                 "histogramId=" + histogramId +
-                ", metadata=" + metadata +
                 ", data='" + data + '\'' +
                 '}';
     }

src/main/java/NTNU/IDATT1002/models/Image.java

@@ -156,11 +156,18 @@ public class Image {
                 .collect(Collectors.toList())
                 .toString();
 
+    String formattedAlbums = "";
+    if (albums != null)
+      formattedAlbums = albums.stream()
+              .map(Album::getId)
+              .collect(Collectors.toList())
+              .toString();
+
     return "Image{" +
             "id=" + id +
-            ", albums=" + albums +
+            ", albums=" + formattedAlbums +
             ", tags=" + formattedTags +
-            ", user=" + user +
+            ", user=" + user.getUsername() +
             ", metadata=" + metadata +
             ", path='" + path + '\'' +
             ", uploadedAt=" + uploadedAt +

src/main/java/NTNU/IDATT1002/models/Metadata.java

@@ -72,7 +72,6 @@ public class Metadata {
     public String toString() {
         return "Metadata{" +
                 "metadataId=" + metadataId +
-                ", image=" + image +
                 ", geolocation=" + geolocation +
                 ", histogram=" + histogram +
                 '}';

src/main/java/NTNU/IDATT1002/models/User.java

@@ -192,8 +192,6 @@ public class User {
                 ", birthDate=" + birthDate +
                 ", isAdmin=" + isAdmin +
                 ", isActive=" + isActive +
-                ", albums=" + albums +
-                ", images=" + images +
                 '}';
     }
 }

src/main/java/NTNU/IDATT1002/repository/TagRepository.java

@@ -39,6 +39,9 @@ public class TagRepository extends AbstractRepository<Tag, Long> {
      * @return the tag if found, else the newly created one.
      */
     public Tag findOrCreate(Tag tag) {
+        if (tag.getName().isBlank())
+            return null;
+
         Tag foundTag;
         try {
             foundTag = entityManager.createNamedQuery(FIND_TAG_BY_NAME, Tag.class)