Added on record congratulations #minor

jordybronowicki37 · jordybronowicki37 · commit 486c6d245dff · 2025-05-16T20:50:07.000+02:00
diff --git a/backend/src/main/java/dev/jb/befit/backend/data/models/ExerciseLog.java b/backend/src/main/java/dev/jb/befit/backend/data/models/ExerciseLog.java
@@ -63,6 +63,10 @@ public class ExerciseLog {
     @Column(columnDefinition="BOOLEAN DEFAULT FALSE")
     private boolean prImproved = false;
 
+    @Setter
+    @Column(columnDefinition="BOOLEAN DEFAULT FALSE")
+    private boolean onPr = false;
+
     @Setter
     @Column(columnDefinition="BOOLEAN DEFAULT FALSE")
     private boolean levelCompleted = false;
diff --git a/backend/src/main/java/dev/jb/befit/backend/discord/commands/CommandConstants.java b/backend/src/main/java/dev/jb/befit/backend/discord/commands/CommandConstants.java
@@ -52,4 +52,6 @@ public final class CommandConstants {
     public static final Integer PageSize = 5;
     public static final Integer PageSizeSmallItems = 10;
     public static final Integer SearchResultsSize = 25;
+
+    public static final String DiscordLineSpacing = "\u200B ";
 }
diff --git a/backend/src/main/java/dev/jb/befit/backend/discord/commands/CommandHandlerHelper.java b/backend/src/main/java/dev/jb/befit/backend/discord/commands/CommandHandlerHelper.java
@@ -1,6 +1,7 @@
 package dev.jb.befit.backend.discord.commands;
 
 import dev.jb.befit.backend.data.models.DiscordUser;
+import dev.jb.befit.backend.data.models.ExerciseLog;
 import dev.jb.befit.backend.data.models.User;
 import dev.jb.befit.backend.data.models.WebUser;
 import dev.jb.befit.backend.discord.commands.exceptions.OptionNotFoundException;
@@ -165,11 +166,7 @@ public static String getLeaderboardValue(Integer position) {
     }
 
     public static String getRatingString(Integer rating) {
-        var string = new StringBuilder();
-        for (int i = 0; i < rating; i++) {
-            string.append(":star2:");
-        }
-        return string.toString();
+        return ":star2:".repeat(rating+1);
     }
 
     public static String getUserStringValue(User user) {
@@ -240,4 +237,38 @@ public static <T> PageImpl<T> getPageForList(int pageNum, int pageSize, List<T>
         var pageContent = list.subList(start, end);
         return new PageImpl<>(pageContent, pageRequest, list.size());
     }
+
+    public static String addCongratulationsString(ExerciseLog log, Integer spacing, Boolean includeTitle) {
+        var itemSpacing = CommandConstants.DiscordLineSpacing.repeat(spacing);
+        var congratulations = new StringBuilder();
+        // Add new exercise started congratulations
+        if (log.isFirstLogOfExercise()) {
+            congratulations.append(itemSpacing).append(":sparkles: New exercise started!\n");
+        }
+        // Add new pr reached congratulations
+        if (log.isPrImproved()) {
+            congratulations.append(itemSpacing).append(":rocket: New PR reached!\n");
+        }
+        // Add on pr congratulations
+        if (log.isOnPr()) {
+            congratulations.append(itemSpacing).append(":fire: You are on your Pr!\n");
+        }
+        // Add goal reached congratulations
+        if (log.isGoalReached()) {
+            congratulations.append(itemSpacing).append(":chart_with_upwards_trend: Goal completed!\n");
+        }
+        // Add new level reached congratulations
+        if (log.isLevelCompleted()) {
+            congratulations.append(itemSpacing).append(":star2: Level completed!\n");
+        }
+        if (!congratulations.isEmpty()) {
+            var returnStringBuilder = new StringBuilder();
+            if (includeTitle) {
+                returnStringBuilder.append("Congratulations:\n");
+            }
+            returnStringBuilder.append(congratulations);
+            return returnStringBuilder.toString();
+        }
+        return "";
+    }
 }
diff --git a/backend/src/main/java/dev/jb/befit/backend/discord/commands/handlers/history/HistoryCommandHandler.java b/backend/src/main/java/dev/jb/befit/backend/discord/commands/handlers/history/HistoryCommandHandler.java
@@ -67,7 +67,7 @@ public InteractionReplyEditSpec getReplyEditSpec(Snowflake userId, int page, Str
                             var description = new StringBuilder();
                             addGeneralLogString(description, log);
                             addAchievementsString(description, log.getAchievements().stream().map(UserAchievement::getAchievement).toList());
-                            addCongratulationsString(description, log);
+                            description.append(CommandHandlerHelper.addCongratulationsString(log, 2, true));
                             description.append("\n");
                             return EmbedCreateFields.Field.of(
                                     String.format("#%d %s", exercise.getId(), exercise.getName()),
@@ -97,25 +97,4 @@ private static void addAchievementsString(StringBuilder stringBuilder, List<Achi
             stringBuilder.append(itemSpacing).append(String.format("<:%s:%s> %s \n", achievement.getDisplayName(), EmojiRegistrarService.getEmojiId(achievement, false).asString(), achievement.getTitle()));
         }
     }
-
-    private static void addCongratulationsString(StringBuilder stringBuilder, ExerciseLog log) {
-        var congratulations = new StringBuilder();
-        // Add new exercise started congratulations
-        if (log.isFirstLogOfExercise()) {
-            congratulations.append(itemSpacing).append(":sparkles: New exercise started!\n");
-        }
-        // Add new pr reached congratulations
-        if (log.isPrImproved()) {
-            congratulations.append(itemSpacing).append(":rocket: New PR reached!\n");
-        }
-        // Add goal reached congratulations
-        if (log.isGoalReached()) {
-            congratulations.append(itemSpacing).append(":chart_with_upwards_trend: Goal completed!\n");
-        }
-        // Add new level reached congratulations
-        if (log.isLevelCompleted()) {
-            congratulations.append(itemSpacing).append(":star2: Level completed!\n");
-        }
-        if (!congratulations.isEmpty()) stringBuilder.append("Congratulations:\n").append(congratulations);
-    }
 }
diff --git a/backend/src/main/java/dev/jb/befit/backend/discord/commands/handlers/log/LogCommandHandler.java b/backend/src/main/java/dev/jb/befit/backend/discord/commands/handlers/log/LogCommandHandler.java
@@ -100,26 +100,8 @@ public Mono<Void> execute(ChatInputInteractionEvent event) {
         }
 
         // Add user congratulations
-        {
-            var descriptionBuilder = new StringBuilder();
-            // Add new exercise started congratulations
-            if (exerciseLog.isFirstLogOfExercise()) {
-                descriptionBuilder.append(":sparkles: New exercise started!\n");
-            }
-            // Add new pr reached congratulations
-            if (exerciseLog.isPrImproved()) {
-                descriptionBuilder.append(":rocket: New PR reached!\n");
-            }
-            // Add goal reached congratulations
-            if (exerciseLog.isGoalReached()) {
-                descriptionBuilder.append(":chart_with_upwards_trend: Goal completed!\n");
-            }
-            // Add new level reached congratulations
-            if (exerciseLog.isLevelCompleted()) {
-                descriptionBuilder.append(":star2: Level completed!\n");
-            }
-            if (!descriptionBuilder.isEmpty()) embed.addField("Congratulations", descriptionBuilder.toString(), false);
-        }
+        var congratulations = CommandHandlerHelper.addCongratulationsString(exerciseLog, 0, false);
+        if (!congratulations.isEmpty()) embed.addField("Congratulations", congratulations, false);
 
         // Add user achievements
         if (!exerciseLog.getAchievements().isEmpty()) {
diff --git a/backend/src/main/java/dev/jb/befit/backend/discord/commands/handlers/sessions/SessionViewOneCommandHandler.java b/backend/src/main/java/dev/jb/befit/backend/discord/commands/handlers/sessions/SessionViewOneCommandHandler.java
@@ -58,7 +58,7 @@ public static InteractionReplyEditSpec getReplyEditSpec(ExerciseSession session,
             logsPage.stream().sorted(Comparator.comparing(ExerciseLog::getCreated)).forEach(log -> {
                 addGeneralLogString(logsDescriptionBuilder, log);
                 addAchievementsString(logsDescriptionBuilder, log.getAchievements().stream().map(UserAchievement::getAchievement).toList());
-                addCongratulationsString(logsDescriptionBuilder, log);
+                logsDescriptionBuilder.append(CommandHandlerHelper.addCongratulationsString(log, 2, false));
                 logsDescriptionBuilder.append("\n");
             });
         }
@@ -107,25 +107,4 @@ private static void addAchievementsString(StringBuilder stringBuilder, List<Achi
             stringBuilder.append(itemSpacing).append(String.format("<:%s:%s> %s \n", achievement.getDisplayName(), EmojiRegistrarService.getEmojiId(achievement, false).asString(), achievement.getTitle()));
         }
     }
-
-    private static void addCongratulationsString(StringBuilder stringBuilder, ExerciseLog log) {
-        var congratulations = new StringBuilder();
-        // Add exercise started congratulations
-        if (log.isFirstLogOfExercise()) {
-            congratulations.append(itemSpacing).append(":sparkles: New exercise started!\n");
-        }
-        // Add new pr reached congratulations
-        if (log.isPrImproved()) {
-            congratulations.append(itemSpacing).append(":rocket: New PR reached!\n");
-        }
-        // Add goal reached congratulations
-        if (log.isGoalReached()) {
-            congratulations.append(itemSpacing).append(":chart_with_upwards_trend: Goal completed!\n");
-        }
-        // Add new level reached congratulations
-        if (log.isLevelCompleted()) {
-            congratulations.append(itemSpacing).append(":star2: Level completed!\n");
-        }
-        if (!congratulations.isEmpty()) stringBuilder.append("Congratulations:\n").append(congratulations);
-    }
 }
diff --git a/backend/src/main/java/dev/jb/befit/backend/service/ExerciseLogService.java b/backend/src/main/java/dev/jb/befit/backend/service/ExerciseLogService.java
@@ -131,6 +131,9 @@ public LogCreationStatus create(User user, String exerciseName, Double amount) {
         } else if (ExerciseRecordService.isRecordImproved(exerciseRecord, exerciseLog)) {
             exerciseLog.setPrImproved(true);
             earnedXp += ServiceConstants.EarnedXpRecordImproved;
+        } else if (ServiceHelper.compareDoublesWithTolerance(exerciseLog.getAmount(), exerciseRecord.getAmount())) {
+            exerciseLog.setOnPr(true);
+            earnedXp += ServiceConstants.EarnedXpRecordReached;
         }
 
         // Finish goal if it exists and is reached
diff --git a/backend/src/main/java/dev/jb/befit/backend/service/ExerciseRecordService.java b/backend/src/main/java/dev/jb/befit/backend/service/ExerciseRecordService.java
@@ -84,6 +84,7 @@ public static Double getCurrentPr(List<ExerciseLog> allExerciseLogs) {
 
     public static boolean isRecordImproved(ExerciseRecord exerciseRecord, ExerciseLog exerciseLog) {
         if (!exerciseRecord.getExerciseType().equals(exerciseLog.getExerciseType())) throw new ExerciseMismatchException();
+        if (ServiceHelper.compareDoublesWithTolerance(exerciseLog.getAmount(), exerciseRecord.getAmount())) return false;
 
         if (exerciseRecord.getExerciseType().getGoalDirection().equals(GoalDirection.INCREASING)) {
             return exerciseLog.getAmount() > exerciseRecord.getAmount();
diff --git a/backend/src/main/java/dev/jb/befit/backend/service/ServiceConstants.java b/backend/src/main/java/dev/jb/befit/backend/service/ServiceConstants.java
@@ -14,6 +14,7 @@ public final class ServiceConstants {
     public static final long EarnedXpLogAddedToSession = 5;
     public static final long EarnedXpNewExerciseStarted = 20;
     public static final long EarnedXpRecordImproved = 50;
+    public static final long EarnedXpRecordReached = 10;
     public static final long EarnedXpGoalCreated = 10;
     public static final long EarnedXpGoalCompleted = 50;
     public static final long EarnedXpAchievementCompletedEasy = 50;
diff --git a/backend/src/main/java/dev/jb/befit/backend/service/ServiceHelper.java b/backend/src/main/java/dev/jb/befit/backend/service/ServiceHelper.java
@@ -37,4 +37,9 @@ public static Long getIdFromExerciseString(String exerciseString) {
         }
         return 0L;
     }
+
+    public static Boolean compareDoublesWithTolerance(Double a, Double b) {
+        if (a == null || b == null) return false;
+        return Math.abs(a - b) < 0.001;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -52,4 +52,6 @@ public final class CommandConstants {`
`52`	`52`	`public static final Integer PageSize = 5;`
`53`	`53`	`public static final Integer PageSizeSmallItems = 10;`
`54`	`54`	`public static final Integer SearchResultsSize = 25;`
	`55`	`+`
	`56`	`+ public static final String DiscordLineSpacing = "\u200B ";`
`55`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,9 @@ public LogCreationStatus create(User user, String exerciseName, Double amount) {`
`131`	`131`	`} else if (ExerciseRecordService.isRecordImproved(exerciseRecord, exerciseLog)) {`
`132`	`132`	`exerciseLog.setPrImproved(true);`
`133`	`133`	`earnedXp += ServiceConstants.EarnedXpRecordImproved;`
	`134`	`+ } else if (ServiceHelper.compareDoublesWithTolerance(exerciseLog.getAmount(), exerciseRecord.getAmount())) {`
	`135`	`+ exerciseLog.setOnPr(true);`
	`136`	`+ earnedXp += ServiceConstants.EarnedXpRecordReached;`
`134`	`137`	`}`
`135`	`138`
`136`	`139`	`// Finish goal if it exists and is reached`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,9 @@ public static Long getIdFromExerciseString(String exerciseString) {`
`37`	`37`	`}`
`38`	`38`	`return 0L;`
`39`	`39`	`}`
	`40`	`+`
	`41`	`+ public static Boolean compareDoublesWithTolerance(Double a, Double b) {`
	`42`	`+ if (a == null \|\| b == null) return false;`
	`43`	`+ return Math.abs(a - b) < 0.001;`
	`44`	`+ }`
`40`	`45`	`}`