From ed9e824179e922044704e275187b8360e892f919 Mon Sep 17 00:00:00 2001
From: Michael Hoennig <michael@hoennig.de>
Date: Wed, 4 Dec 2024 13:14:42 +0100
Subject: [PATCH] add ArchTest for @Timed on repos and controllers and add
 timed to every place it belongs

---
 .../debitor/HsBookingDebitorRepository.java        |  4 ++--
 .../bankaccount/HsOfficeBankAccountController.java |  8 ++++----
 .../bankaccount/HsOfficeBankAccountRepository.java | 12 ++++++------
 .../office/contact/HsOfficeContactController.java  | 10 +++++-----
 .../contact/HsOfficeContactRbacRepository.java     | 10 +++++-----
 .../contact/HsOfficeContactRealRepository.java     | 10 +++++-----
 .../HsOfficeCoopAssetsTransactionController.java   |  6 +++---
 .../HsOfficeCoopAssetsTransactionRepository.java   |  8 ++++----
 .../HsOfficeCoopSharesTransactionController.java   |  6 +++---
 .../HsOfficeCoopSharesTransactionRepository.java   |  8 ++++----
 .../office/debitor/HsOfficeDebitorController.java  | 10 +++++-----
 .../office/debitor/HsOfficeDebitorRepository.java  | 12 ++++++------
 .../office/partner/HsOfficePartnerController.java  | 10 +++++-----
 .../office/partner/HsOfficePartnerRepository.java  | 14 +++++++-------
 .../hs/office/person/HsOfficePersonController.java | 10 +++++-----
 .../hs/office/person/HsOfficePersonRepository.java | 10 +++++-----
 .../relation/HsOfficeRelationController.java       |  8 ++++----
 .../relation/HsOfficeRelationRbacRepository.java   | 12 ++++++------
 .../sepamandate/HsOfficeSepaMandateController.java | 10 +++++-----
 .../sepamandate/HsOfficeSepaMandateRepository.java | 10 +++++-----
 20 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/src/main/java/net/hostsharing/hsadminng/hs/booking/debitor/HsBookingDebitorRepository.java b/src/main/java/net/hostsharing/hsadminng/hs/booking/debitor/HsBookingDebitorRepository.java
index 4fef88e2..8d0bbe30 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/booking/debitor/HsBookingDebitorRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/booking/debitor/HsBookingDebitorRepository.java
@@ -9,9 +9,9 @@ import java.util.UUID;
 
 public interface HsBookingDebitorRepository extends Repository<HsBookingDebitorEntity, UUID> {
 
-    @Timed("app.bookingDebitor.repo.findByUuid")
+    @Timed("app.booking.debitor.repo.findByUuid")
     Optional<HsBookingDebitorEntity> findByUuid(UUID id);
 
-    @Timed("app.bookingDebitor.repo.findByDebitorNumber")
+    @Timed("app.booking.debitor.repo.findByDebitorNumber")
     List<HsBookingDebitorEntity> findByDebitorNumber(int debitorNumber);
 }
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountController.java
index 50087bf4..72c37023 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountController.java
@@ -32,7 +32,7 @@ public class HsOfficeBankAccountController implements HsOfficeBankAccountsApi {
 
     @Override
     @Transactional(readOnly = true)
-    @Timed("app.bankAccounts.api.patchDebitor")
+    @Timed("app.office.bankAccounts.api.patchDebitor")
     public ResponseEntity<List<HsOfficeBankAccountResource>> getListOfBankAccounts(
             final String currentSubject,
             final String assumedRoles,
@@ -47,7 +47,7 @@ public class HsOfficeBankAccountController implements HsOfficeBankAccountsApi {
 
     @Override
     @Transactional
-    @Timed("app.bankAccounts.api.postNewBankAccount")
+    @Timed("app.office.bankAccounts.api.postNewBankAccount")
     public ResponseEntity<HsOfficeBankAccountResource> postNewBankAccount(
             final String currentSubject,
             final String assumedRoles,
@@ -74,7 +74,7 @@ public class HsOfficeBankAccountController implements HsOfficeBankAccountsApi {
 
     @Override
     @Transactional(readOnly = true)
-    @Timed("app.bankAccounts.api.getSingleBankAccountByUuid")
+    @Timed("app.office.bankAccounts.api.getSingleBankAccountByUuid")
     public ResponseEntity<HsOfficeBankAccountResource> getSingleBankAccountByUuid(
             final String currentSubject,
             final String assumedRoles,
@@ -91,7 +91,7 @@ public class HsOfficeBankAccountController implements HsOfficeBankAccountsApi {
 
     @Override
     @Transactional
-    @Timed("app.bankAccounts.api.deleteBankAccountByUuid")
+    @Timed("app.office.bankAccounts.api.deleteBankAccountByUuid")
     public ResponseEntity<Void> deleteBankAccountByUuid(
             final String currentSubject,
             final String assumedRoles,
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountRepository.java b/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountRepository.java
index 862a6e7d..3e8cc20f 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountRepository.java
@@ -10,7 +10,7 @@ import java.util.UUID;
 
 public interface HsOfficeBankAccountRepository extends Repository<HsOfficeBankAccountEntity, UUID> {
 
-    @Timed("app.bankAccounts.repo.findByUuid")
+    @Timed("app.office.bankAccounts.repo.findByUuid")
     Optional<HsOfficeBankAccountEntity> findByUuid(UUID id);
 
     @Query("""
@@ -18,7 +18,7 @@ public interface HsOfficeBankAccountRepository extends Repository<HsOfficeBankAc
                 WHERE lower(c.holder) like lower(concat(:holder, '%'))
                 ORDER BY c.holder
             """)
-    @Timed("app.bankAccounts.repo.findByOptionalHolderLikeImpl")
+    @Timed("app.office.bankAccounts.repo.findByOptionalHolderLikeImpl")
     List<HsOfficeBankAccountEntity> findByOptionalHolderLikeImpl(String holder);
 
     default List<HsOfficeBankAccountEntity> findByOptionalHolderLike(String holder) {
@@ -26,15 +26,15 @@ public interface HsOfficeBankAccountRepository extends Repository<HsOfficeBankAc
     }
 
 
-    @Timed("app.bankAccounts.repo.findByIbanOrderByIbanAsc")
+    @Timed("app.office.bankAccounts.repo.findByIbanOrderByIbanAsc")
     List<HsOfficeBankAccountEntity> findByIbanOrderByIbanAsc(String iban);
 
-    @Timed("app.bankAccounts.repo.save")
+    @Timed("app.office.bankAccounts.repo.save")
     <S extends HsOfficeBankAccountEntity> S save(S entity);
 
-    @Timed("app.bankAccounts.repo.deleteByUuid")
+    @Timed("app.office.bankAccounts.repo.deleteByUuid")
     int deleteByUuid(final UUID uuid);
 
-    @Timed("app.bankAccounts.repo.count")
+    @Timed("app.office.bankAccounts.repo.count")
     long count();
 }
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactController.java
index 5c6a8a3a..fe08bd4f 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactController.java
@@ -34,7 +34,7 @@ public class HsOfficeContactController implements HsOfficeContactsApi {
 
     @Override
     @Transactional(readOnly = true)
-    @Timed("app.contacts.api.getListOfContacts")
+    @Timed("app.office.contacts.api.getListOfContacts")
     public ResponseEntity<List<HsOfficeContactResource>> getListOfContacts(
             final String currentSubject,
             final String assumedRoles,
@@ -49,7 +49,7 @@ public class HsOfficeContactController implements HsOfficeContactsApi {
 
     @Override
     @Transactional
-    @Timed("app.contacts.api.postNewContact")
+    @Timed("app.office.contacts.api.postNewContact")
     public ResponseEntity<HsOfficeContactResource> postNewContact(
             final String currentSubject,
             final String assumedRoles,
@@ -72,7 +72,7 @@ public class HsOfficeContactController implements HsOfficeContactsApi {
 
     @Override
     @Transactional(readOnly = true)
-    @Timed("app.contacts.api.getSingleContactByUuid")
+    @Timed("app.office.contacts.api.getSingleContactByUuid")
     public ResponseEntity<HsOfficeContactResource> getSingleContactByUuid(
             final String currentSubject,
             final String assumedRoles,
@@ -89,7 +89,7 @@ public class HsOfficeContactController implements HsOfficeContactsApi {
 
     @Override
     @Transactional
-    @Timed("app.contacts.api.deleteContactByUuid")
+    @Timed("app.office.contacts.api.deleteContactByUuid")
     public ResponseEntity<Void> deleteContactByUuid(
             final String currentSubject,
             final String assumedRoles,
@@ -106,7 +106,7 @@ public class HsOfficeContactController implements HsOfficeContactsApi {
 
     @Override
     @Transactional
-    @Timed("app.contacts.api.patchContact")
+    @Timed("app.office.contacts.api.patchContact")
     public ResponseEntity<HsOfficeContactResource> patchContact(
             final String currentSubject,
             final String assumedRoles,
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRbacRepository.java b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRbacRepository.java
index 58f9ba61..f3a88bc0 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRbacRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRbacRepository.java
@@ -10,7 +10,7 @@ import java.util.UUID;
 
 public interface HsOfficeContactRbacRepository extends Repository<HsOfficeContactRbacEntity, UUID> {
 
-    @Timed("app.contacts.repo.findByUuid.rbac")
+    @Timed("app.office.contacts.repo.findByUuid.rbac")
     Optional<HsOfficeContactRbacEntity> findByUuid(UUID id);
 
     @Query("""
@@ -18,15 +18,15 @@ public interface HsOfficeContactRbacRepository extends Repository<HsOfficeContac
                 WHERE :caption is null
                     OR c.caption like concat(cast(:caption as text), '%')
             """)
-    @Timed("app.contacts.repo.findContactByOptionalCaptionLike.rbac")
+    @Timed("app.office.contacts.repo.findContactByOptionalCaptionLike.rbac")
     List<HsOfficeContactRbacEntity> findContactByOptionalCaptionLike(String caption);
 
-    @Timed("app.contacts.repo.save.rbac")
+    @Timed("app.office.contacts.repo.save.rbac")
     HsOfficeContactRbacEntity save(final HsOfficeContactRbacEntity entity);
 
-    @Timed("app.contacts.repo.deleteByUuid.rbac")
+    @Timed("app.office.contacts.repo.deleteByUuid.rbac")
     int deleteByUuid(final UUID uuid);
 
-    @Timed("app.contacts.repo.count.rbac")
+    @Timed("app.office.contacts.repo.count.rbac")
     long count();
 }
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRealRepository.java b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRealRepository.java
index a42c2226..3a65aea6 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRealRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRealRepository.java
@@ -10,7 +10,7 @@ import java.util.UUID;
 
 public interface HsOfficeContactRealRepository extends Repository<HsOfficeContactRealEntity, UUID> {
 
-    @Timed("app.repo.contacts.findByUuid.real")
+    @Timed("app.office.contacts.repo.findByUuid.real")
     Optional<HsOfficeContactRealEntity> findByUuid(UUID id);
 
     @Query("""
@@ -18,15 +18,15 @@ public interface HsOfficeContactRealRepository extends Repository<HsOfficeContac
                 WHERE :caption is null
                     OR c.caption like concat(cast(:caption as text), '%')
             """)
-    @Timed("app.repo.contacts.findContactByOptionalCaptionLike.real")
+    @Timed("app.office.contacts.repo.findContactByOptionalCaptionLike.real")
     List<HsOfficeContactRealEntity> findContactByOptionalCaptionLike(String caption);
 
-    @Timed("app.repo.contacts.save.real")
+    @Timed("app.office.contacts.repo.save.real")
     HsOfficeContactRealEntity save(final HsOfficeContactRealEntity entity);
 
-    @Timed("app.repo.contacts.deleteByUuid.real")
+    @Timed("app.office.contacts.repo.deleteByUuid.real")
     int deleteByUuid(final UUID uuid);
 
-    @Timed("app.repo.contacts.count.real")
+    @Timed("app.office.contacts.repo.count.real")
     long count();
 }
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java
index b3b35ddb..fbb59788 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java
@@ -56,7 +56,7 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
 
     @Override
     @Transactional(readOnly = true)
-    @Timed("app.coopAssets.api.getListOfCoopAssets")
+    @Timed("app.office.coopAssets.api.getListOfCoopAssets")
     public ResponseEntity<List<HsOfficeCoopAssetsTransactionResource>> getListOfCoopAssets(
             final String currentSubject,
             final String assumedRoles,
@@ -79,7 +79,7 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
 
     @Override
     @Transactional
-    @Timed("app.coopAssets.api.postNewCoopAssetTransaction")
+    @Timed("app.office.coopAssets.api.postNewCoopAssetTransaction")
     public ResponseEntity<HsOfficeCoopAssetsTransactionResource> postNewCoopAssetTransaction(
             final String currentSubject,
             final String assumedRoles,
@@ -105,7 +105,7 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
 
     @Override
     @Transactional(readOnly = true)
-    @Timed("app.coopAssets.api.getSingleCoopAssetTransactionByUuid")
+    @Timed("app.office.coopAssets.api.getSingleCoopAssetTransactionByUuid")
     public ResponseEntity<HsOfficeCoopAssetsTransactionResource> getSingleCoopAssetTransactionByUuid(
             final String currentSubject, final String assumedRoles, final UUID assetTransactionUuid) {
 
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRepository.java b/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRepository.java
index 26c2d09b..7a8c7ad9 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRepository.java
@@ -11,7 +11,7 @@ import java.util.UUID;
 
 public interface HsOfficeCoopAssetsTransactionRepository extends Repository<HsOfficeCoopAssetsTransactionEntity, UUID> {
 
-    @Timed("app.coopAssets.repo.findByUuid")
+    @Timed("app.office.coopAssets.repo.findByUuid")
     Optional<HsOfficeCoopAssetsTransactionEntity> findByUuid(UUID id);
 
     @Query("""
@@ -21,13 +21,13 @@ public interface HsOfficeCoopAssetsTransactionRepository extends Repository<HsOf
                     AND ( CAST(:toValueDate AS java.time.LocalDate)IS NULL OR (at.valueDate <= :toValueDate))
                 ORDER BY at.membership.memberNumberSuffix, at.valueDate
             """)
-    @Timed("app.coopAssets.repo.findCoopAssetsTransactionByOptionalMembershipUuidAndDateRange")
+    @Timed("app.office.coopAssets.repo.findCoopAssetsTransactionByOptionalMembershipUuidAndDateRange")
     List<HsOfficeCoopAssetsTransactionEntity> findCoopAssetsTransactionByOptionalMembershipUuidAndDateRange(
             UUID membershipUuid, LocalDate fromValueDate, LocalDate toValueDate);
 
-    @Timed("app.coopAssets.repo.save")
+    @Timed("app.office.coopAssets.repo.save")
     HsOfficeCoopAssetsTransactionEntity save(final HsOfficeCoopAssetsTransactionEntity entity);
 
-    @Timed("app.coopAssets.repo.count")
+    @Timed("app.office.coopAssets.repo.count")
     long count();
 }
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionController.java
index 12540e66..b903dd85 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionController.java
@@ -41,7 +41,7 @@ public class HsOfficeCoopSharesTransactionController implements HsOfficeCoopShar
     @Override
     @Transactional(readOnly = true)
 
-    @Timed("app.coopShares.api.getListOfCoopShares")
+    @Timed("app.office.coopShares.api.getListOfCoopShares")
     public ResponseEntity<List<HsOfficeCoopSharesTransactionResource>> getListOfCoopShares(
             final String currentSubject,
             final String assumedRoles,
@@ -61,7 +61,7 @@ public class HsOfficeCoopSharesTransactionController implements HsOfficeCoopShar
 
     @Override
     @Transactional
-    @Timed("app.coopShares.repo.postNewCoopSharesTransaction")
+    @Timed("app.office.coopShares.repo.postNewCoopSharesTransaction")
     public ResponseEntity<HsOfficeCoopSharesTransactionResource> postNewCoopSharesTransaction(
             final String currentSubject,
             final String assumedRoles,
@@ -85,7 +85,7 @@ public class HsOfficeCoopSharesTransactionController implements HsOfficeCoopShar
 
     @Override
     @Transactional(readOnly = true)
-    @Timed("app.coopShares.repo.getSingleCoopShareTransactionByUuid")
+    @Timed("app.office.coopShares.repo.getSingleCoopShareTransactionByUuid")
     public ResponseEntity<HsOfficeCoopSharesTransactionResource> getSingleCoopShareTransactionByUuid(
         final String currentSubject, final String assumedRoles, final UUID shareTransactionUuid) {
 
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionRepository.java b/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionRepository.java
index d8322870..08429c97 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionRepository.java
@@ -11,7 +11,7 @@ import java.util.UUID;
 
 public interface HsOfficeCoopSharesTransactionRepository extends Repository<HsOfficeCoopSharesTransactionEntity, UUID> {
 
-    @Timed("app.coopShares.repo.findByUuid")
+    @Timed("app.office.coopShares.repo.findByUuid")
     Optional<HsOfficeCoopSharesTransactionEntity> findByUuid(UUID id);
 
     @Query("""
@@ -21,13 +21,13 @@ public interface HsOfficeCoopSharesTransactionRepository extends Repository<HsOf
                     AND ( CAST(:toValueDate AS java.time.LocalDate)IS NULL OR (st.valueDate <= :toValueDate))
                 ORDER BY st.membership.memberNumberSuffix, st.valueDate
             """)
-    @Timed("app.coopShares.repo.findCoopSharesTransactionByOptionalMembershipUuidAndDateRange")
+    @Timed("app.office.coopShares.repo.findCoopSharesTransactionByOptionalMembershipUuidAndDateRange")
     List<HsOfficeCoopSharesTransactionEntity> findCoopSharesTransactionByOptionalMembershipUuidAndDateRange(
             UUID membershipUuid, LocalDate fromValueDate, LocalDate toValueDate);
 
-    @Timed("app.coopShares.repo.save")
+    @Timed("app.office.coopShares.repo.save")
     HsOfficeCoopSharesTransactionEntity save(final HsOfficeCoopSharesTransactionEntity entity);
 
-    @Timed("app.coopShares.repo.count")
+    @Timed("app.office.coopShares.repo.count")
     long count();
 }
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorController.java
index 391f7a2d..1792acdb 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorController.java
@@ -52,7 +52,7 @@ public class HsOfficeDebitorController implements HsOfficeDebitorsApi {
 
     @Override
     @Transactional(readOnly = true)
-    @Timed("app.debitors.api.getListOfDebitors")
+    @Timed("app.office.debitors.api.getListOfDebitors")
     public ResponseEntity<List<HsOfficeDebitorResource>> getListOfDebitors(
             final String currentSubject,
             final String assumedRoles,
@@ -70,7 +70,7 @@ public class HsOfficeDebitorController implements HsOfficeDebitorsApi {
 
     @Override
     @Transactional
-    @Timed("app.debitors.api.postNewDebitor")
+    @Timed("app.office.debitors.api.postNewDebitor")
     public ResponseEntity<HsOfficeDebitorResource> postNewDebitor(
             String currentSubject,
             String assumedRoles,
@@ -118,7 +118,7 @@ public class HsOfficeDebitorController implements HsOfficeDebitorsApi {
 
     @Override
     @Transactional(readOnly = true)
-    @Timed("app.debitors.api.getSingleDebitorByUuid")
+    @Timed("app.office.debitors.api.getSingleDebitorByUuid")
     public ResponseEntity<HsOfficeDebitorResource> getSingleDebitorByUuid(
             final String currentSubject,
             final String assumedRoles,
@@ -135,7 +135,7 @@ public class HsOfficeDebitorController implements HsOfficeDebitorsApi {
 
     @Override
     @Transactional
-    @Timed("app.debitors.api.deleteDebitorByUuid")
+    @Timed("app.office.debitors.api.deleteDebitorByUuid")
     public ResponseEntity<Void> deleteDebitorByUuid(
             final String currentSubject,
             final String assumedRoles,
@@ -152,7 +152,7 @@ public class HsOfficeDebitorController implements HsOfficeDebitorsApi {
 
     @Override
     @Transactional
-    @Timed("app.debitors.api.patchDebitor")
+    @Timed("app.office.debitors.api.patchDebitor")
     public ResponseEntity<HsOfficeDebitorResource> patchDebitor(
             final String currentSubject,
             final String assumedRoles,
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepository.java b/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepository.java
index 817eb202..ab51663d 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepository.java
@@ -10,7 +10,7 @@ import java.util.UUID;
 
 public interface HsOfficeDebitorRepository extends Repository<HsOfficeDebitorEntity, UUID> {
 
-    @Timed("app.debitors.repo.findByUuid")
+    @Timed("app.office.debitors.repo.findByUuid")
     Optional<HsOfficeDebitorEntity> findByUuid(UUID id);
 
     @Query("""
@@ -21,7 +21,7 @@ public interface HsOfficeDebitorRepository extends Repository<HsOfficeDebitorEnt
                 WHERE partner.partnerNumber = :partnerNumber
                   AND debitor.debitorNumberSuffix = :debitorNumberSuffix
             """)
-    @Timed("app.debitors.repo.findDebitorByPartnerNumberAndDebitorNumberSuffix")
+    @Timed("app.office.debitors.repo.findDebitorByPartnerNumberAndDebitorNumberSuffix")
     List<HsOfficeDebitorEntity> findDebitorByPartnerNumberAndDebitorNumberSuffix(int partnerNumber, String debitorNumberSuffix);
 
     default List<HsOfficeDebitorEntity> findDebitorByDebitorNumber(int debitorNumber) {
@@ -49,15 +49,15 @@ public interface HsOfficeDebitorRepository extends Repository<HsOfficeDebitorEnt
                     OR person.givenName like concat(cast(:name as text), '%')
                     OR contact.caption like concat(cast(:name as text), '%')
                """)
-    @Timed("app.debitors.repo.findDebitorByOptionalNameLike")
+    @Timed("app.office.debitors.repo.findDebitorByOptionalNameLike")
     List<HsOfficeDebitorEntity> findDebitorByOptionalNameLike(String name);
 
-    @Timed("app.debitors.repo.save")
+    @Timed("app.office.debitors.repo.save")
     HsOfficeDebitorEntity save(final HsOfficeDebitorEntity entity);
 
-    @Timed("app.debitors.repo.count")
+    @Timed("app.office.debitors.repo.count")
     long count();
 
-    @Timed("app.debitors.repo.deleteByUuid")
+    @Timed("app.office.debitors.repo.deleteByUuid")
     int deleteByUuid(UUID uuid);
 }
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerController.java
index c2f66594..5e8bba57 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerController.java
@@ -51,7 +51,7 @@ public class HsOfficePartnerController implements HsOfficePartnersApi {
 
     @Override
     @Transactional(readOnly = true)
-    @Timed("app.partners.api.getListOfPartners")
+    @Timed("app.office.partners.api.getListOfPartners")
     public ResponseEntity<List<HsOfficePartnerResource>> getListOfPartners(
             final String currentSubject,
             final String assumedRoles,
@@ -66,7 +66,7 @@ public class HsOfficePartnerController implements HsOfficePartnersApi {
 
     @Override
     @Transactional
-    @Timed("app.partners.api.postNewPartner")
+    @Timed("app.office.partners.api.postNewPartner")
     public ResponseEntity<HsOfficePartnerResource> postNewPartner(
             final String currentSubject,
             final String assumedRoles,
@@ -89,7 +89,7 @@ public class HsOfficePartnerController implements HsOfficePartnersApi {
 
     @Override
     @Transactional(readOnly = true)
-    @Timed("app.partners.api.getSinglePartnerByUuid")
+    @Timed("app.office.partners.api.getSinglePartnerByUuid")
     public ResponseEntity<HsOfficePartnerResource> getSinglePartnerByUuid(
             final String currentSubject,
             final String assumedRoles,
@@ -106,7 +106,7 @@ public class HsOfficePartnerController implements HsOfficePartnersApi {
 
     @Override
     @Transactional
-    @Timed("app.partners.api.deletePartnerByUuid")
+    @Timed("app.office.partners.api.deletePartnerByUuid")
     public ResponseEntity<Void> deletePartnerByUuid(
             final String currentSubject,
             final String assumedRoles,
@@ -127,7 +127,7 @@ public class HsOfficePartnerController implements HsOfficePartnersApi {
 
     @Override
     @Transactional
-    @Timed("app.partners.api.patchPartner")
+    @Timed("app.office.partners.api.patchPartner")
     public ResponseEntity<HsOfficePartnerResource> patchPartner(
             final String currentSubject,
             final String assumedRoles,
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepository.java b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepository.java
index 24a52568..5a804d40 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepository.java
@@ -10,10 +10,10 @@ import java.util.UUID;
 
 public interface HsOfficePartnerRepository extends Repository<HsOfficePartnerEntity, UUID> {
 
-    @Timed("app.partners.repo.findByUuid")
+    @Timed("app.office.partners.repo.findByUuid")
     Optional<HsOfficePartnerEntity> findByUuid(UUID id);
 
-    @Timed("app.partners.repo.findAll")
+    @Timed("app.office.partners.repo.findAll")
     List<HsOfficePartnerEntity> findAll(); // TODO.refa: move to a repo in test sources
 
     @Query("""
@@ -28,18 +28,18 @@ public interface HsOfficePartnerRepository extends Repository<HsOfficePartnerEnt
                     OR person.givenName like concat(cast(:name as text), '%')
                     OR person.familyName like concat(cast(:name as text), '%')
                """)
-    @Timed("app.partners.repo.findPartnerByOptionalNameLike")
+    @Timed("app.office.partners.repo.findPartnerByOptionalNameLike")
     List<HsOfficePartnerEntity> findPartnerByOptionalNameLike(String name);
 
-    @Timed("app.partners.repo.findPartnerByPartnerNumber")
+    @Timed("app.office.partners.repo.findPartnerByPartnerNumber")
     HsOfficePartnerEntity findPartnerByPartnerNumber(Integer partnerNumber);
 
-    @Timed("app.partners.repo.save")
+    @Timed("app.office.partners.repo.save")
     HsOfficePartnerEntity save(final HsOfficePartnerEntity entity);
 
-    @Timed("app.partners.repo.count")
+    @Timed("app.office.partners.repo.count")
     long count();
 
-    @Timed("app.partners.repo.deleteByUuid")
+    @Timed("app.office.partners.repo.deleteByUuid")
     int deleteByUuid(UUID uuid);
 }
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonController.java
index d1c1c018..bf277a54 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonController.java
@@ -31,7 +31,7 @@ public class HsOfficePersonController implements HsOfficePersonsApi {
 
     @Override
     @Transactional(readOnly = true)
-    @Timed("app.persons.api.getListOfPersons")
+    @Timed("app.office.persons.api.getListOfPersons")
     public ResponseEntity<List<HsOfficePersonResource>> getListOfPersons(
             final String currentSubject,
             final String assumedRoles,
@@ -46,7 +46,7 @@ public class HsOfficePersonController implements HsOfficePersonsApi {
 
     @Override
     @Transactional
-    @Timed("app.persons.api.postNewPerson")
+    @Timed("app.office.persons.api.postNewPerson")
     public ResponseEntity<HsOfficePersonResource> postNewPerson(
             final String currentSubject,
             final String assumedRoles,
@@ -69,7 +69,7 @@ public class HsOfficePersonController implements HsOfficePersonsApi {
 
     @Override
     @Transactional(readOnly = true)
-    @Timed("app.persons.api.getSinglePersonByUuid")
+    @Timed("app.office.persons.api.getSinglePersonByUuid")
     public ResponseEntity<HsOfficePersonResource> getSinglePersonByUuid(
             final String currentSubject,
             final String assumedRoles,
@@ -86,7 +86,7 @@ public class HsOfficePersonController implements HsOfficePersonsApi {
 
     @Override
     @Transactional
-    @Timed("app.persons.api.deletePersonByUuid")
+    @Timed("app.office.persons.api.deletePersonByUuid")
     public ResponseEntity<Void> deletePersonByUuid(
             final String currentSubject,
             final String assumedRoles,
@@ -103,7 +103,7 @@ public class HsOfficePersonController implements HsOfficePersonsApi {
 
     @Override
     @Transactional
-    @Timed("app.persons.api.patchPerson")
+    @Timed("app.office.persons.api.patchPerson")
     public ResponseEntity<HsOfficePersonResource> patchPerson(
             final String currentSubject,
             final String assumedRoles,
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonRepository.java b/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonRepository.java
index 41d195ce..91a2c2b3 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonRepository.java
@@ -10,7 +10,7 @@ import java.util.UUID;
 
 public interface HsOfficePersonRepository extends Repository<HsOfficePersonEntity, UUID> {
 
-    @Timed("app.persons.repo.findByUuid.rbac")
+    @Timed("app.office.persons.repo.findByUuid.rbac")
     Optional<HsOfficePersonEntity> findByUuid(UUID personUuid);
 
     @Query("""
@@ -20,15 +20,15 @@ public interface HsOfficePersonRepository extends Repository<HsOfficePersonEntit
                     OR p.givenName like concat(cast(:name as text), '%')
                     OR p.familyName like concat(cast(:name as text), '%')
             """)
-    @Timed("app.persons.repo.findPersonByOptionalNameLike.rbac")
+    @Timed("app.office.persons.repo.findPersonByOptionalNameLike.rbac")
     List<HsOfficePersonEntity> findPersonByOptionalNameLike(String name);
 
-    @Timed("app.persons.repo.save.rbac")
+    @Timed("app.office.persons.repo.save.rbac")
     HsOfficePersonEntity save(final HsOfficePersonEntity entity);
 
-    @Timed("app.persons.repo.deleteByUuid.rbac")
+    @Timed("app.office.persons.repo.deleteByUuid.rbac")
     int deleteByUuid(final UUID personUuid);
 
-    @Timed("app.persons.repo.count.rbac")
+    @Timed("app.office.persons.repo.count.rbac")
     long count();
 }
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationController.java
index 5778d864..b8b8cd61 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationController.java
@@ -44,7 +44,7 @@ public class HsOfficeRelationController implements HsOfficeRelationsApi {
 
     @Override
     @Transactional(readOnly = true)
-    @Timed("app.relations.api.getListOfRelations")
+    @Timed("app.office.relations.api.getListOfRelations")
     public ResponseEntity<List<HsOfficeRelationResource>> getListOfRelations(
             final String currentSubject,
             final String assumedRoles,
@@ -67,7 +67,7 @@ public class HsOfficeRelationController implements HsOfficeRelationsApi {
 
     @Override
     @Transactional
-    @Timed("app.relations.api.postNewRelation")
+    @Timed("app.office.relations.api.postNewRelation")
     public ResponseEntity<HsOfficeRelationResource> postNewRelation(
             final String currentSubject,
             final String assumedRoles,
@@ -102,7 +102,7 @@ public class HsOfficeRelationController implements HsOfficeRelationsApi {
 
     @Override
     @Transactional(readOnly = true)
-    @Timed("app.relations.api.getSingleRelationByUuid")
+    @Timed("app.office.relations.api.getSingleRelationByUuid")
     public ResponseEntity<HsOfficeRelationResource> getSingleRelationByUuid(
             final String currentSubject,
             final String assumedRoles,
@@ -136,7 +136,7 @@ public class HsOfficeRelationController implements HsOfficeRelationsApi {
 
     @Override
     @Transactional
-    @Timed("app.relations.api.patchRelation")
+    @Timed("app.office.relations.api.patchRelation")
     public ResponseEntity<HsOfficeRelationResource> patchRelation(
             final String currentSubject,
             final String assumedRoles,
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRbacRepository.java b/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRbacRepository.java
index 23889745..0443bc00 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRbacRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRbacRepository.java
@@ -11,14 +11,14 @@ import java.util.UUID;
 
 public interface HsOfficeRelationRbacRepository extends Repository<HsOfficeRelationRbacEntity, UUID> {
 
-    @Timed("app.relations.repo.findByUuid.rbac")
+    @Timed("app.office.relations.repo.findByUuid.rbac")
     Optional<HsOfficeRelationRbacEntity> findByUuid(UUID id);
 
     @Query(value = """
             SELECT p.* FROM hs_office.relation_rv AS p
                 WHERE p.anchorUuid = :personUuid OR p.holderUuid = :personUuid
             """, nativeQuery = true)
-    @Timed("app.relations.repo.findRelationRelatedToPersonUuid.rbac")
+    @Timed("app.office.relations.repo.findRelationRelatedToPersonUuid.rbac")
     List<HsOfficeRelationRbacEntity> findRelationRelatedToPersonUuid(@NotNull UUID personUuid);
 
     /**
@@ -54,20 +54,20 @@ public interface HsOfficeRelationRbacRepository extends Repository<HsOfficeRelat
                             OR lower(CAST(rel.contact.emailAddresses AS String)) LIKE :contactData
                             OR lower(CAST(rel.contact.phoneNumbers AS String)) LIKE :contactData )
             """)
-    @Timed("app.relations.repo.findRelationRelatedToPersonUuidRelationTypePersonAndContactDataImpl.rbac")
+    @Timed("app.office.relations.repo.findRelationRelatedToPersonUuidRelationTypePersonAndContactDataImpl.rbac")
     List<HsOfficeRelationRbacEntity> findRelationRelatedToPersonUuidRelationTypePersonAndContactDataImpl(
             final UUID personUuid,
             final String relationType,
             final String personData,
             final String contactData);
 
-    @Timed("app.relations.repo.save.rbac")
+    @Timed("app.office.relations.repo.save.rbac")
     HsOfficeRelationRbacEntity save(final HsOfficeRelationRbacEntity entity);
 
-    @Timed("app.relations.repo.count.rbac")
+    @Timed("app.office.relations.repo.count.rbac")
     long count();
 
-    @Timed("app.relations.repo.deleteByUuid.rbac")
+    @Timed("app.office.relations.repo.deleteByUuid.rbac")
     int deleteByUuid(UUID uuid);
 
     private static String toSqlLikeOperand(final String text) {
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateController.java
index 05916d7c..02a3beb4 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateController.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateController.java
@@ -39,7 +39,7 @@ public class HsOfficeSepaMandateController implements HsOfficeSepaMandatesApi {
 
     @Override
     @Transactional(readOnly = true)
-    @Timed("app.sepaMandates.api.getListOfSepaMandates")
+    @Timed("app.office.sepaMandates.api.getListOfSepaMandates")
     public ResponseEntity<List<HsOfficeSepaMandateResource>> getListOfSepaMandates(
             final String currentSubject,
             final String assumedRoles,
@@ -55,7 +55,7 @@ public class HsOfficeSepaMandateController implements HsOfficeSepaMandatesApi {
 
     @Override
     @Transactional
-    @Timed("app.sepaMandates.api.postNewSepaMandate")
+    @Timed("app.office.sepaMandates.api.postNewSepaMandate")
     public ResponseEntity<HsOfficeSepaMandateResource> postNewSepaMandate(
             final String currentSubject,
             final String assumedRoles,
@@ -79,7 +79,7 @@ public class HsOfficeSepaMandateController implements HsOfficeSepaMandatesApi {
 
     @Override
     @Transactional(readOnly = true)
-    @Timed("app.sepaMandates.api.getSingleSepaMandateByUuid")
+    @Timed("app.office.sepaMandates.api.getSingleSepaMandateByUuid")
     public ResponseEntity<HsOfficeSepaMandateResource> getSingleSepaMandateByUuid(
             final String currentSubject,
             final String assumedRoles,
@@ -97,7 +97,7 @@ public class HsOfficeSepaMandateController implements HsOfficeSepaMandatesApi {
 
     @Override
     @Transactional
-    @Timed("app.sepaMandates.api.deleteSepaMandateByUuid")
+    @Timed("app.office.sepaMandates.api.deleteSepaMandateByUuid")
     public ResponseEntity<Void> deleteSepaMandateByUuid(
             final String currentSubject,
             final String assumedRoles,
@@ -114,7 +114,7 @@ public class HsOfficeSepaMandateController implements HsOfficeSepaMandatesApi {
 
     @Override
     @Transactional
-    @Timed("app.sepaMandates.api.patchSepaMandate")
+    @Timed("app.office.sepaMandates.api.patchSepaMandate")
     public ResponseEntity<HsOfficeSepaMandateResource> patchSepaMandate(
             final String currentSubject,
             final String assumedRoles,
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateRepository.java b/src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateRepository.java
index 24ebfe1d..5e414838 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateRepository.java
@@ -10,7 +10,7 @@ import java.util.UUID;
 
 public interface HsOfficeSepaMandateRepository extends Repository<HsOfficeSepaMandateEntity, UUID> {
 
-    @Timed("app.sepaMandates.repo.findByUuid")
+    @Timed("app.office.sepaMandates.repo.findByUuid")
     Optional<HsOfficeSepaMandateEntity> findByUuid(UUID id);
 
     @Query("""
@@ -19,15 +19,15 @@ public interface HsOfficeSepaMandateRepository extends Repository<HsOfficeSepaMa
                     OR mandate.bankAccount.iban like concat(cast(:iban as text), '%')
                 ORDER BY mandate.bankAccount.iban
             """)
-    @Timed("app.sepaMandates.repo.findSepaMandateByOptionalIban")
+    @Timed("app.office.sepaMandates.repo.findSepaMandateByOptionalIban")
     List<HsOfficeSepaMandateEntity> findSepaMandateByOptionalIban(String iban);
 
-    @Timed("app.sepaMandates.repo.save")
+    @Timed("app.office.sepaMandates.repo.save")
     HsOfficeSepaMandateEntity save(final HsOfficeSepaMandateEntity entity);
 
-    @Timed("app.sepaMandates.repo.count")
+    @Timed("app.office.sepaMandates.repo.count")
     long count();
 
-    @Timed("app.sepaMandates.repo.deleteByUuid")
+    @Timed("app.office.sepaMandates.repo.deleteByUuid")
     int deleteByUuid(UUID uuid);
 }