feature: 09.01.2025

task:  XXX

backend/src/main/java/meowhub/backend/profiles/controllers/ProfileController.java

@@ -3,6 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import meowhub.backend.profiles.dtos.ProfileDto;
 import meowhub.backend.profiles.services.ProfileService;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,26 +15,24 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
-
 @RestController
 @RequestMapping(path ="/api/profiles")
 @RequiredArgsConstructor
 public class ProfileController {
     private final ProfileService profileService;
 
     @GetMapping("/{login}")
-    public ProfileDto getProfile(@PathVariable String login, @AuthenticationPrincipal UserDetails userDetails) {
-        return profileService.getProfile(login, userDetails.getUsername());
+    public ResponseEntity<ProfileDto> getProfile(@PathVariable String login, @AuthenticationPrincipal UserDetails userDetails) {
+        return ResponseEntity.ok(profileService.getProfile(login, userDetails.getUsername()));
     }
 
     @PostMapping("")
-    public ProfileDto updateProfile(@RequestParam String content, @AuthenticationPrincipal UserDetails userDetails) {
-        return profileService.updateProfile(content, userDetails.getUsername());
+    public ResponseEntity<ProfileDto> updateProfile(@RequestParam String content, @AuthenticationPrincipal UserDetails userDetails) {
+        return ResponseEntity.ok(profileService.updateProfile(content, userDetails.getUsername()));
     }
 
     @PostMapping("/pictures")
-    public ProfileDto addPictures(@RequestPart List<MultipartFile> files, @AuthenticationPrincipal UserDetails userDetails) {
-        return profileService.addPictures(files, userDetails.getUsername());
+    public ResponseEntity<ProfileDto> addPictures(@RequestPart MultipartFile file, @AuthenticationPrincipal UserDetails userDetails) {
+        return ResponseEntity.ok(profileService.addProfilePicture(file, userDetails.getUsername()));
     }
 }

backend/src/main/java/meowhub/backend/profiles/dtos/ProfileDto.java

@@ -1,12 +1,13 @@
 package meowhub.backend.profiles.dtos;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
+@AllArgsConstructor
 public class ProfileDto {
     private String profilePicture;
     private String content;
-
 }

backend/src/main/java/meowhub/backend/jpa_buddy/Profile.java → backend/src/main/java/meowhub/backend/profiles/models/Profile.java

@@ -1,4 +1,4 @@
-package meowhub.backend.jpa_buddy;
+package meowhub.backend.profiles.models;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -60,8 +60,4 @@ public class Profile {
 
     @OneToMany(mappedBy = "profile")
     private Set<ProfilePicture> profilePictures = new LinkedHashSet<>();
-
-    @OneToMany(mappedBy = "profile")
-    private Set<ProfileUserData> profileUserData = new LinkedHashSet<>();
-
 }

backend/src/main/java/meowhub/backend/jpa_buddy/ProfilePicture.java → backend/src/main/java/meowhub/backend/profiles/models/ProfilePicture.java

@@ -1,4 +1,4 @@
-package meowhub.backend.jpa_buddy;
+package meowhub.backend.profiles.models;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -44,8 +44,8 @@ public class ProfilePicture {
     private String ociUrl;
 
     @NotNull
-    @Column(name = "PICTURE_INDEX", nullable = false)
-    private Long index;
+    @Column(name = "IS_CURRENT_PP", nullable = false)
+    private boolean isCurrentProfilePicture;
 
     @Column(name = "CREATED_AT")
     private LocalDateTime createdAt;

backend/src/main/java/meowhub/backend/profiles/repositories/ProfilePictureRepository.java

@@ -1,7 +1,10 @@
 package meowhub.backend.profiles.repositories;
 
-import meowhub.backend.jpa_buddy.ProfilePicture;
+import meowhub.backend.profiles.models.ProfilePicture;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.Optional;
+
 public interface ProfilePictureRepository extends JpaRepository<ProfilePicture, String> {
+    Optional<ProfilePicture> findByProfileIdAndCurrentProfilePicture(String profileId, boolean currentProfilePicture);
 }

backend/src/main/java/meowhub/backend/profiles/repositories/ProfileRepository.java

@@ -1,7 +1,48 @@
 package meowhub.backend.profiles.repositories;
 
-import meowhub.backend.jpa_buddy.Profile;
+import meowhub.backend.profiles.dtos.ProfileDto;
+import meowhub.backend.profiles.models.Profile;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Optional;
 
 public interface ProfileRepository extends JpaRepository<Profile, String> {
+
+    @Query("""
+        SELECT new meowhub.backend.profiles.dtos.ProfileDto(pp.ociUrl, p.profileDetailsHtml)
+          FROM Profile p
+          LEFT JOIN ProfilePicture pp ON pp.profile.id = p.id AND pp.isCurrentProfilePicture = true
+        WHERE p.user.login = :login
+       """)
+    ProfileDto getOwnProfile(@Param("login")  String login);
+
+    @Query("""
+        SELECT new meowhub.backend.profiles.dtos.ProfileDto(pp.ociUrl, p.profileDetailsHtml)
+          FROM Profile p
+          LEFT JOIN ProfilePicture pp ON pp.profile.id = p.id AND pp.isCurrentProfilePicture = true
+          JOIN User u ON u.id = p.user.id
+          JOIN u.profilePrivacy profilePrivacy
+        WHERE u.login = :login
+                  AND (profilePrivacy.code = 'PUBLIC'
+                       OR (profilePrivacy.code = 'FRIENDS_ONLY' AND u.id IN (
+                            SELECT r.receiver.id
+                            FROM User sender
+                            JOIN sender.userRelationsSender r
+                            JOIN r.relationType relType
+                            WHERE relType.code = 'FRIENDS'
+                              AND sender.login = :requestedBy
+                            UNION
+                            SELECT r.sender.id
+                            FROM User receiver
+                            JOIN receiver.userRelationsReceiver r
+                            JOIN r.relationType relType
+                            WHERE relType.code = 'FRIENDS'
+                              AND receiver.login = :requestedBy)
+                       )) ORDER BY p.createdAt DESC
+            """)
+    ProfileDto getProfileIfPublicOrFriends(@Param("login") String login, @Param("requestedBy") String requestedBy);
+
+    Optional<Profile> findByUserLogin(String login);
 }

backend/src/main/java/meowhub/backend/profiles/services/ProfileService.java

@@ -4,11 +4,9 @@
 import meowhub.backend.security.requests.SignUpRequest;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
-
 public interface ProfileService {
     void createProfile(SignUpRequest signUpRequest);
     ProfileDto updateProfile(String content, String login);
     ProfileDto getProfile(String login, String requesterLogin);
-    ProfileDto addPictures(List<MultipartFile> file, String login);
+    ProfileDto addProfilePicture(MultipartFile file, String login);
 }

backend/src/main/java/meowhub/backend/profiles/services/facades/ProfileAuthServiceFacade.java

@@ -0,0 +1,7 @@
+package meowhub.backend.profiles.services.facades;
+
+import meowhub.backend.security.requests.SignUpRequest;
+
+public interface ProfileAuthServiceFacade {
+    void createProfile(SignUpRequest signUpRequest);
+}

backend/src/main/java/meowhub/backend/profiles/services/facades/ProfileAuthServiceFacadeImpl.java

@@ -0,0 +1,17 @@
+package meowhub.backend.profiles.services.facades;
+
+import lombok.RequiredArgsConstructor;
+import meowhub.backend.profiles.services.ProfileService;
+import meowhub.backend.security.requests.SignUpRequest;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class ProfileAuthServiceFacadeImpl implements ProfileAuthServiceFacade {
+    private final ProfileService profileService;
+
+    @Override
+    public void createProfile(SignUpRequest signUpRequest) {
+        profileService.createProfile(signUpRequest);
+    }
+}