Merge pull request #30 from commonground-project/feat/impl-user-endpo…

…int-and-metadata feat: impl author in fact, viewpoint and issue
commonground-project · Dec 3, 2024 · 09e8d02 · 09e8d02
2 parents 6d5ca69 + b017d59
commit 09e8d02
Show file tree

Hide file tree

Showing 19 changed files with 154 additions and 77 deletions.
diff --git a/src/main/java/tw/commonground/backend/service/fact/FactController.java b/src/main/java/tw/commonground/backend/service/fact/FactController.java
@@ -4,9 +4,11 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import tw.commonground.backend.service.fact.dto.FactRequest;
 import tw.commonground.backend.service.fact.dto.FactResponse;
+import tw.commonground.backend.service.user.entity.FullUserEntity;
 import tw.commonground.backend.shared.pagination.PaginationParser;
 import tw.commonground.backend.service.reference.ReferenceRequest;
 import tw.commonground.backend.service.reference.ReferenceResponse;
@@ -36,8 +38,9 @@ public WrappedPaginationResponse<List<FactResponse>> listFacts(@Valid Pagination
     }
 
     @PostMapping("/api/facts")
-    public FactResponse createFact(@Valid @RequestBody FactRequest factRequest) {
-        return factService.createFact(factRequest);
+    public FactResponse createFact(@AuthenticationPrincipal FullUserEntity user,
+                                   @Valid @RequestBody FactRequest factRequest) {
+        return factService.createFact(factRequest, user);
     }
 
     @GetMapping("/api/fact/{id}")

diff --git a/src/main/java/tw/commonground/backend/service/fact/FactService.java b/src/main/java/tw/commonground/backend/service/fact/FactService.java
@@ -13,6 +13,7 @@
 import tw.commonground.backend.service.fact.entity.FactEntity;
 import tw.commonground.backend.service.fact.entity.FactRepository;
 import tw.commonground.backend.service.reference.*;
+import tw.commonground.backend.service.user.entity.FullUserEntity;
 import tw.commonground.backend.shared.pagination.PaginationMapper;
 import tw.commonground.backend.shared.pagination.WrappedPaginationResponse;
 
@@ -57,16 +58,14 @@ public FactResponse getFact(UUID id) {
         return FactMapper.toResponse(factEntity);
     }
 
-    public FactResponse createFact(FactRequest factRequest) {
-        //TODO: Map to logged in user
+    public FactResponse createFact(FactRequest factRequest, FullUserEntity user) {
         FactEntity factEntity = FactEntity.builder()
                 .title(factRequest.getTitle())
-                .authorId(1L)
-                .authorName("aaa")
-                .authorAvatar("asd")
                 .references(new HashSet<>())
                 .build();
 
+        factEntity.setAuthor(user);
+
         Set<ReferenceEntity> referenceEntities = parseReferenceEntity(factRequest.getUrls());
         factEntity.setReferences(referenceEntities);
 

diff --git a/src/main/java/tw/commonground/backend/service/fact/dto/FactMapper.java b/src/main/java/tw/commonground/backend/service/fact/dto/FactMapper.java
@@ -22,6 +22,7 @@ public static FactResponse toResponse(FactEntity factEntity) {
                 .updateAt(factEntity.getUpdatedAt())
                 .authorId(factEntity.getAuthorId())
                 .authorName(factEntity.getAuthorName())
+                .authorAvatar(factEntity.getAuthorAvatar())
                 .references(factEntity.getReferences().stream().map(ReferenceMapper::toResponse).toList())
                 .build();
     }

diff --git a/src/main/java/tw/commonground/backend/service/fact/dto/FactResponse.java b/src/main/java/tw/commonground/backend/service/fact/dto/FactResponse.java
@@ -13,10 +13,18 @@
 public class FactResponse {
 
     private UUID id;
+
     private LocalDateTime createAt;
+
     private LocalDateTime updateAt;
+
     private String title;
-    private Long authorId;
+
+    private UUID authorId;
+
     private String authorName;
+
+    private String authorAvatar;
+
     private List<ReferenceResponse> references;
 }
diff --git a/src/main/java/tw/commonground/backend/service/fact/entity/FactEntity.java b/src/main/java/tw/commonground/backend/service/fact/entity/FactEntity.java
@@ -6,6 +6,7 @@
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 import tw.commonground.backend.service.reference.ReferenceEntity;
+import tw.commonground.backend.service.user.entity.BaseEntityWithAuthor;
 
 import java.time.LocalDateTime;
 import java.util.Set;
@@ -18,7 +19,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @EntityListeners(AuditingEntityListener.class)
-public class FactEntity {
+public class FactEntity extends BaseEntityWithAuthor {
 
     @Id
     @GeneratedValue
@@ -37,13 +38,6 @@ public class FactEntity {
     @Column(nullable = false)
     private String title;
 
-    // TODO: Waiting User Entity
-    private Long authorId;
-
-    private String authorName;
-
-    private String authorAvatar;
-
     @ManyToMany
     private Set<ReferenceEntity> references;
 }
diff --git a/src/main/java/tw/commonground/backend/service/issue/IssueController.java b/src/main/java/tw/commonground/backend/service/issue/IssueController.java
@@ -3,6 +3,7 @@
 import jakarta.validation.Valid;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import tw.commonground.backend.service.fact.FactService;
 import tw.commonground.backend.service.fact.dto.FactMapper;
@@ -14,6 +15,7 @@
 import tw.commonground.backend.service.issue.dto.IssueResponse;
 import tw.commonground.backend.service.issue.dto.SimpleIssueResponse;
 import tw.commonground.backend.service.issue.entity.IssueEntity;
+import tw.commonground.backend.service.user.entity.FullUserEntity;
 import tw.commonground.backend.shared.pagination.PaginationMapper;
 import tw.commonground.backend.shared.pagination.PaginationRequest;
 import tw.commonground.backend.shared.pagination.PaginationParser;
@@ -56,8 +58,10 @@ public WrappedPaginationResponse<List<SimpleIssueResponse>> listIssues(@Valid Pa
     }
 
     @PostMapping("/issues")
-    public IssueResponse createIssue(@Valid @RequestBody IssueRequest issueRequest) {
-        IssueEntity issueEntity = issueService.createIssue(issueRequest);
+    public IssueResponse createIssue(@AuthenticationPrincipal FullUserEntity user,
+                                     @Valid @RequestBody IssueRequest issueRequest) {
+
+        IssueEntity issueEntity = issueService.createIssue(issueRequest, user);
         ContentContainFact contentContainFact = ContentContainFactParser
                 .separateContentAndFacts(issueEntity.getInsight());
 

diff --git a/src/main/java/tw/commonground/backend/service/issue/IssueService.java b/src/main/java/tw/commonground/backend/service/issue/IssueService.java
@@ -12,6 +12,7 @@
 import tw.commonground.backend.service.fact.entity.FactRepository;
 import tw.commonground.backend.service.issue.dto.IssueRequest;
 import tw.commonground.backend.service.issue.entity.*;
+import tw.commonground.backend.service.user.entity.FullUserEntity;
 import tw.commonground.backend.shared.content.ContentContainFactParser;
 
 import java.util.*;
@@ -45,7 +46,7 @@ public IssueEntity getIssue(UUID id) {
         );
     }
 
-    public IssueEntity createIssue(IssueRequest request) {
+    public IssueEntity createIssue(IssueRequest request, FullUserEntity user) {
         factService.throwIfFactsNotExist(request.getFacts());
 
         String insight;
@@ -55,14 +56,11 @@ public IssueEntity createIssue(IssueRequest request) {
             throw new ValidationException("Insight is invalid: " + e.getMessage());
         }
 
-        IssueEntity issueEntity = IssueEntity.builder()
-                .title(request.getTitle())
-                .description(request.getDescription())
-                .insight(insight)
-//                .authorId(request.getAuthorId())
-//                .authorName(request.getAuthorName())
-//                .authorAvatar(request.getAuthorAvatar())
-                .build();
+        IssueEntity issueEntity = new IssueEntity();
+        issueEntity.setTitle(request.getTitle());
+        issueEntity.setDescription(request.getDescription());
+        issueEntity.setInsight(insight);
+        issueEntity.setAuthor(user);
         return issueRepository.save(issueEntity);
     }
 
@@ -86,9 +84,6 @@ public IssueEntity updateIssue(UUID id, IssueRequest issueRequest) {
 
         issueEntity.setTitle(issueRequest.getTitle());
         issueEntity.setDescription(issueRequest.getDescription());
-//        issueEntity.setAuthorId(issueRequest.getAuthorId());
-//        issueEntity.setAuthorName(issueRequest.getAuthorName());
-//        issueEntity.setAuthorAvatar(issueRequest.getAuthorAvatar());
         return issueRepository.save(issueEntity);
     }
 

diff --git a/src/main/java/tw/commonground/backend/service/issue/dto/IssueResponse.java b/src/main/java/tw/commonground/backend/service/issue/dto/IssueResponse.java
@@ -7,6 +7,7 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.UUID;
 
 @Getter
 @Setter
@@ -25,7 +26,7 @@ public class IssueResponse {
 
     private String insight;
 
-    private String authorId;
+    private UUID authorId;
 
     private String authorName;
 

diff --git a/src/main/java/tw/commonground/backend/service/issue/entity/IssueEntity.java b/src/main/java/tw/commonground/backend/service/issue/entity/IssueEntity.java
@@ -5,6 +5,7 @@
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import tw.commonground.backend.service.user.entity.BaseEntityWithAuthor;
 
 import java.time.LocalDateTime;
 import java.util.Set;
@@ -17,7 +18,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @EntityListeners(AuditingEntityListener.class)
-public class IssueEntity implements SimpleIssueEntity {
+public class IssueEntity extends BaseEntityWithAuthor implements SimpleIssueEntity {
 
     public IssueEntity(UUID id) {
         this.id = id;
@@ -42,13 +43,7 @@ public IssueEntity(UUID id) {
     @Column(columnDefinition = "TEXT")
     private String insight;
 
-    private String authorId;
-
-    private String authorName;
-
-    private String authorAvatar;
-
-//  Added for POST /api/issue/{id}/viewpoints endpoint
+    //  Added for POST /api/issue/{id}/viewpoints endpoint
     @OneToMany(mappedBy = "issue")
     private Set<ManualIssueFactEntity> manualFacts;
 

diff --git a/src/main/java/tw/commonground/backend/service/user/UserController.java b/src/main/java/tw/commonground/backend/service/user/UserController.java
@@ -39,7 +39,7 @@ public ResponseEntity<List<UserResponse>> getUser() {
     }
 
     @GetMapping("/user/{username}")
-    @PreAuthorize("hasRole('ADMIN')")
+    @PreAuthorize("isAuthenticated()")
     public ResponseEntity<UserResponse> getUserByUsername(@PathVariable @NotBlank String username) {
         FullUserEntity userEntity = userService.getUserByUsername(username).orElseThrow(
                 () -> new EntityNotFoundException("User", "username", username));
@@ -63,7 +63,7 @@ public ResponseEntity<UserResponse> userSetup(@Valid @RequestBody UserSetupReque
         return ResponseEntity.ok(response);
     }
 
-    @GetMapping(value = "/user/profile-image/{username}", produces = "image/png")
+    @GetMapping(value = "/user/avatar/{username}", produces = "image/png")
     public ResponseEntity<byte[]> getProfileImage(@Valid @NotBlank @PathVariable String username) {
         return ResponseEntity.ok(userService.getProfileImage(username));
     }

diff --git a/src/main/java/tw/commonground/backend/service/user/dto/UserResponse.java b/src/main/java/tw/commonground/backend/service/user/dto/UserResponse.java
@@ -7,16 +7,15 @@
 @Getter
 @Setter
 public class UserResponse {
-    // only response data in API spec
     private String username;
     private String nickname;
     private String email;
     private String role;
 
     public UserResponse(String username, String nickname, String email, String role) {
-        this.username = username;
-        this.nickname = nickname;
-        this.email = email;
-        this.role = role;
+        this.username = username == null ? "" : username;
+        this.nickname = nickname == null ? "" : nickname;
+        this.email = email == null ? "" : email;
+        this.role = role == null ? "" : role;
     }
 }
diff --git a/src/main/java/tw/commonground/backend/service/user/entity/BaseEntityWithAuthor.java b/src/main/java/tw/commonground/backend/service/user/entity/BaseEntityWithAuthor.java
@@ -0,0 +1,24 @@
+package tw.commonground.backend.service.user.entity;
+
+import jakarta.persistence.MappedSuperclass;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.UUID;
+
+@Getter
+@Setter
+@MappedSuperclass
+public class BaseEntityWithAuthor {
+    private UUID authorId;
+
+    private String authorName;
+
+    private String authorAvatar;
+
+    public void setAuthor(FullUserEntity user) {
+        this.authorId = user.getUuid();
+        this.authorName = user.getNickname();
+        this.authorAvatar = "/api/user/avatar/" + user.getUsername();
+    }
+}