Merge pull request #6 from FerroEduardo/avatar

Mini user avatar

Author: FerroEduardo

core-backend/src/main/java/com/softawii/social/config/SecurityConfig.java

@@ -9,6 +9,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
+import org.springframework.security.authentication.InternalAuthenticationServiceException;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
@@ -67,6 +68,11 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                                 response.sendRedirect("/login/failed?reason=github-public-email-disabled");
                                 return;
                             }
+                            if (exception instanceof InternalAuthenticationServiceException) {
+                                response.sendRedirect("/login/failed?reason=unexpected-error");
+                                return;
+                            }
+
                             response.sendError(HttpServletResponse.SC_FORBIDDEN);
                         })
                 )

core-backend/src/main/java/com/softawii/social/model/AvatarImage.java

@@ -0,0 +1,4 @@
+package com.softawii.social.model;
+
+public record AvatarImage(Long avatar, Long small) {
+}

core-backend/src/main/java/com/softawii/social/model/User.java

@@ -1,10 +1,11 @@
 package com.softawii.social.model;
 
 public class User {
-    private Long id;
+    private Long   id;
     private String name;
     private String email;
-    private Long imageId;
+    private Long   avatarImageId;
+    private Long   smallAvatarImageId;
 
     public Long getId() {
         return id;
@@ -30,12 +31,20 @@ public void setEmail(String email) {
         this.email = email;
     }
 
-    public Long getImageId() {
-        return imageId;
+    public Long getAvatarImageId() {
+        return avatarImageId;
     }
 
-    public void setImageId(Long imageUrl) {
-        this.imageId = imageUrl;
+    public void setAvatarImageId(Long avatarImageId) {
+        this.avatarImageId = avatarImageId;
+    }
+
+    public Long getSmallAvatarImageId() {
+        return smallAvatarImageId;
+    }
+
+    public void setSmallAvatarImageId(Long smallAvatarImageId) {
+        this.smallAvatarImageId = smallAvatarImageId;
     }
 
     @Override
@@ -44,7 +53,8 @@ public String toString() {
                 "id=" + id +
                 ", name='" + name + '\'' +
                 ", email='" + email + '\'' +
-                ", imageId=" + imageId +
+                ", avatarImageId=" + avatarImageId +
+                ", smallAvatarImageId=" + smallAvatarImageId +
                 '}';
     }
 }

core-backend/src/main/java/com/softawii/social/model/dto/CommentDTO.java

@@ -8,20 +8,12 @@ public class CommentDTO {
     private String        authorName;
     private String        value;
     private ZonedDateTime createdAt;
-    private String        authorImageUrl;
+    private String        authorAvatarUrl;
+    private String        authorMiniAvatarUrl;
 
     public CommentDTO() {
     }
 
-    public CommentDTO(Long id, Long authorId, String authorName, String value, ZonedDateTime createdAt, String authorImageUrl) {
-        this.id = id;
-        this.authorId = authorId;
-        this.authorName = authorName;
-        this.value = value;
-        this.createdAt = createdAt;
-        this.authorImageUrl = authorImageUrl;
-    }
-
     public Long getId() {
         return id;
     }
@@ -62,23 +54,19 @@ public void setCreatedAt(ZonedDateTime createdAt) {
         this.createdAt = createdAt;
     }
 
-    public String getAuthorImageUrl() {
-        return authorImageUrl;
+    public String getAuthorAvatarUrl() {
+        return authorAvatarUrl;
+    }
+
+    public void setAuthorAvatarUrl(String authorAvatarUrl) {
+        this.authorAvatarUrl = authorAvatarUrl;
     }
 
-    public void setAuthorImageUrl(String authorImageUrl) {
-        this.authorImageUrl = authorImageUrl;
+    public String getAuthorMiniAvatarUrl() {
+        return authorMiniAvatarUrl;
     }
 
-    @Override
-    public String toString() {
-        return "CommentDTO{" +
-                "id=" + id +
-                ", authorId=" + authorId +
-                ", authorName='" + authorName + '\'' +
-                ", value='" + value + '\'' +
-                ", createdAt=" + createdAt +
-                ", authorImageUrl='" + authorImageUrl + '\'' +
-                '}';
+    public void setAuthorMiniAvatarUrl(String authorMiniAvatarUrl) {
+        this.authorMiniAvatarUrl = authorMiniAvatarUrl;
     }
 }

core-backend/src/main/java/com/softawii/social/model/dto/PostDTO.java

@@ -11,7 +11,8 @@ public class PostDTO {
     private ZonedDateTime modifiedAt;
     private Long          authorId;
     private String        authorName;
-    private String        authorImageUrl;
+    private String        authorAvatarUrl;
+    private String        authorMiniAvatarUrl;
     private Long          gameId;
     private String        gameName;
     private String        gameStudio;
@@ -86,12 +87,12 @@ public void setAuthorName(String authorName) {
         this.authorName = authorName;
     }
 
-    public String getAuthorImageUrl() {
-        return authorImageUrl;
+    public String getAuthorAvatarUrl() {
+        return authorAvatarUrl;
     }
 
-    public void setAuthorImageUrl(String authorImageUrl) {
-        this.authorImageUrl = authorImageUrl;
+    public void setAuthorAvatarUrl(String authorAvatarUrl) {
+        this.authorAvatarUrl = authorAvatarUrl;
     }
 
     public Long getGameId() {
@@ -141,4 +142,12 @@ public String getGameImageUrl() {
     public void setGameImageUrl(String gameImageUrl) {
         this.gameImageUrl = gameImageUrl;
     }
+
+    public String getAuthorMiniAvatarUrl() {
+        return authorMiniAvatarUrl;
+    }
+
+    public void setAuthorMiniAvatarUrl(String authorMiniAvatarUrl) {
+        this.authorMiniAvatarUrl = authorMiniAvatarUrl;
+    }
 }

core-backend/src/main/java/com/softawii/social/model/dto/UserDTO.java

@@ -4,16 +4,17 @@ public class UserDTO {
     private Long   id;
     private String name;
     private String email;
-    private String imageUrl;
+    private String avatarUrl;
+    private String miniAvatarUrl;
 
     public UserDTO() {
     }
 
-    public UserDTO(Long id, String name, String email, String imageUrl) {
+    public UserDTO(Long id, String name, String email, String avatarUrl) {
         this.id = id;
         this.name = name;
         this.email = email;
-        this.imageUrl = imageUrl;
+        this.avatarUrl = avatarUrl;
     }
 
     public Long getId() {
@@ -40,11 +41,19 @@ public void setEmail(String email) {
         this.email = email;
     }
 
-    public String getImageUrl() {
-        return imageUrl;
+    public String getAvatarUrl() {
+        return avatarUrl;
     }
 
-    public void setImageUrl(String imageUrl) {
-        this.imageUrl = imageUrl;
+    public void setAvatarUrl(String avatarUrl) {
+        this.avatarUrl = avatarUrl;
+    }
+
+    public String getMiniAvatarUrl() {
+        return miniAvatarUrl;
+    }
+
+    public void setMiniAvatarUrl(String miniAvatarUrl) {
+        this.miniAvatarUrl = miniAvatarUrl;
     }
 }

core-backend/src/main/java/com/softawii/social/repository/CommentRepository.java

@@ -47,7 +47,7 @@ public CommentRepository(JdbcClient jdbcClient, CommentRowMapper commentRowMappe
 
     public Optional<CommentDTO> findById(Long id) {
         String sql = """
-                SELECT pc.id, pc.author_id, u.name as "author_name", u.image_id as "author_image_id", pc.value, pc.created_at
+                SELECT pc.id, pc.author_id, u.name as "author_name", u.avatar_id AS "authorAvatarId", u.mini_avatar_id AS "miniAuthorAvatarId", pc.value, pc.created_at
                 FROM social.post_comment pc
                 INNER JOIN social.user u on u.id = author_id
                 WHERE pc.id = :id
@@ -63,7 +63,7 @@ public Optional<CommentDTO> findById(Long id) {
     public Page<CommentDTO> findByPostId(Long postId, Pageable pageable, boolean isActive) {
         MapSqlParameterSource parameterSource = new MapSqlParameterSource();
         String sql = """
-                SELECT pc.id, pc.author_id, u.name AS "author_name", u.image_id AS "author_image_id", pc.value, pc.created_at
+                SELECT pc.id, pc.author_id, u.name AS "author_name", u.avatar_id AS "authorAvatarId", u.mini_avatar_id AS "miniAuthorAvatarId", pc.value, pc.created_at
                 FROM social.post_comment pc
                 INNER JOIN social.user u ON u.id = author_id
                 WHERE pc.post_id = :post_id
@@ -113,7 +113,7 @@ SELECT COUNT(*) FROM social.post_comment pc
 
     public Optional<CommentDTO> findByIdAndUserId(Long id, Long userId) {
         String sql = """
-                SELECT pc.id, pc.author_id, u.name as "author_name", u.image_id as "author_image_id", pc.value, pc.created_at
+                SELECT pc.id, pc.author_id, u.name as "author_name", u.avatar_id AS "authorAvatarId", u.mini_avatar_id AS "miniAuthorAvatarId", pc.value, pc.created_at
                 FROM social.post_comment pc
                 INNER JOIN social.user u on u.id = author_id
                 WHERE pc.id = :id AND pc.author_id = :author_id AND pc.deleted_at IS NULL

core-backend/src/main/java/com/softawii/social/repository/PostRepository.java

@@ -263,7 +263,8 @@ private StringBuilder baseDtoQuery() {
                                          p.modified_at AS "modifiedAt",
                                          u.id AS "authorId",
                                          u.name AS "authorName",
-                                         u.image_id AS "authorImageId",
+                                         u.avatar_id AS "authorAvatarId",
+                                         u.mini_avatar_id AS "miniAuthorAvatarId",
                                          p.game_id AS "gameId",
                                          g.name AS "gameName",
                                          g.studio AS "gameStudio",

core-backend/src/main/java/com/softawii/social/repository/UserRepository.java

@@ -29,8 +29,8 @@ public UserRepository(JdbcClient jdbcClient, UserRowMapper userRowMapper, UserDt
     @Transactional
     public User create(User user) {
         String sql = """
-                INSERT INTO social.user (name, email, image_id)
-                VALUES (:name, :email, :image_id)
+                INSERT INTO social.user (name, email, avatar_id, mini_avatar_id)
+                VALUES (:name, :email, :avatar_id, :mini_avatar_id)
                 RETURNING id
                 """;
 
@@ -39,7 +39,8 @@ public User create(User user) {
                 .sql(sql)
                 .param("name", user.getName(), Types.VARCHAR)
                 .param("email", user.getEmail(), Types.VARCHAR)
-                .param("image_id", user.getImageId(), Types.BIGINT)
+                .param("avatar_id", user.getAvatarImageId(), Types.BIGINT)
+                .param("mini_avatar_id", user.getSmallAvatarImageId(), Types.BIGINT)
                 .update(keyHolder);
 
         user.setId(keyHolder.getKey().longValue());
@@ -49,7 +50,7 @@ public User create(User user) {
 
     public Optional<User> findByEmail(String email) {
         String sql = """
-                SELECT id, name, email, image_id from social.user
+                SELECT id, name, email, avatar_id, mini_avatar_id from social.user
                 WHERE email = :email
                 LIMIT 1
                 """;
@@ -63,7 +64,7 @@ public Optional<User> findByEmail(String email) {
 
     public Optional<UserDTO> findByEmailSafe(String email) {
         String sql = """
-                SELECT id, name, email, image_id from social.user
+                SELECT id, name, email, avatar_id, mini_avatar_id from social.user
                 WHERE email = :email
                 LIMIT 1
                 """;

core-backend/src/main/java/com/softawii/social/repository/mapper/CommentDtoRowMapper.java

@@ -23,7 +23,8 @@ public CommentDTO mapRow(ResultSet rs, int rowNum) throws SQLException {
         commentDTO.setId(rs.getLong("id"));
         commentDTO.setAuthorId(rs.getLong("author_id"));
         commentDTO.setAuthorName(rs.getString("author_name"));
-        commentDTO.setAuthorImageUrl(imageService.getImageUrlFromImageId(rs.getLong("author_image_id")));
+        commentDTO.setAuthorAvatarUrl(imageService.getImageUrlFromImageId(rs.getLong("authorAvatarId")));
+        commentDTO.setAuthorMiniAvatarUrl(imageService.getImageUrlFromImageId(rs.getLong("miniAuthorAvatarId")));
         commentDTO.setValue(rs.getString("value"));
         commentDTO.setCreatedAt(rs.getObject("created_at", OffsetDateTime.class).toZonedDateTime());