Merge pull request #800 from SE-TINF22B6/cors-fix

denniskp · web-flow · commit 60214422acb2 · 2024-06-04T22:30:34.000+02:00
Change file data variable type
diff --git a/src/main/java/de/tinf22b6/dhbwhub/mapper/PictureMapper.java b/src/main/java/de/tinf22b6/dhbwhub/mapper/PictureMapper.java
@@ -11,17 +11,17 @@ public static Picture mapToModel(PictureProposal proposal) {
         );
     }
 
-    public static Picture mapToModelUser(byte[] imageData) {
+    public static Picture mapToModelUser(String imageData) {
         return new Picture(
                 "user.png",
                 imageData
         );
     }
 
-    public static Picture mapToModelPost(byte[] imageData) {
+    public static Picture mapToModelPost(String imageData) {
         return new Picture(
                 "post.png",
                 imageData
         );
     }
-}
+}
diff --git a/src/main/java/de/tinf22b6/dhbwhub/model/Picture.java b/src/main/java/de/tinf22b6/dhbwhub/model/Picture.java
@@ -20,6 +20,6 @@ public class Picture {
 
     private final String name;
 
-    private final byte[] imageData;
+    private final String imageData;
 
 }
diff --git a/src/main/java/de/tinf22b6/dhbwhub/proposal/PictureProposal.java b/src/main/java/de/tinf22b6/dhbwhub/proposal/PictureProposal.java
@@ -12,5 +12,5 @@
 public class PictureProposal {
     private String name;
 
-    private byte[] imageData;
+    private String imageData;
 }
diff --git a/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/CommentThreadViewProposal.java b/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/CommentThreadViewProposal.java
@@ -22,7 +22,7 @@ public class CommentThreadViewProposal {
 
     private Long accountId;
 
-    private byte[] authorImage;
+    private String authorImage;
 
     private Date timestamp;
 
diff --git a/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/CreateEventPostProposal.java b/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/CreateEventPostProposal.java
@@ -5,7 +5,6 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.xml.stream.Location;
 import java.util.Date;
 
 @Getter
@@ -27,7 +26,7 @@ public class CreateEventPostProposal {
 
     private String[] tags;
 
-    private byte[] postImage;
+    private String postImage;
 
     private Long accountId;
 }
diff --git a/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/CreatePostProposal.java b/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/CreatePostProposal.java
@@ -21,7 +21,7 @@ public class CreatePostProposal {
 
     private Date timestamp;
 
-    private byte[] postImage;
+    private String postImage;
 
     private Long accountId;
 
diff --git a/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/EventCommentThreadViewProposal.java b/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/EventCommentThreadViewProposal.java
@@ -22,7 +22,7 @@ public class EventCommentThreadViewProposal {
 
     private Long accountId;
 
-    private byte[] authorImage;
+    private String authorImage;
 
     private Date timestamp;
 
diff --git a/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/FriendlistProposal.java b/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/FriendlistProposal.java
@@ -18,6 +18,6 @@ public class FriendlistProposal {
 
     private String username;
 
-    private byte[] image;
+    private String image;
 
 }
diff --git a/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/HomepagePostPreviewProposal.java b/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/HomepagePostPreviewProposal.java
@@ -27,7 +27,7 @@ public class HomepagePostPreviewProposal {
 
     private Date timestamp;
 
-    private byte[] postImage;
+    private String postImage;
 
     private Long accountId;
 
diff --git a/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/PostThreadViewProposal.java b/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/PostThreadViewProposal.java
@@ -27,13 +27,13 @@ public class PostThreadViewProposal {
 
     private Date timestamp;
 
-    private byte[] postImage;
+    private String postImage;
 
     private Long accountId;
 
     private String username;
 
-    private byte[] userImage;
+    private String userImage;
 
     private List<CommentThreadViewProposal> comments;
 }
diff --git a/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/UpdateEventPostProposal.java b/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/UpdateEventPostProposal.java
@@ -25,5 +25,5 @@ public class UpdateEventPostProposal {
 
     private String[] tags;
 
-    private byte[] postImage;
+    private String postImage;
 }
diff --git a/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/UpdatePictureProposal.java b/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/UpdatePictureProposal.java
@@ -12,5 +12,5 @@
 public class UpdatePictureProposal {
     private Long userId;
 
-    private byte[] imageData;
+    private String imageData;
 }
diff --git a/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/UpdatePostProposal.java b/src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/UpdatePostProposal.java
@@ -18,6 +18,6 @@ public class UpdatePostProposal {
 
     private String[] tags;
 
-    private byte[] postImage;
+    private String postImage;
 
 }
diff --git a/src/main/java/de/tinf22b6/dhbwhub/service/PostServiceImpl.java b/src/main/java/de/tinf22b6/dhbwhub/service/PostServiceImpl.java
@@ -68,7 +68,7 @@ public HomepagePostPreviewProposal create(CreatePostProposal proposal) {
         if(user == null){
             throw new NoSuchEntryException("User with the AccountId " + proposal.getAccountId() + " does not exist!");
         }
-        Picture picture = proposal.getPostImage().length != 0 ?
+        Picture picture = !proposal.getPostImage().isEmpty() ?
                 pictureRepository.save(PictureMapper.mapToModelPost(proposal.getPostImage())): null;
 
         Post post = repository.save(PostMapper.mapToModel(proposal,user,picture));
@@ -148,14 +148,14 @@ public PostThreadViewProposal update(Long id, UpdatePostProposal proposal) {
         Post initialPost = get(id);
         Picture picture;
 
-        byte[] proposalImageData = proposal.getPostImage() != null? proposal.getPostImage() : new byte[0];
-        byte[] initialImageData = initialPost.getPicture() != null? initialPost.getPicture().getImageData() : new byte[0];
+        String proposalImageData = proposal.getPostImage() != null ? proposal.getPostImage() : "";
+        String initialImageData = initialPost.getPicture() != null ? initialPost.getPicture().getImageData() : "";
         // Check if Picture has changed
-        if (proposalImageData.length == 0 && initialImageData.length != 0) {
+        if (proposalImageData.isEmpty() && !initialImageData.isEmpty()) {
             pictureRepository.delete(initialPost.getPicture().getId());
             picture = null;
         }
-        else if (!Arrays.equals(initialImageData, proposalImageData)) {
+        else if (!initialImageData.equals(proposalImageData)) {
             pictureRepository.delete(initialPost.getPicture().getId());
             picture = pictureRepository.save(PictureMapper.mapToModelPost(proposalImageData));
         } else {
diff --git a/src/main/java/de/tinf22b6/dhbwhub/service/UserServiceImpl.java b/src/main/java/de/tinf22b6/dhbwhub/service/UserServiceImpl.java
@@ -130,7 +130,7 @@ public void updatePassword(UpdatePasswordProposal proposal) {
     @Override
     public void updatePicture(UpdatePictureProposal proposal) {
         User user = get(proposal.getUserId());
-        if (proposal.getImageData().length == 0){
+        if (proposal.getImageData().isEmpty()){
             throw new IllegalArgumentException("Image data is empty");
         }
         Picture picture = pictureRepository.save(PictureMapper.mapToModelUser(proposal.getImageData()));
diff --git a/src/test/java/de/tinf22b6/dhbwhub/AbstractApplicationTest.java b/src/test/java/de/tinf22b6/dhbwhub/AbstractApplicationTest.java
@@ -15,11 +15,11 @@
 
 public abstract class AbstractApplicationTest {
 	protected Picture createDefaultPicture() {
-		return new Picture("profile.png", new byte[]{ 12, 34, 45, 67, 78, 91 });
+		return new Picture("profile.png", "ahudmpiwmhapicuhawiughui");
 	}
 
 	protected Picture createDefaultPicture2() {
-		return new Picture("img-user", new byte[]{ 12, 34, 44, 67, 78 });
+		return new Picture("img-user", "ahudmpiwmhapicuhawiughui");
 	}
 
 	protected Account createDefaultAccount() {
@@ -111,7 +111,7 @@ protected SavedPost createDefaultSavedPost2() {
 	}
 
 	protected PictureProposal createDefaultPictureProposal() {
-		return new PictureProposal("profile.png", new byte[]{ 12, 34, 45, 67, 78, 91 });
+		return new PictureProposal("profile.png", "ahudmpiwmhapicuhawiughui");
 	}
 
 	protected AccountProposal createDefaultAccountProposal() {
@@ -147,19 +147,19 @@ protected SavedPostProposal createDefaultSavedPostProposal() {
 	}
 
 	protected HomepagePostPreviewProposal createDefaultHomepagePostPreviewProposal() {
-		return new HomepagePostPreviewProposal(1L,"Titel 1","Beschreibung 1", Arrays.stream(new String[]{"Tag 1", "Tag 2"}).toList(), 12, 4, new Date(1478979207L), new byte[]{ 12, 34, 45, 67, 78, 91 }, 1L, "Bruno");
+		return new HomepagePostPreviewProposal(1L,"Titel 1","Beschreibung 1", Arrays.stream(new String[]{"Tag 1", "Tag 2"}).toList(), 12, 4, new Date(1478979207L), "ahudmpiwmhapicuhawiughui", 1L, "Bruno");
 	}
 
 	protected PostThreadViewProposal createDefaultPostThreadViewProposal() {
-		return new PostThreadViewProposal(1L,"Titel 1","Beschreibung 1", Arrays.stream(new String[]{"Tag 1", "Tag 2"}).toList(), 12, 4, new Date(1478979207L), new byte[]{ 12, 34, 45, 67, 78, 91 }, 1L, "Bruno", new byte[]{ 12, 34, 45, 67, 78, 91 }, List.of(createDefaultCommentThreadViewProposal()));
+		return new PostThreadViewProposal(1L,"Titel 1","Beschreibung 1", Arrays.stream(new String[]{"Tag 1", "Tag 2"}).toList(), 12, 4, new Date(1478979207L), "ahudmpiwmhapicuhawiughui", 1L, "Bruno", "ahudmpiwmhapicuhawiughui", List.of(createDefaultCommentThreadViewProposal()));
 	}
 
 	protected CommentThreadViewProposal createDefaultCommentThreadViewProposal() {
-		return new CommentThreadViewProposal(1L, 0L,"Beschreibung 1", "Bruno", 1L,  new byte[]{ 12, 34, 45, 67, 78, 91 }, new Date(1478979207L), 23);
+		return new CommentThreadViewProposal(1L, 0L,"Beschreibung 1", "Bruno", 1L, "ahudmpiwmhapicuhawiughui", new Date(1478979207L), 23);
 	}
 
 	protected FriendlistProposal createDefaultFriendlistProposal() {
-		return new FriendlistProposal(1L,2L,"Bruno", new byte[]{ 12, 34, 45, 67, 78, 91 });
+		return new FriendlistProposal(1L,2L,"Bruno", "ahudmpiwmhapicuhawiughui");
 	}
 
 	protected CreateCommentProposal createDefaultCreateCommentProposal() {
@@ -171,7 +171,7 @@ protected UpdateCommentProposal createDefaultUpdateCommentProposal() {
 	}
 
 	protected CreatePostProposal createDefaultCreatePostProposal() {
-		return new CreatePostProposal("Titel 1", "Beschreibung 1", new String[]{"Tag 1", "Tag 2"}, new Date(1478979207L), new byte[]{ 12, 34, 45, 67, 78, 91 }, 1L);
+		return new CreatePostProposal("Titel 1", "Beschreibung 1", new String[]{"Tag 1", "Tag 2"}, new Date(1478979207L), "ahudmpiwmhapicuhawiughui", 1L);
 	}
 
 	protected UpdatePostProposal createDefaultUpdatePostProposal() {
@@ -366,6 +366,6 @@ protected UpdatePasswordProposal createUpdatePasswordProposal() {
 	}
 
 	protected UpdatePictureProposal createUpdatePictureProposal() {
-		return new UpdatePictureProposal(1L, new byte[]{12, 12, 12, 12});
+		return new UpdatePictureProposal(1L, "ahudmpiwmhapicuhawiughui");
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -11,17 +11,17 @@ public static Picture mapToModel(PictureProposal proposal) {`
`11`	`11`	`);`
`12`	`12`	`}`
`13`	`13`
`14`		`- public static Picture mapToModelUser(byte[] imageData) {`
	`14`	`+ public static Picture mapToModelUser(String imageData) {`
`15`	`15`	`return new Picture(`
`16`	`16`	`"user.png",`
`17`	`17`	`imageData`
`18`	`18`	`);`
`19`	`19`	`}`
`20`	`20`
`21`		`- public static Picture mapToModelPost(byte[] imageData) {`
	`21`	`+ public static Picture mapToModelPost(String imageData) {`
`22`	`22`	`return new Picture(`
`23`	`23`	`"post.png",`
`24`	`24`	`imageData`
`25`	`25`	`);`
`26`	`26`	`}`
`27`		`-}`
	`27`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ public class Picture {`
`20`	`20`
`21`	`21`	`private final String name;`
`22`	`22`
`23`		`- private final byte[] imageData;`
	`23`	`+ private final String imageData;`
`24`	`24`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,5 @@`
`12`	`12`	`public class PictureProposal {`
`13`	`13`	`private String name;`
`14`	`14`
`15`		`- private byte[] imageData;`
	`15`	`+ private String imageData;`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ public class FriendlistProposal {`
`18`	`18`
`19`	`19`	`private String username;`
`20`	`20`
`21`		`- private byte[] image;`
	`21`	`+ private String image;`
`22`	`22`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,5 @@ public class UpdateEventPostProposal {`
`25`	`25`
`26`	`26`	`private String[] tags;`
`27`	`27`
`28`		`- private byte[] postImage;`
	`28`	`+ private String postImage;`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ public class UpdatePostProposal {`
`18`	`18`
`19`	`19`	`private String[] tags;`
`20`	`20`
`21`		`- private byte[] postImage;`
	`21`	`+ private String postImage;`
`22`	`22`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public void updatePassword(UpdatePasswordProposal proposal) {`
`130`	`130`	`@Override`
`131`	`131`	`public void updatePicture(UpdatePictureProposal proposal) {`
`132`	`132`	`User user = get(proposal.getUserId());`
`133`		`- if (proposal.getImageData().length == 0){`
	`133`	`+ if (proposal.getImageData().isEmpty()){`
`134`	`134`	`throw new IllegalArgumentException("Image data is empty");`
`135`	`135`	`}`
`136`	`136`	`Picture picture = pictureRepository.save(PictureMapper.mapToModelUser(proposal.getImageData()));`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@`
`15`	`15`
`16`	`16`	`public abstract class AbstractApplicationTest {`
`17`	`17`	`protected Picture createDefaultPicture() {`
`18`		`- return new Picture("profile.png", new byte[]{ 12, 34, 45, 67, 78, 91 });`
	`18`	`+ return new Picture("profile.png", "ahudmpiwmhapicuhawiughui");`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`protected Picture createDefaultPicture2() {`
`22`		`- return new Picture("img-user", new byte[]{ 12, 34, 44, 67, 78 });`
	`22`	`+ return new Picture("img-user", "ahudmpiwmhapicuhawiughui");`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`protected Account createDefaultAccount() {`
`@@ -111,7 +111,7 @@ protected SavedPost createDefaultSavedPost2() {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`protected PictureProposal createDefaultPictureProposal() {`
`114`		`- return new PictureProposal("profile.png", new byte[]{ 12, 34, 45, 67, 78, 91 });`
	`114`	`+ return new PictureProposal("profile.png", "ahudmpiwmhapicuhawiughui");`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`protected AccountProposal createDefaultAccountProposal() {`
`@@ -147,19 +147,19 @@ protected SavedPostProposal createDefaultSavedPostProposal() {`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`protected HomepagePostPreviewProposal createDefaultHomepagePostPreviewProposal() {`
`150`		`- return new HomepagePostPreviewProposal(1L,"Titel 1","Beschreibung 1", Arrays.stream(new String[]{"Tag 1", "Tag 2"}).toList(), 12, 4, new Date(1478979207L), new byte[]{ 12, 34, 45, 67, 78, 91 }, 1L, "Bruno");`
	`150`	`+ return new HomepagePostPreviewProposal(1L,"Titel 1","Beschreibung 1", Arrays.stream(new String[]{"Tag 1", "Tag 2"}).toList(), 12, 4, new Date(1478979207L), "ahudmpiwmhapicuhawiughui", 1L, "Bruno");`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`protected PostThreadViewProposal createDefaultPostThreadViewProposal() {`
`154`		`- return new PostThreadViewProposal(1L,"Titel 1","Beschreibung 1", Arrays.stream(new String[]{"Tag 1", "Tag 2"}).toList(), 12, 4, new Date(1478979207L), new byte[]{ 12, 34, 45, 67, 78, 91 }, 1L, "Bruno", new byte[]{ 12, 34, 45, 67, 78, 91 }, List.of(createDefaultCommentThreadViewProposal()));`
	`154`	`+ return new PostThreadViewProposal(1L,"Titel 1","Beschreibung 1", Arrays.stream(new String[]{"Tag 1", "Tag 2"}).toList(), 12, 4, new Date(1478979207L), "ahudmpiwmhapicuhawiughui", 1L, "Bruno", "ahudmpiwmhapicuhawiughui", List.of(createDefaultCommentThreadViewProposal()));`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`protected CommentThreadViewProposal createDefaultCommentThreadViewProposal() {`
`158`		`- return new CommentThreadViewProposal(1L, 0L,"Beschreibung 1", "Bruno", 1L, new byte[]{ 12, 34, 45, 67, 78, 91 }, new Date(1478979207L), 23);`
	`158`	`+ return new CommentThreadViewProposal(1L, 0L,"Beschreibung 1", "Bruno", 1L, "ahudmpiwmhapicuhawiughui", new Date(1478979207L), 23);`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`protected FriendlistProposal createDefaultFriendlistProposal() {`
`162`		`- return new FriendlistProposal(1L,2L,"Bruno", new byte[]{ 12, 34, 45, 67, 78, 91 });`
	`162`	`+ return new FriendlistProposal(1L,2L,"Bruno", "ahudmpiwmhapicuhawiughui");`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`protected CreateCommentProposal createDefaultCreateCommentProposal() {`
`@@ -171,7 +171,7 @@ protected UpdateCommentProposal createDefaultUpdateCommentProposal() {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`protected CreatePostProposal createDefaultCreatePostProposal() {`
`174`		`- return new CreatePostProposal("Titel 1", "Beschreibung 1", new String[]{"Tag 1", "Tag 2"}, new Date(1478979207L), new byte[]{ 12, 34, 45, 67, 78, 91 }, 1L);`
	`174`	`+ return new CreatePostProposal("Titel 1", "Beschreibung 1", new String[]{"Tag 1", "Tag 2"}, new Date(1478979207L), "ahudmpiwmhapicuhawiughui", 1L);`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`protected UpdatePostProposal createDefaultUpdatePostProposal() {`
`@@ -366,6 +366,6 @@ protected UpdatePasswordProposal createUpdatePasswordProposal() {`
`366`	`366`	`}`
`367`	`367`
`368`	`368`	`protected UpdatePictureProposal createUpdatePictureProposal() {`
`369`		`- return new UpdatePictureProposal(1L, new byte[]{12, 12, 12, 12});`
	`369`	`+ return new UpdatePictureProposal(1L, "ahudmpiwmhapicuhawiughui");`
`370`	`370`	`}`
`371`	`371`	`}`