From cb14e95c2c2054f8ec86271f6331ff5418136a44 Mon Sep 17 00:00:00 2001
From: Aaron Schmid <56757286+Aaron2000119@users.noreply.github.com>
Date: Thu, 9 Oct 2025 19:55:40 +0200
Subject: [PATCH 1/2] set complition time for achievements

---
 .../userGoalProgress/UserGoalProgressEntity.java           | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/de/unistuttgart/iste/meitrex/gamification_service/persistence/entity/achievements/userGoalProgress/UserGoalProgressEntity.java b/src/main/java/de/unistuttgart/iste/meitrex/gamification_service/persistence/entity/achievements/userGoalProgress/UserGoalProgressEntity.java
index fd85cc9a..5d7f3dbb 100644
--- a/src/main/java/de/unistuttgart/iste/meitrex/gamification_service/persistence/entity/achievements/userGoalProgress/UserGoalProgressEntity.java
+++ b/src/main/java/de/unistuttgart/iste/meitrex/gamification_service/persistence/entity/achievements/userGoalProgress/UserGoalProgressEntity.java
@@ -47,6 +47,13 @@ public UserGoalProgressEntity(UserEntity user, GoalEntity goal) {
         startedAt = OffsetDateTime.now();
     }
 
+    public void setCompleted(boolean completed) {
+        this.completed = completed;
+        if (completed) {
+            endedAt = OffsetDateTime.now();
+        }
+    }
+
     public boolean updateProgress(GoalProgressEvent progressEvent) {
         return goal.updateProgress(progressEvent, this);
     }

From 2351f7780d59202889ef62286763359b37440290 Mon Sep 17 00:00:00 2001
From: Aaron Schmid <56757286+Aaron2000119@users.noreply.github.com>
Date: Fri, 10 Oct 2025 10:23:52 +0200
Subject: [PATCH 2/2] make the completion date more failsave

---
 .../achievements/userGoalProgress/UserGoalProgressEntity.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/unistuttgart/iste/meitrex/gamification_service/persistence/entity/achievements/userGoalProgress/UserGoalProgressEntity.java b/src/main/java/de/unistuttgart/iste/meitrex/gamification_service/persistence/entity/achievements/userGoalProgress/UserGoalProgressEntity.java
index 5d7f3dbb..dac1518e 100644
--- a/src/main/java/de/unistuttgart/iste/meitrex/gamification_service/persistence/entity/achievements/userGoalProgress/UserGoalProgressEntity.java
+++ b/src/main/java/de/unistuttgart/iste/meitrex/gamification_service/persistence/entity/achievements/userGoalProgress/UserGoalProgressEntity.java
@@ -48,8 +48,9 @@ public UserGoalProgressEntity(UserEntity user, GoalEntity goal) {
     }
 
     public void setCompleted(boolean completed) {
+        boolean oldCompleted = this.completed;
         this.completed = completed;
-        if (completed) {
+        if (completed && !oldCompleted) {
             endedAt = OffsetDateTime.now();
         }
     }