fix: include anniversary logic for cake day

christolis · TheCodeMr · cabagbe · christolis · commit 425956857d70 · 2024-10-06T15:21:40.000+03:00
Co-authored-by: TheCodeMr &lt;151576372+TheCodeMr@users.noreply.github.com&gt;
Co-authored-by: cab &lt;161495905+cabagbe@users.noreply.github.com&gt;
Co-authored-by: Devansh Tiwari &lt;65783463+devloves@users.noreply.github.com&gt;
diff --git a/application/src/main/java/org/togetherjava/tjbot/features/cakeday/CakeDayService.java b/application/src/main/java/org/togetherjava/tjbot/features/cakeday/CakeDayService.java
@@ -294,8 +294,9 @@ protected boolean isUserCached(User user) {
     protected boolean hasMemberCakeDayToday(Member member) {
         OffsetDateTime now = OffsetDateTime.now();
         OffsetDateTime joinMonthDate = member.getTimeJoined();
+        int anniversary = now.getYear() - joinMonthDate.getYear();
 
-        return now.getMonth() == joinMonthDate.getMonth()
+        return anniversary > 0 && now.getMonth() == joinMonthDate.getMonth()
                 && now.getDayOfMonth() == joinMonthDate.getDayOfMonth();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -294,8 +294,9 @@ protected boolean isUserCached(User user) {`
`294`	`294`	`protected boolean hasMemberCakeDayToday(Member member) {`
`295`	`295`	`OffsetDateTime now = OffsetDateTime.now();`
`296`	`296`	`OffsetDateTime joinMonthDate = member.getTimeJoined();`
	`297`	`+ int anniversary = now.getYear() - joinMonthDate.getYear();`
`297`	`298`
`298`		`- return now.getMonth() == joinMonthDate.getMonth()`
	`299`	`+ return anniversary > 0 && now.getMonth() == joinMonthDate.getMonth()`
`299`	`300`	`&& now.getDayOfMonth() == joinMonthDate.getDayOfMonth();`
`300`	`301`	`}`
`301`	`302`