Assecutor/muh
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Start sample numbering at 10000 for each veterinarian

Browse Source 
- Add findTopByOwnerAccountIdOrderBySampleNumberDesc to SampleRepository
- Modify nextSampleNumber to accept ownerAccountId parameter
- Calculate next sample number per user based on ownerAccountId
- Update dashboardOverview and createSample to use user-specific numbering
This commit is contained in:
Sven Carstensen
2026-03-17 09:04:41 +01:00
parent 93f52f1ae1
commit dbc8c2a2a2
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/de/svencarstensen/muh/repository/SampleRepository.java
View File

@@ -12,6 +12,8 @@ public interface SampleRepository extends MongoRepository<Sample, String> {
Optional<Sample> findTopByOrderBySampleNumberDesc(); Optional<Sample> findTopByOrderBySampleNumberDesc();
Optional<Sample> findTopByOwnerAccountIdOrderBySampleNumberDesc(String ownerAccountId);
List<Sample> findTop12ByOrderByUpdatedAtDesc(); List<Sample> findTop12ByOrderByUpdatedAtDesc();
List<Sample> findByFarmerBusinessKeyOrderByCreatedAtDesc(String farmerBusinessKey); List<Sample> findByFarmerBusinessKeyOrderByCreatedAtDesc(String farmerBusinessKey);

19
backend/src/main/java/de/svencarstensen/muh/service/SampleService.java
View File

@@ -28,6 +28,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Service
@@ -67,7 +68,8 @@ public class SampleService {
.filter(sample -> !sample.completedAt().isBefore(today.atStartOfDay())) .filter(sample -> !sample.completedAt().isBefore(today.atStartOfDay()))
.filter(sample -> sample.completedAt().isBefore(today.plusDays(1).atStartOfDay())) .filter(sample -> sample.completedAt().isBefore(today.plusDays(1).atStartOfDay()))
.count(); .count();
return new DashboardOverview(nextSampleNumber(), openCount, completedToday, recent); String ownerAccountId = authorizationService.accountId(actor);
return new DashboardOverview(nextSampleNumber(ownerAccountId), openCount, completedToday, recent);
} }
public LookupResult lookup(String actorId, long sampleNumber) { public LookupResult lookup(String actorId, long sampleNumber) {
@@ -104,9 +106,10 @@ public class SampleService {
.findFirst() .findFirst()
.orElseThrow(() -> new ResponseStatusException(HttpStatus.BAD_REQUEST, "Landwirt nicht gefunden")); .orElseThrow(() -> new ResponseStatusException(HttpStatus.BAD_REQUEST, "Landwirt nicht gefunden"));
String ownerAccountId = authorizationService.accountId(actor);
Sample sample = new Sample( Sample sample = new Sample(
null, null,
nextSampleNumber(), nextSampleNumber(ownerAccountId),
farmer.businessKey(), farmer.businessKey(),
farmer.name(), farmer.name(),
farmer.email(), farmer.email(),
@@ -513,9 +516,19 @@ public class SampleService {
} }
public long nextSampleNumber() { public long nextSampleNumber() {
return nextSampleNumber(null);
}
public long nextSampleNumber(String ownerAccountId) {
if (ownerAccountId != null) {
Optional<Sample> lastSample = sampleRepository.findTopByOwnerAccountIdOrderBySampleNumberDesc(ownerAccountId);
if (lastSample.isPresent()) {
return lastSample.get().sampleNumber() + 1;
}
}
return sampleRepository.findTopByOrderBySampleNumberDesc() return sampleRepository.findTopByOrderBySampleNumberDesc()
.map(sample -> sample.sampleNumber() + 1) .map(sample -> sample.sampleNumber() + 1)
.orElse(100001L); .orElse(10000L);
} }
public Sample loadSampleEntity(String actorId, String id) { public Sample loadSampleEntity(String actorId, String id) {