Member edit form split into two (#249)

member edit form split into two:
- `{{host}}/members/1/editOwnMemberInfoForm` => form for members to edit own info
- `{{host}}/members/1/editByAdminForm` => form for admins to edit info about other members

* Updated API Specs for splitted members form
* Added forms for edit own and another member details
* Corrected format of birth certificate number for initial loaded data
* Oris proxy controller bug fix - HTTP 500 for unknown regnum
* ArchUnit failures fix
* Validations for existing birthday certificate and one of email/phone contacts doesn't respond with HTTP 500 now

backend/api.http

@@ -83,6 +83,56 @@ Authorization: Bearer {{$auth.token("frontend")}}
   "sex": "male"
 }
 
+### Get form data for Member Edit by Admin
+GET {{host}}/members/1/editByAdminForm
+Authorization: Bearer {{$auth.token("frontend")}}
+
+### Update member info by ADMIN
+PUT {{host}}/members/1/editByAdminForm
+Content-Type: application/json
+Authorization: Bearer {{$auth.token("frontend")}}
+
+{
+  "firstName": "Dave",
+  "lastName": "Pol",
+  "dateOfBirth": "1982-04-26",
+  "birthCertificateNumber": "123456/780",
+  "nationality": "CZ",
+  "sex": "male"
+}
+
+###
+GET {{host}}/members/1/editOwnMemberInfoForm
+Authorization: Bearer {{$auth.token("frontend")}}
+
+###
+PUT {{host}}/members/1/editOwnMemberInfoForm
+Authorization: Bearer {{$auth.token("frontend")}}
+Content-Type: application/json
+
+{
+  "identityCard": null,
+  "nationality": "CZ",
+  "address": {
+    "streetAndNumber": "Nekde jinde 12",
+    "city": "Brno",
+    "postalCode": "63212",
+    "country": "CZ"
+  },
+  "contact": {
+    "email": "test@testx.com",
+    "phone": "888888888",
+    "note": null
+  },
+  "guardians": [],
+  "siCard": 12345678,
+  "bankAccount": "CZ1234567891000",
+  "dietaryRestrictions": null,
+  "drivingLicence": [],
+  "medicCourse": false
+}
+
+
 ### Membership suspension info
 GET {{host}}/members/1/suspendMembershipForm
 Authorization: Bearer {{$auth.token("frontend")}}

backend/build.gradle.kts

@@ -25,8 +25,8 @@ description = "klabis"
 java.sourceCompatibility = JavaVersion.VERSION_21
 
 val recordbuilderVersion = "41"
-val mapstructVersion = "1.6.0.Beta1"
-val mapstructSpringExtensionsVersion = "1.1.1"
+val mapstructVersion = "1.6.2"
+val mapstructSpringExtensionsVersion = "1.1.2"
 
 dependencies {
 
@@ -132,8 +132,10 @@ openApiGenerate {
             //"hateoas" to "false",
             "booleanGetterPrefix" to "is",
             "interfaceOnly" to "true",
-            "defaultInterfaces" to "false",
-            "useBeanValidation" to "true"
+            "skipDefaultInterface" to "true",
+            "useBeanValidation" to "true",
+            "apiFirst" to "false"
+            //"useOptional" to "false"
         )
     )
 }

backend/src/main/java/club/klabis/adapters/api/members/MembersController.java

@@ -8,11 +8,14 @@
 import club.klabis.domain.members.Member;
 import club.klabis.domain.members.MemberNotFoundException;
 import club.klabis.domain.members.MemberService;
+import club.klabis.domain.members.forms.EditAnotherMemberInfoByAdminForm;
+import club.klabis.domain.members.forms.EditOwnMemberInfoForm;
 import club.klabis.domain.members.forms.MemberEditForm;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Collection;
@@ -66,7 +69,7 @@ public ResponseEntity<MembershipSuspensionInfoApiDto> membersMemberIdSuspendMemb
     }
 
     @Override
-    public ResponseEntity<Void> membersMemberIdSuspendMembershipFormPost(Integer memberId, Boolean force) {
+    public ResponseEntity<Void> membersMemberIdSuspendMembershipFormPut(Integer memberId, Boolean force) {
         service.suspendMembershipForMember(memberId, force);
         return ResponseEntity.ok(null);
     }
@@ -98,4 +101,25 @@ public ResponseEntity<Void> updateMemberGrants(Integer memberId, MemberGrantsFor
         return ResponseEntity.ok(null);
     }
 
+    @Override
+    public ResponseEntity<EditAnotherMemberDetailsFormApiDto> getMemberEditByAdminForm(Integer memberId) {
+        return ResponseEntity.ok(conversionService.convert(service.getEditAnotherMemberForm(memberId), EditAnotherMemberDetailsFormApiDto.class));
+    }
+
+    @Override
+    public ResponseEntity<Void> putMemberEditByAdminForm(Integer memberId, EditAnotherMemberDetailsFormApiDto editAnotherMemberDetailsFormApiDto) {
+        service.editMember(memberId, conversionService.convert(editAnotherMemberDetailsFormApiDto, EditAnotherMemberInfoByAdminForm.class));
+        return ResponseEntity.ok(null);
+    }
+
+    @Override
+    public ResponseEntity<EditMyDetailsFormApiDto> membersMemberIdEditOwnMemberInfoFormGet(Integer memberId) {
+        return ResponseEntity.ok(conversionService.convert(service.getEditOwnMemberInfoForm(memberId), EditMyDetailsFormApiDto.class));
+    }
+
+    @Override
+    public ResponseEntity<Void> membersMemberIdEditOwnMemberInfoFormPut(Integer memberId, EditMyDetailsFormApiDto editMyDetailsFormApiDto) {
+        service.editMember(memberId, conversionService.convert(editMyDetailsFormApiDto, EditOwnMemberInfoForm.class));
+        return ResponseEntity.ok(null);
+    }
 }

backend/src/main/java/club/klabis/adapters/api/members/MembersRegistrationController.java

@@ -23,7 +23,7 @@ public MembersRegistrationController(MemberService service, ConversionService co
     }
 
     @Override
-    public ResponseEntity<Void> memberRegistrationsPost(MemberRegistrationFormApiDto memberRegistrationFormApiDto) {
+    public ResponseEntity<Void> memberRegistrationsPut(MemberRegistrationFormApiDto memberRegistrationFormApiDto) {
         Member createdMember = service.registerMember(conversionService.convert(memberRegistrationFormApiDto, RegistrationForm.class));
         return ResponseEntity.created(URI.create("/members/%s".formatted(createdMember.getId()))).header("MemberId", "%d".formatted(createdMember.getId())).build();
     }

backend/src/main/java/club/klabis/adapters/api/members/mappers/EditAnotherMemberInfoByAdminFormMappers.java

@@ -0,0 +1,25 @@
+package club.klabis.adapters.api.members.mappers;
+
+import club.klabis.api.dto.EditAnotherMemberDetailsFormApiDto;
+import club.klabis.common.mapstruct.DomainFormMapperConfiguration;
+import club.klabis.domain.members.Member;
+import club.klabis.domain.members.forms.EditAnotherMemberInfoByAdminForm;
+import org.mapstruct.InheritInverseConfiguration;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.extensions.spring.DelegatingConverter;
+import org.springframework.core.convert.converter.Converter;
+
+@Mapper(config = DomainFormMapperConfiguration.class, unmappedSourcePolicy = ReportingPolicy.IGNORE)
+interface EditAnotherMemberInfoByAdminFormMappers extends Converter<EditAnotherMemberInfoByAdminForm, EditAnotherMemberDetailsFormApiDto> {
+
+    @Override
+    EditAnotherMemberDetailsFormApiDto convert(EditAnotherMemberInfoByAdminForm source);
+
+    @InheritInverseConfiguration
+    @DelegatingConverter
+    EditAnotherMemberInfoByAdminForm convertReverse(EditAnotherMemberDetailsFormApiDto source);
+
+    @DelegatingConverter
+    EditAnotherMemberInfoByAdminForm fromDomain(Member member);
+}

backend/src/main/java/club/klabis/adapters/api/members/mappers/MemberEditOwnInfoFormApiDtoFromMemberDomainMapper.java

@@ -0,0 +1,26 @@
+package club.klabis.adapters.api.members.mappers;
+
+import club.klabis.api.dto.EditMyDetailsFormApiDto;
+import club.klabis.common.mapstruct.DomainFormMapperConfiguration;
+import club.klabis.domain.members.Member;
+import club.klabis.domain.members.forms.EditOwnMemberInfoForm;
+import org.mapstruct.InheritInverseConfiguration;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.extensions.spring.DelegatingConverter;
+import org.springframework.core.convert.converter.Converter;
+
+@Mapper(config = DomainFormMapperConfiguration.class)
+interface MemberEditOwnInfoFormApiDtoFromMemberDomainMapper extends Converter<EditOwnMemberInfoForm, EditMyDetailsFormApiDto> {
+    @Override
+    EditMyDetailsFormApiDto convert(EditOwnMemberInfoForm source);
+
+    @InheritInverseConfiguration
+    @DelegatingConverter
+    EditOwnMemberInfoForm convertReverse(EditMyDetailsFormApiDto source);
+
+    @Mapping(target = "guardians", source = "legalGuardians")
+    @Mapping(target = "contact", source = "contact")
+    @DelegatingConverter
+    EditOwnMemberInfoForm fromDomain(Member member);
+}

backend/src/main/java/club/klabis/domain/oris/OrisProxyController.java → backend/src/main/java/club/klabis/adapters/api/oris/OrisProxyController.java

@@ -1,4 +1,4 @@
-package club.klabis.domain.oris;
+package club.klabis.adapters.api.oris;
 
 import club.klabis.adapters.oris.OrisApiClient;
 import club.klabis.api.OrisApi;

backend/src/main/java/club/klabis/domain/oris/OrisUserInfoMapper.java → backend/src/main/java/club/klabis/adapters/api/oris/OrisUserInfoMapper.java

@@ -1,4 +1,4 @@
-package club.klabis.domain.oris;
+package club.klabis.adapters.api.oris;
 
 import club.klabis.adapters.oris.OrisApiClient;
 import club.klabis.common.mapstruct.DomainToDtoMapperConfiguration;

backend/src/main/java/club/klabis/adapters/oris/OrisApiClient.java

@@ -10,7 +10,7 @@
 
 public interface OrisApiClient {
 
-    @GetExchange("/API/?format=xml&method=getUser")
+    @GetExchange("/API/?format=json&method=getUser")
     OrisResponse<OrisUserInfo> getUserInfo(@RequestParam("rgnum") String registrationNumber);
 
     record OrisResponse<T> (

backend/src/main/java/club/klabis/common/mapstruct/DomainFormMapperConfiguration.java

@@ -0,0 +1,13 @@
+package club.klabis.common.mapstruct;
+
+import club.klabis.common.ConversionServiceAdapter;
+import org.mapstruct.MapperConfig;
+import org.mapstruct.ReportingPolicy;
+
+/**
+ * Mapstruct configuration for API DTO mappers.
+ * These mappers shall implement `Converter<DOMAIN, APIDTO>` (APIDTO needs to be target, DOMAIN object needs to be source)
+ */
+@MapperConfig(componentModel = "spring", uses = {ConversionServiceAdapter.class, OptionalMapstructSupport.class}, unmappedSourcePolicy = ReportingPolicy.IGNORE, unmappedTargetPolicy = ReportingPolicy.ERROR)
+public interface DomainFormMapperConfiguration {
+}

backend/src/main/java/club/klabis/domain/members/Member.java

@@ -1,8 +1,12 @@
 package club.klabis.domain.members;
 
+import club.klabis.api.dto.EditAnotherMemberDetailsFormApiDto;
+import club.klabis.api.dto.EditMyDetailsFormApiDto;
 import club.klabis.domain.members.events.MemberCreatedEvent;
 import club.klabis.domain.members.events.MemberEditedEvent;
 import club.klabis.domain.members.events.MemberWasSuspendedEvent;
+import club.klabis.domain.members.forms.EditAnotherMemberInfoByAdminForm;
+import club.klabis.domain.members.forms.EditOwnMemberInfoForm;
 import club.klabis.domain.members.forms.MemberEditForm;
 import club.klabis.domain.members.forms.RegistrationForm;
 import org.jmolecules.ddd.annotation.AggregateRoot;
@@ -117,6 +121,34 @@ public void edit(MemberEditForm form) {
         this.andEvent(new MemberEditedEvent(this));
     }
 
+    public void edit(EditOwnMemberInfoForm form) {
+        this.identityCard = form.identityCard();
+        this.nationality = form.nationality();
+        this.address = form.address();
+        this.contact.clear();
+        this.contact.addAll(form.contact());
+        this.legalGuardians.clear();
+        this.legalGuardians.addAll(form.guardians());
+        this.siCard = form.siCard();
+        this.bankAccount = form.bankAccount();
+        this.dietaryRestrictions = form.dietaryRestrictions();
+        this.drivingLicence.clear();
+        this.drivingLicence.addAll(form.drivingLicence());
+        this.medicCourse = form.medicCourse();
+        this.andEvent(new MemberEditedEvent(this));
+    }
+
+    public void edit(EditAnotherMemberInfoByAdminForm form) {
+        this.firstName = form.firstName();
+        this.lastName = form.lastName();
+        this.nationality = form.nationality();
+        this.dateOfBirth = form.dateOfBirth();
+        this.birthCertificateNumber = form.birthCertificateNumber();
+        this.sex = form.sex();
+        this.andEvent(new MemberEditedEvent(this));
+
+    }
+
     public void suspend() {
         if (!this.suspended) {
             this.suspended = true;
@@ -211,4 +243,5 @@ public Optional<String> getDietaryRestrictions() {
     public boolean isSuspended() {
         return suspended;
     }
+
 }

backend/src/main/java/club/klabis/domain/members/MemberService.java

@@ -1,5 +1,8 @@
 package club.klabis.domain.members;
 
+import club.klabis.api.dto.EditMyDetailsFormApiDto;
+import club.klabis.domain.members.forms.EditAnotherMemberInfoByAdminForm;
+import club.klabis.domain.members.forms.EditOwnMemberInfoForm;
 import club.klabis.domain.members.forms.MemberEditForm;
 import club.klabis.domain.members.forms.RegistrationForm;
 import jakarta.validation.Valid;
@@ -21,9 +24,17 @@ public interface MemberService {
 
     RegistrationNumber suggestRegistrationNumber(LocalDate dateOfBirth, Sex sex);
 
-    Member editMember(Integer memberId, @Valid MemberEditForm editForm);
-
     Optional<MembershipSuspensionInfo> getSuspensionInfoForMember(int memberId);
 
     void suspendMembershipForMember(int memberId, boolean forceSuspension);
+
+    Member editMember(Integer memberId, @Valid MemberEditForm editForm);
+
+    EditAnotherMemberInfoByAdminForm getEditAnotherMemberForm(Integer memberId);
+
+    Member editMember(Integer memberId, @Valid EditAnotherMemberInfoByAdminForm form);
+
+    EditOwnMemberInfoForm getEditOwnMemberInfoForm(Integer memberId);
+
+    Member editMember(Integer memberId, @Valid EditOwnMemberInfoForm form);
 }

backend/src/main/java/club/klabis/domain/members/MemberServiceImpl.java

@@ -1,7 +1,10 @@
 package club.klabis.domain.members;
 
+import club.klabis.domain.members.forms.EditAnotherMemberInfoByAdminForm;
+import club.klabis.domain.members.forms.EditOwnMemberInfoForm;
 import club.klabis.domain.members.forms.MemberEditForm;
 import club.klabis.domain.members.forms.RegistrationForm;
+import org.springframework.core.convert.ConversionService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -12,9 +15,11 @@
 @Service
 class MemberServiceImpl implements MemberService {
     private final MembersRepository membersRepository;
+    private final ConversionService conversionService;
 
-    MemberServiceImpl(MembersRepository membersRepository) {
+    MemberServiceImpl(MembersRepository membersRepository, ConversionService conversionService) {
         this.membersRepository = membersRepository;
+        this.conversionService = conversionService;
     }
 
     @Override
@@ -88,4 +93,39 @@ public void suspendMembershipForMember(int memberId, boolean forceSuspension) {
             throw new MembershipCannotBeSuspendedException(memberId, "member is already suspended");
         }
     }
+
+    @Transactional
+    @Override
+    public Member editMember(Integer memberId, EditOwnMemberInfoForm form) {
+        Member member = membersRepository.findById(memberId)
+                .orElseThrow(() -> new MemberNotFoundException(memberId));
+
+        member.edit(form);
+        return membersRepository.save(member);
+    }
+
+    @Override
+    public EditAnotherMemberInfoByAdminForm getEditAnotherMemberForm(Integer memberId) {
+        return findById(memberId)
+                .map(m -> conversionService.convert(m, EditAnotherMemberInfoByAdminForm.class))
+                .orElseThrow(() -> new MemberNotFoundException(memberId));
+    }
+
+    @Override
+    public Member editMember(Integer memberId, EditAnotherMemberInfoByAdminForm form) {
+        Member member = membersRepository.findById(memberId)
+                .orElseThrow(() -> new MemberNotFoundException(memberId));
+
+        member.edit(form);
+        return membersRepository.save(member);
+    }
+
+    @Override
+    public EditOwnMemberInfoForm getEditOwnMemberInfoForm(Integer memberId) {
+        return findById(memberId)
+                .map(m -> conversionService.convert(m, EditOwnMemberInfoForm.class))
+                .orElseThrow(() -> new MemberNotFoundException(memberId));
+    }
+
+
 }