McPringle/fitpub
1
0
Fork 0
Code Issues 24 Pull requests 6 Projects Releases Packages Wiki Activity Actions

revert: remove unrelated change from feature branch

Browse source 
This reverts a change that does not belong to this feature branch.
The change will be moved to a separate branch and submitted as its
own pull request.

Signed-off-by: Marcus Fihlon <marcus@fihlon.swiss>
This commit is contained in:
Marcus Fihlon 2026-04-28 15:52:26 +02:00
parent 5945a2b139
commit b5e88a317f
Signed by: McPringle
GPG key ID: C6B7F469EE363E1F
1 changed files with 28 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/main/java/net/javahippie/fitpub/service/ActivitySummaryService.java
View file

@ -8,7 +8,6 @@ import net.javahippie.fitpub.repository.ActivityRepository;
import net.javahippie.fitpub.repository.ActivitySummaryRepository; import net.javahippie.fitpub.repository.ActivitySummaryRepository;
import net.javahippie.fitpub.repository.AchievementRepository; import net.javahippie.fitpub.repository.AchievementRepository;
import net.javahippie.fitpub.repository.PersonalRecordRepository; import net.javahippie.fitpub.repository.PersonalRecordRepository;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -68,7 +67,17 @@ public class ActivitySummaryService {
LocalDate weekStart = date.with(TemporalAdjusters.previousOrSame(java.time.DayOfWeek.MONDAY)); LocalDate weekStart = date.with(TemporalAdjusters.previousOrSame(java.time.DayOfWeek.MONDAY));
LocalDate weekEnd = weekStart.plusDays(6); LocalDate weekEnd = weekStart.plusDays(6);
saveSummaryWithRetry(userId, ActivitySummary.PeriodType.WEEK, weekStart, weekEnd); ActivitySummary summary = activitySummaryRepository
.findByUserIdAndPeriodTypeAndPeriodStart(userId, ActivitySummary.PeriodType.WEEK, weekStart)
.orElse(ActivitySummary.builder()
.userId(userId)
.periodType(ActivitySummary.PeriodType.WEEK)
.periodStart(weekStart)
.periodEnd(weekEnd)
.build());
calculateAndUpdateSummary(summary, userId, weekStart.atStartOfDay(), weekEnd.plusDays(1).atStartOfDay());
activitySummaryRepository.save(summary);
} }
/** /**
@ -79,7 +88,17 @@ public class ActivitySummaryService {
LocalDate monthStart = date.with(TemporalAdjusters.firstDayOfMonth()); LocalDate monthStart = date.with(TemporalAdjusters.firstDayOfMonth());
LocalDate monthEnd = date.with(TemporalAdjusters.lastDayOfMonth()); LocalDate monthEnd = date.with(TemporalAdjusters.lastDayOfMonth());
saveSummaryWithRetry(userId, ActivitySummary.PeriodType.MONTH, monthStart, monthEnd); ActivitySummary summary = activitySummaryRepository
.findByUserIdAndPeriodTypeAndPeriodStart(userId, ActivitySummary.PeriodType.MONTH, monthStart)
.orElse(ActivitySummary.builder()
.userId(userId)
.periodType(ActivitySummary.PeriodType.MONTH)
.periodStart(monthStart)
.periodEnd(monthEnd)
.build());
calculateAndUpdateSummary(summary, userId, monthStart.atStartOfDay(), monthEnd.plusDays(1).atStartOfDay());
activitySummaryRepository.save(summary);
} }
/** /**
@ -90,46 +109,17 @@ public class ActivitySummaryService {
LocalDate yearStart = date.with(TemporalAdjusters.firstDayOfYear()); LocalDate yearStart = date.with(TemporalAdjusters.firstDayOfYear());
LocalDate yearEnd = date.with(TemporalAdjusters.lastDayOfYear()); LocalDate yearEnd = date.with(TemporalAdjusters.lastDayOfYear());
saveSummaryWithRetry(userId, ActivitySummary.PeriodType.YEAR, yearStart, yearEnd);
}
private void saveSummaryWithRetry(
UUID userId,
ActivitySummary.PeriodType periodType,
LocalDate periodStart,
LocalDate periodEnd
) {
ActivitySummary summary = activitySummaryRepository ActivitySummary summary = activitySummaryRepository
.findByUserIdAndPeriodTypeAndPeriodStart(userId, periodType, periodStart) .findByUserIdAndPeriodTypeAndPeriodStart(userId, ActivitySummary.PeriodType.YEAR, yearStart)
.orElse(ActivitySummary.builder() .orElse(ActivitySummary.builder()
.userId(userId) .userId(userId)
.periodType(periodType) .periodType(ActivitySummary.PeriodType.YEAR)
.periodStart(periodStart) .periodStart(yearStart)
.periodEnd(periodEnd) .periodEnd(yearEnd)
.build()); .build());
LocalDateTime startDateTime = periodStart.atStartOfDay(); calculateAndUpdateSummary(summary, userId, yearStart.atStartOfDay(), yearEnd.plusDays(1).atStartOfDay());
LocalDateTime endDateTime = periodEnd.plusDays(1).atStartOfDay(); activitySummaryRepository.save(summary);
calculateAndUpdateSummary(summary, userId, startDateTime, endDateTime);
try {
activitySummaryRepository.save(summary);
} catch (DataIntegrityViolationException e) {
log.debug(
"Summary already created concurrently for user {}, period {} starting {}. Retrying as update.",
userId,
periodType,
periodStart
);
ActivitySummary existingSummary = activitySummaryRepository
.findByUserIdAndPeriodTypeAndPeriodStart(userId, periodType, periodStart)
.orElseThrow(() -> e);
calculateAndUpdateSummary(existingSummary, userId, startDateTime, endDateTime);
activitySummaryRepository.save(existingSummary);
}
} }
/** /**