production+ Query handling and caching+ new docker

Author: yakov152005

Dockerfile

@@ -1,10 +1,12 @@
 FROM maven:3.8.4-openjdk-17 as build
 WORKDIR /SocialNetwork
-COPY . .
+COPY pom.xml ./
+RUN mvn dependency:go-offline -B
+COPY src ./src
 RUN mvn clean package -DskipTests
 
 
 FROM openjdk:17-jdk-alpine
 VOLUME /tmp
 COPY --from=build /SocialNetwork/target/SocialNetwork.jar SocialNetwork.jar
-ENTRYPOINT ["java", "-jar", "/SocialNetwork.jar"]
+ENTRYPOINT ["java", "-jar", "/SocialNetwork.jar"]

src/main/java/org/server/socialnetworkserver/dtos/ProfileStatsDto.java

@@ -1,22 +1,33 @@
 package org.server.socialnetworkserver.dtos;
 
-import lombok.Getter;
+
 import lombok.Setter;
 
-@Getter
+
 @Setter
 public class ProfileStatsDto {
-    private int followersCount;
-    private int followingCount;
-    private boolean isFollowing;
-
-    public ProfileStatsDto(int followersCount, int followingCount, boolean isFollowing) {
-        this.followersCount = followersCount;
-        this.followingCount = followingCount;
-        this.isFollowing = isFollowing;
+    private Long followersCount;
+    private Long followingCount;
+    private Boolean isFollowing;
+
+    public ProfileStatsDto(Long followersCount, Long followingCount, Boolean isFollowing) {
+        this.followersCount = (followersCount != null) ? followersCount : 0;
+        this.followingCount = (followingCount != null) ? followingCount : 0;
+        this.isFollowing = (isFollowing != null) ? isFollowing : false;
+    }
+
+    public ProfileStatsDto() {}
+
+    public Long getFollowersCount() {
+        return followersCount;
     }
 
-    public ProfileStatsDto(){
+    public Long getFollowingCount() {
+        return followingCount;
+    }
 
+    public Boolean isFollowing() {
+        return isFollowing;
     }
+
 }

src/main/java/org/server/socialnetworkserver/repositoris/FollowRepository.java

@@ -65,17 +65,17 @@ boolean isFollowing(
 
     @Query("""
     SELECT new org.server.socialnetworkserver.dtos.ProfileStatsDto(
-        (SELECT COUNT(f) FROM Follow f WHERE f.following.username = :username),
-        (SELECT COUNT(f) FROM Follow f WHERE f.follower.username = :username),
+        (SELECT COUNT(f) FROM Follow f WHERE f.following.id = u.id),
+        (SELECT COUNT(f) FROM Follow f WHERE f.follower.id = u.id),
         CASE
-            WHEN EXISTS (SELECT 1 FROM Follow f WHERE f.follower.username = :currentUsername AND f.following.username = :username)
+            WHEN EXISTS (SELECT 1 FROM Follow f WHERE f.follower.id = :currentUserId AND f.following.id = u.id)
             THEN true ELSE false
         END
     )
     FROM User u
     WHERE u.username = :username
     """)
-    Optional<ProfileStatsDto> getProfileStats(@Param("username") String username, @Param("currentUsername") String currentUsername);
+    Optional<ProfileStatsDto> getProfileStats(@Param("username") String username, @Param("currentUserId") Long currentUserId);
 
 
     @Modifying

src/main/java/org/server/socialnetworkserver/services/FollowService.java

@@ -100,7 +100,7 @@ public ProfileResponse getAllDetailsOfProfileSearch(@PathVariable String current
         return new ProfileResponse(true,"Profile response success.",profileDto);
     }
      */
-    @Cacheable(value = "profileCache", key = "#username")
+    @Cacheable(value = "profileCache", key = "#currentUsername + '_' + #username")
     public ProfileResponse getAllDetailsOfProfileSearch(String currentUsername, String username){
         User currentUser = userRepository.findByUsername(currentUsername);
         User searchUser = userRepository.findByUsername(username);
@@ -109,16 +109,9 @@ public ProfileResponse getAllDetailsOfProfileSearch(String currentUsername, Stri
             return new ProfileResponse(false, "No find user.", null);
         }
 
-        Optional<ProfileStatsDto> profileStatsOptional = followRepository.getProfileStats(username, currentUsername);
+        ProfileStatsDto profileStats = followRepository.getProfileStats(username, currentUser.getId())
+                .orElse(new ProfileStatsDto(0L, 0L, false));
 
-        if (profileStatsOptional.isEmpty()) {
-            return new ProfileResponse(false, "Profile stats not found.", null);
-        }
-
-        ProfileStatsDto profileStats = profileStatsOptional.get();
-        int followers = profileStats.getFollowersCount();
-        int following = profileStats.getFollowingCount();
-        boolean isFollowing = profileStats.isFollowing();
 
         List<Object[]> results = postRepository.findProfilePosts(username, currentUser.getId());
         List<PostDto> postDtos = results.stream()
@@ -138,9 +131,9 @@ public ProfileResponse getAllDetailsOfProfileSearch(String currentUsername, Stri
         ProfileDto profileDto = new ProfileDto(
                 searchUser.getUsername(),
                 searchUser.getProfilePicture(),
-                followers,
-                following,
-                isFollowing,
+                profileStats.getFollowersCount().intValue(),
+                profileStats.getFollowingCount().intValue(),
+                profileStats.isFollowing(),
                 postDtos
         );