Merge pull request #177 from homenoc/feat/fix_update_membership

[fix] Fixed #176.
homenoc · Apr 22, 2023 · 7f4730e · 7f4730e
2 parents b7a78eb + b24c0c4
commit 7f4730e
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/pkg/api/core/group/v0/slack.go b/pkg/api/core/group/v0/slack.go
@@ -113,20 +113,18 @@ func changeTextByAdmin(before, after core.Group) string {
 	if after.CouponID != nil {
 		if before.CouponID == nil {
 			data += "CouponID: None => " + *after.CouponID + "\n"
-
-		}
-		if *before.CouponID != *after.CouponID {
+		} else if *before.CouponID != *after.CouponID {
 			data += "CouponID: " + *before.CouponID + " => " + *after.CouponID + "\n"
 		}
 	}
 
 	if after.MemberExpired != nil {
+		afterDate := after.MemberExpired.Format("2006-01-02")
 		if before.MemberExpired == nil {
-			data += "MemberExpired: None => " + after.MemberExpired.Format("2006-01-02") + "\n"
-
-		}
-		if *before.CouponID != *after.CouponID {
-			data += "MemberExpired: " + before.MemberExpired.Format("2006-01-02") + " => " + after.MemberExpired.Format("2006-01-02") + "\n"
+			data += "MemberExpired: None => " + afterDate + "\n"
+		} else if *before.MemberExpired != *after.MemberExpired {
+			beforeDate := before.MemberExpired.Format("2006-01-02")
+			data += "MemberExpired: " + beforeDate + " => " + afterDate + "\n"
 		}
 	}