fix: Update modified_by and created_by to id (#19)

dengfeige · web-flow · commit b841472f19e2 · 2022-07-25T14:19:43.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 output
 /target/
+/logs/
 *.iml
 .arcconfig
 .idea
@@ -10,4 +11,4 @@ output
 pom.xml.versionsBackup
 .java-version
 .DS_Store
-*.tar.gz
+*.tar.gz
diff --git a/src/main/java/com/featureprobe/api/auth/UserPasswordAuthenticationProcessingFilter.java b/src/main/java/com/featureprobe/api/auth/UserPasswordAuthenticationProcessingFilter.java
@@ -30,6 +30,7 @@ public Authentication attemptAuthentication(HttpServletRequest request, HttpServ
         Map<String, String> authParam = mapper.readValue(body, Map.class);
         String account = authParam.get("account");
         String password = authParam.get("password");
-        return getAuthenticationManager().authenticate(new UserPasswordAuthenticationToken(account,password));
+
+        return getAuthenticationManager().authenticate(new UserPasswordAuthenticationToken(account, password));
     }
 }
diff --git a/src/main/java/com/featureprobe/api/auth/UserPasswordAuthenticationProvider.java b/src/main/java/com/featureprobe/api/auth/UserPasswordAuthenticationProvider.java
@@ -32,7 +32,8 @@ public Authentication authenticate(Authentication authentication) throws Authent
             if (member.isPresent()
                     && new BCryptPasswordEncoder().matches(token.getPassword(), member.get().getPassword())) {
                 memberService.updateVisitedTime(token.getAccount());
-                return new UserPasswordAuthenticationToken(member.get().getAccount(), member.get().getRole().name(),
+
+                return new UserPasswordAuthenticationToken(member.get(),
                         Arrays.asList(new SimpleGrantedAuthority(member.get().getRole().name())));
             }
         }
diff --git a/src/main/java/com/featureprobe/api/auth/UserPasswordAuthenticationToken.java b/src/main/java/com/featureprobe/api/auth/UserPasswordAuthenticationToken.java
@@ -1,6 +1,7 @@
 package com.featureprobe.api.auth;
 
 import com.featureprobe.api.base.enums.RoleEnum;
+import com.featureprobe.api.entity.Member;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
 
@@ -12,7 +13,7 @@ public class UserPasswordAuthenticationToken extends AbstractAuthenticationToken
 
     private String password;
 
-    private String role;
+    private Member principal;
 
     public UserPasswordAuthenticationToken(String account, String password) {
         super(null);
@@ -21,16 +22,15 @@ public UserPasswordAuthenticationToken(String account, String password) {
         super.setAuthenticated(false);
     }
 
-    public UserPasswordAuthenticationToken(String account, String role,
-                                           Collection<? extends GrantedAuthority> authorities) {
+    public UserPasswordAuthenticationToken(Member principal, Collection<? extends GrantedAuthority> authorities) {
         super(authorities);
-        this.account = account;
-        this.role = role;
+        this.principal = principal;
+        this.account = principal.getAccount();
         super.setAuthenticated(true);
     }
 
     public boolean isAdmin() {
-        return RoleEnum.ADMIN.name().equals(role);
+        return RoleEnum.ADMIN.name().equals(getRole());
     }
 
     @Override
@@ -39,31 +39,24 @@ public Object getCredentials() {
     }
 
     @Override
-    public Object getPrincipal() {
-        return "admin";
+    public Member getPrincipal() {
+        return principal;
     }
 
     public String getAccount() {
         return account;
     }
 
-    public void setAccount(String account) {
-        this.account = account;
-    }
-
     public String getPassword() {
         return password;
     }
 
-    public void setPassword(String password) {
-        this.password = password;
-    }
 
     public String getRole() {
-        return role;
+        if (principal == null) {
+            return null;
+        }
+        return principal.getRole().name();
     }
 
-    public void setRole(String role) {
-        this.role = role;
-    }
 }
diff --git a/src/main/java/com/featureprobe/api/base/config/AuditingConfig.java b/src/main/java/com/featureprobe/api/base/config/AuditingConfig.java
@@ -1,6 +1,7 @@
 package com.featureprobe.api.base.config;
 
 import com.featureprobe.api.auth.UserPasswordAuthenticationToken;
+import com.featureprobe.api.entity.Member;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
@@ -13,23 +14,15 @@
 @Configuration
 public class AuditingConfig implements AuditorAware {
 
-    private static final String ANONYMOUS_OPERATE = "Anonymous";
-
-    private static final String SYSTEM_OPERATE = "System";
-
-
     @Override
-    public Optional getCurrentAuditor() {
+    public Optional<Member> getCurrentAuditor() {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        if (Objects.isNull(authentication)) {
-            return Optional.of(SYSTEM_OPERATE);
-        } else if (authentication instanceof AnonymousAuthenticationToken) {
-            return Optional.of(ANONYMOUS_OPERATE);
-        } else {
-            UserPasswordAuthenticationToken userPasswordAuthenticationToken =
-                    (UserPasswordAuthenticationToken) authentication;
-            return Optional.of(userPasswordAuthenticationToken.getAccount());
+        if (!(authentication instanceof UserPasswordAuthenticationToken)) {
+            return null;
         }
+        UserPasswordAuthenticationToken userPasswordAuthenticationToken =
+                (UserPasswordAuthenticationToken) authentication;
+        return Optional.of(userPasswordAuthenticationToken.getPrincipal());
     }
 
 }
diff --git a/src/main/java/com/featureprobe/api/base/entity/AbstractAuditEntity.java b/src/main/java/com/featureprobe/api/base/entity/AbstractAuditEntity.java
@@ -1,5 +1,6 @@
 package com.featureprobe.api.base.entity;
 
+import com.featureprobe.api.entity.Member;
 import lombok.Data;
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
@@ -12,6 +13,8 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
@@ -32,16 +35,18 @@ public abstract class AbstractAuditEntity implements Serializable {
     @CreatedDate
     private Date createdTime;
 
-    @Column(name = "created_by", nullable = false, updatable = false)
     @CreatedBy
-    private String createdBy;
+    @ManyToOne
+    @JoinColumn(name = "created_by", referencedColumnName = "id", nullable = false, updatable = false)
+    private Member createdBy;
 
     @Temporal(TemporalType.TIMESTAMP)
     @Column(name = "modified_time", nullable = false)
     @LastModifiedDate
     private Date modifiedTime;
 
-    @Column(name = "modified_by", nullable = false)
     @LastModifiedBy
-    private String modifiedBy;
+    @ManyToOne
+    @JoinColumn(name = "modified_by", referencedColumnName = "id", nullable = false)
+    private Member modifiedBy;
 }
diff --git a/src/main/java/com/featureprobe/api/dto/SegmentResponse.java b/src/main/java/com/featureprobe/api/dto/SegmentResponse.java
@@ -20,8 +20,6 @@ public class SegmentResponse {
 
     private Date createdTime;
 
-    private String createdBy;
-
     private Date modifiedTime;
 
     private String modifiedBy;
diff --git a/src/main/java/com/featureprobe/api/dto/TargetingVersionResponse.java b/src/main/java/com/featureprobe/api/dto/TargetingVersionResponse.java
@@ -23,6 +23,4 @@ public class TargetingVersionResponse {
     private Long version;
 
     private Date createdTime;
-
-    private String createdBy;
 }
diff --git a/src/main/java/com/featureprobe/api/dto/ToggleResponse.java b/src/main/java/com/featureprobe/api/dto/ToggleResponse.java
@@ -29,8 +29,6 @@ public class ToggleResponse {
 
     private Date createdTime;
 
-    private String createdBy;
-
     private Date modifiedTime;
 
     private String modifiedBy;
diff --git a/src/main/java/com/featureprobe/api/entity/Member.java b/src/main/java/com/featureprobe/api/entity/Member.java
@@ -9,6 +9,7 @@
 import lombok.ToString;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.Where;
+import org.springframework.security.core.AuthenticatedPrincipal;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -17,16 +18,14 @@
 import javax.persistence.Table;
 import java.util.Date;
 
-@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
 @Entity
 @Table(name = "member")
 @Where(clause = "deleted = 0")
 @DynamicInsert
-@ToString(callSuper = true)
-public class Member extends AbstractAuditEntity {
+public class Member extends AbstractAuditEntity implements AuthenticatedPrincipal {
 
     private String account;
 
@@ -40,4 +39,8 @@ public class Member extends AbstractAuditEntity {
 
     private Boolean deleted;
 
+    @Override
+    public String getName() {
+        return account;
+    }
 }
diff --git a/src/main/java/com/featureprobe/api/mapper/BaseMapper.java b/src/main/java/com/featureprobe/api/mapper/BaseMapper.java
@@ -0,0 +1,15 @@
+package com.featureprobe.api.mapper;
+
+import com.featureprobe.api.entity.Member;
+
+public interface BaseMapper {
+
+
+    default String getAccount(Member member) {
+        if (member == null) {
+            return "unknown";
+        }
+        return member.getAccount();
+    }
+
+}
diff --git a/src/main/java/com/featureprobe/api/mapper/MemberMapper.java b/src/main/java/com/featureprobe/api/mapper/MemberMapper.java
@@ -12,13 +12,13 @@
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 @Mapper
-public interface MemberMapper {
+public interface MemberMapper extends BaseMapper{
 
     MemberMapper INSTANCE = Mappers.getMapper(MemberMapper.class);
 
     @Mapping(target = "role", expression = "java(member.getRole().name())")
     @Mapping(target = "account", expression = "java(member.getAccount())")
-    @Mapping(target = "createdBy", expression = "java(member.getCreatedBy())")
+    @Mapping(target = "createdBy", expression = "java(getAccount(member.getCreatedBy()))")
     @Mapping(target = "visitedTime", expression = "java(member.getVisitedTime())")
     MemberResponse entityToResponse(Member member);
 
diff --git a/src/main/java/com/featureprobe/api/mapper/SegmentMapper.java b/src/main/java/com/featureprobe/api/mapper/SegmentMapper.java
@@ -20,14 +20,15 @@
 import java.util.List;
 
 @Mapper
-public interface SegmentMapper {
+public interface SegmentMapper extends BaseMapper {
 
     SegmentMapper INSTANCE = Mappers.getMapper(SegmentMapper.class);
 
     @Mapping(target = "rules", expression = "java(toSegmentRulesString(createRequest.getRules()))")
     Segment requestToEntity(SegmentCreateRequest createRequest);
 
     @Mapping(target = "rules", expression = "java(toSegmentRules(segment.getRules()))")
+    @Mapping(target = "modifiedBy", expression = "java(getAccount(segment.getModifiedBy()))")
     SegmentResponse entityToResponse(Segment segment);
 
     ToggleSegmentResponse toggleToToggleSegment(Toggle toggle);
diff --git a/src/main/java/com/featureprobe/api/mapper/TargetingMapper.java b/src/main/java/com/featureprobe/api/mapper/TargetingMapper.java
@@ -15,12 +15,14 @@
 import java.util.Objects;
 
 @Mapper
-public interface TargetingMapper {
+public interface TargetingMapper extends BaseMapper{
 
     TargetingMapper INSTANCE = Mappers.getMapper(TargetingMapper.class);
 
     @Mapping(target = "content",
             expression = "java(toTargetingContent(targeting.getContent()))")
+    @Mapping(target = "modifiedBy",
+            expression = "java(getAccount(targeting.getModifiedBy()))")
     TargetingResponse entityToResponse(Targeting targeting);
 
     @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
diff --git a/src/main/java/com/featureprobe/api/mapper/ToggleMapper.java b/src/main/java/com/featureprobe/api/mapper/ToggleMapper.java
@@ -21,15 +21,16 @@
 import java.util.stream.Collectors;
 
 @Mapper
-public interface ToggleMapper {
+public interface ToggleMapper extends BaseMapper {
 
     ToggleMapper INSTANCE = Mappers.getMapper(ToggleMapper.class);
+
+    @Mapping(target = "modifiedBy", expression = "java(getAccount(toggle.getModifiedBy()))")
     ToggleItemResponse entityToItemResponse(Toggle toggle);
 
-    @Mapping(target = "variations",
-            expression = "java(toVariation(toggle.getVariations()))")
-    @Mapping(target = "tags",
-            expression = "java(toTagNames(toggle.getTags()))")
+    @Mapping(target = "variations", expression = "java(toVariation(toggle.getVariations()))")
+    @Mapping(target = "tags", expression = "java(toTagNames(toggle.getTags()))")
+    @Mapping(target = "modifiedBy", expression = "java(getAccount(toggle.getModifiedBy()))")
     ToggleResponse entityToResponse(Toggle toggle);
 
     default List<String> toTagNames(List<Tag> tags) {
diff --git a/src/main/resources/db/migration/V13__modify_refs_username_to_id.sql b/src/main/resources/db/migration/V13__modify_refs_username_to_id.sql
@@ -0,0 +1,39 @@
+UPDATE toggle SET created_by = 1,  modified_by = 1;
+alter table toggle modify modified_by bigint not null;
+alter table toggle modify created_by bigint not null;
+
+UPDATE attribute SET created_by = 1,  modified_by = 1;
+alter table attribute modify modified_by bigint not null;
+alter table attribute modify created_by bigint not null;
+
+UPDATE environment SET created_by = 1,  modified_by = 1;
+alter table environment modify modified_by bigint not null;
+alter table environment modify created_by bigint not null;
+
+UPDATE member SET created_by = 1,  modified_by = 1;
+alter table member modify modified_by bigint not null;
+alter table member modify created_by bigint not null;
+
+UPDATE project SET created_by = 1,  modified_by = 1;
+alter table project modify modified_by bigint not null;
+alter table project modify created_by bigint not null;
+
+UPDATE segment SET created_by = 1,  modified_by = 1;
+alter table segment modify modified_by bigint not null;
+alter table segment modify created_by bigint not null;
+
+UPDATE tag SET created_by = 1,  modified_by = 1;
+alter table tag modify modified_by bigint not null;
+alter table tag modify created_by bigint not null;
+
+UPDATE targeting SET created_by = 1,  modified_by = 1;
+alter table targeting modify modified_by bigint not null;
+alter table targeting modify created_by bigint not null;
+
+UPDATE targeting_segment SET created_by = 1,  modified_by = 1;
+alter table targeting_segment modify modified_by bigint not null;
+alter table targeting_segment modify created_by bigint not null;
+
+UPDATE targeting_version SET created_by = 1,  modified_by = 1;
+alter table targeting_version modify modified_by bigint not null;
+alter table targeting_version modify created_by bigint not null;
diff --git a/src/test/groovy/com/featureprobe/api/service/MemberServiceSpec.groovy b/src/test/groovy/com/featureprobe/api/service/MemberServiceSpec.groovy
@@ -175,7 +175,7 @@ class MemberServiceSpec extends Specification {
 
     private setAuthContext(String account, String role) {
         SecurityContextHolder.setContext(new SecurityContextImpl(
-                new UserPasswordAuthenticationToken(account, role, null)))
+                new UserPasswordAuthenticationToken(new Member(account: account, role: role), null)))
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ public Authentication attemptAuthentication(HttpServletRequest request, HttpServ`
`30`	`30`	`Map<String, String> authParam = mapper.readValue(body, Map.class);`
`31`	`31`	`String account = authParam.get("account");`
`32`	`32`	`String password = authParam.get("password");`
`33`		`- return getAuthenticationManager().authenticate(new UserPasswordAuthenticationToken(account,password));`
	`33`	`+`
	`34`	`+ return getAuthenticationManager().authenticate(new UserPasswordAuthenticationToken(account, password));`
`34`	`35`	`}`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ public Authentication authenticate(Authentication authentication) throws Authent`
`32`	`32`	`if (member.isPresent()`
`33`	`33`	`&& new BCryptPasswordEncoder().matches(token.getPassword(), member.get().getPassword())) {`
`34`	`34`	`memberService.updateVisitedTime(token.getAccount());`
`35`		`- return new UserPasswordAuthenticationToken(member.get().getAccount(), member.get().getRole().name(),`
	`35`	`+`
	`36`	`+ return new UserPasswordAuthenticationToken(member.get(),`
`36`	`37`	`Arrays.asList(new SimpleGrantedAuthority(member.get().getRole().name())));`
`37`	`38`	`}`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,4 @@ public class TargetingVersionResponse {`
`23`	`23`	`private Long version;`
`24`	`24`
`25`	`25`	`private Date createdTime;`
`26`		`-`
`27`		`- private String createdBy;`
`28`	`26`	`}`