archetypes: contracts module - better

SlawekSobotka · SlawekSobotka · commit dc1ca55256e0 · 2022-04-03T16:41:41.000+02:00
diff --git a/src/main/java/io/legacyfighter/cabs/contracts/application/acme/dynamic/DocumentResourceManager.java b/src/main/java/io/legacyfighter/cabs/contracts/application/acme/dynamic/DocumentResourceManager.java
@@ -48,7 +48,8 @@ public DocumentOperationResult createDocument(Long authorId){
         return generateDocumentOperationResult(DocumentOperationResult.Result.SUCCESS, state);
     }
 
-    public DocumentOperationResult changeState(Long documentId, String desiredState, Map<String, Object> params){
+    public DocumentOperationResult changeState(Long documentId, String desiredState,
+                                               Map<String, Object> params){
         DocumentHeader documentHeader = documentHeaderRepository.getOne(documentId);
         StateConfig stateConfig = assembler.assemble();
         State state = stateConfig.recreate(documentHeader);
@@ -70,9 +71,11 @@ public DocumentOperationResult changeContent(Long headerId, ContentId contentVer
         return generateDocumentOperationResult(DocumentOperationResult.Result.SUCCESS, state);
     }
 
-    private DocumentOperationResult generateDocumentOperationResult(DocumentOperationResult.Result result, State state) {
+    private DocumentOperationResult generateDocumentOperationResult(
+            DocumentOperationResult.Result result, State state) {
         return new DocumentOperationResult(result, state.getDocumentHeader().getId(),
-                state.getDocumentHeader().getDocumentNumber(), state.getStateDescriptor(), state.getDocumentHeader().getContentId(),
+                state.getDocumentHeader().getDocumentNumber(), state.getStateDescriptor(),
+                state.getDocumentHeader().getContentId(),
                 extractPossibleTransitionsAndRules(state),
                 state.isContentEditable(),
                 extractContentChangePredicate(state));
@@ -88,13 +91,15 @@ private String extractContentChangePredicate(State state) {
     private Map<String, List<String>> extractPossibleTransitionsAndRules(State state) {
         Map<String, List<String>> transitionsAndRules = new HashMap<>();
 
-        Map<State, List<BiFunction<State, ChangeCommand, Boolean>>> stateChangePredicates = state.getStateChangePredicates();
+        Map<State, List<BiFunction<State, ChangeCommand, Boolean>>> stateChangePredicates =
+                state.getStateChangePredicates();
         for (State s : stateChangePredicates.keySet()){
             //transition to self is not important
             if (s.equals(state))
                 continue;
 
-            List<BiFunction<State, ChangeCommand, Boolean>> predicates = stateChangePredicates.get(s);
+            List<BiFunction<State, ChangeCommand, Boolean>> predicates =
+                    stateChangePredicates.get(s);
             List<String> ruleNames = new ArrayList<>();
             for (BiFunction<State, ChangeCommand, Boolean> predicate : predicates){
                 ruleNames.add(predicate.getClass().getTypeName());
diff --git a/src/main/java/io/legacyfighter/cabs/contracts/model/state/dynamic/acme/AcmeContractStateAssembler.java b/src/main/java/io/legacyfighter/cabs/contracts/model/state/dynamic/acme/AcmeContractStateAssembler.java
@@ -34,14 +34,22 @@ public AcmeContractStateAssembler(ApplicationEventPublisher publisher) {
 
     public StateConfig assemble(){
         StateBuilder builder = new StateBuilder();
-        builder.beginWith(DRAFT).check(new ContentNotEmptyVerifier()).check(new AuthorIsNotAVerifier()).to(VERIFIED).action(new ChangeVerifier());
-        builder.from(DRAFT).whenContentChanged().to(DRAFT);
+        builder.beginWith(DRAFT)
+                .check(new ContentNotEmptyVerifier())
+                .check(new AuthorIsNotAVerifier())
+                .to(VERIFIED).action(new ChangeVerifier());
+        builder.from(DRAFT)
+                .whenContentChanged()
+                .to(DRAFT);
         //name of the "published" state and name of the DocumentPublished event are NOT correlated. These are two different domains, name similarity is just a coincidence
-        builder.from(VERIFIED).check(new ContentNotEmptyVerifier()).to(PUBLISHED).action(new PublishEvent(DocumentPublished.class, publisher));
+        builder.from(VERIFIED)
+                .check(new ContentNotEmptyVerifier())
+                .to(PUBLISHED).action(new PublishEvent(DocumentPublished.class, publisher));
         builder.from(VERIFIED).whenContentChanged().to(DRAFT);
         builder.from(DRAFT).to(ARCHIVED);
         builder.from(VERIFIED).to(ARCHIVED);
-        builder.from(PUBLISHED).to(ARCHIVED).action(new PublishEvent(DocumentUnpublished.class, publisher));
+        builder.from(PUBLISHED)
+                .to(ARCHIVED).action(new PublishEvent(DocumentUnpublished.class, publisher));
         return builder;
     }
 }
diff --git a/src/main/java/io/legacyfighter/cabs/contracts/model/state/dynamic/config/predicates/statechange/AuthorIsNotAVerifier.java b/src/main/java/io/legacyfighter/cabs/contracts/model/state/dynamic/config/predicates/statechange/AuthorIsNotAVerifier.java
@@ -12,6 +12,7 @@ public class AuthorIsNotAVerifier implements BiFunction<State, ChangeCommand, Bo
 
     @Override
     public Boolean apply(State state, ChangeCommand command) {
-        return ! command.getParam(PARAM_VERIFIER, Long.class).equals(state.getDocumentHeader().getAuthorId());
+        return ! command.getParam(PARAM_VERIFIER, Long.class)
+                .equals(state.getDocumentHeader().getAuthorId());
     }
 }
diff --git a/src/main/java/io/legacyfighter/cabs/party/model/party/PartyRelationshipRepository.java b/src/main/java/io/legacyfighter/cabs/party/model/party/PartyRelationshipRepository.java
@@ -5,6 +5,8 @@
 import java.util.Optional;
 
 public interface PartyRelationshipRepository {
-    PartyRelationship put(String partyRelationship, String partyARole, Party partyA, String partyBRole, Party partyB);
+    PartyRelationship put(String partyRelationship,
+                          String partyARole, Party partyA,
+                          String partyBRole, Party partyB);
     Optional<PartyRelationship> findRelationshipFor(PartyId id, String relationshipName);
 }
diff --git a/src/main/java/io/legacyfighter/cabs/repair/api/RepairProcess.java b/src/main/java/io/legacyfighter/cabs/repair/api/RepairProcess.java
@@ -22,25 +22,33 @@ public RepairProcess(PartyMapper partyMapper){
     }
 
     public ResolveResult resolve(RepairRequest repairRequest) {
-         return partyMapper.mapRelation(repairRequest.getVehicle(), PartyRelationshipsDictionary.REPAIR.name())
+         return partyMapper.mapRelation(repairRequest.getVehicle(),
+                         PartyRelationshipsDictionary.REPAIR.name())
                 .map(RoleObjectFactory::from)
                 .flatMap(rof -> rof.getRole(RoleForRepairer.class))
                 .map(role -> role.handle(repairRequest))
-                .map(repairingResult -> new ResolveResult(ResolveResult.Status.SUCCESS, repairingResult.getHandlingParty(), repairingResult.getTotalCost(), repairingResult.getHandledParts()))
+                .map(repairingResult -> new ResolveResult(ResolveResult.Status.SUCCESS,
+                        repairingResult.getHandlingParty(), repairingResult.getTotalCost(),
+                        repairingResult.getHandledParts()))
                 .orElseGet(() -> new ResolveResult(ResolveResult.Status.ERROR));
     }
 
     public ResolveResult resolve_oldschool_version(RepairRequest repairRequest) {
         //who is responsible for repairing the vehicle
-        Optional<PartyRelationship> relationship = partyMapper.mapRelation(repairRequest.getVehicle(), PartyRelationshipsDictionary.REPAIR.name());
+        Optional<PartyRelationship> relationship = partyMapper.mapRelation(
+                                                    repairRequest.getVehicle(),
+                                                    PartyRelationshipsDictionary.REPAIR.name());
         if (relationship.isPresent()){
             RoleObjectFactory roleObjectFactory = RoleObjectFactory.from(relationship.get());
             //dynamically assigned rules
             Optional<RoleForRepairer> role = roleObjectFactory.getRole(RoleForRepairer.class);
             if (role.isPresent()) {
                 //actual repair request handling
                 RepairingResult repairingResult = role.get().handle(repairRequest);
-                return new ResolveResult(ResolveResult.Status.SUCCESS, repairingResult.getHandlingParty(), repairingResult.getTotalCost(), repairingResult.getHandledParts());
+                return new ResolveResult(ResolveResult.Status.SUCCESS,
+                        repairingResult.getHandlingParty(),
+                        repairingResult.getTotalCost(),
+                        repairingResult.getHandledParts());
             }
         }
         return new ResolveResult(ResolveResult.Status.ERROR);
diff --git a/src/main/java/io/legacyfighter/cabs/repair/legacy/user/CommonBaseAbstractUser.java b/src/main/java/io/legacyfighter/cabs/repair/legacy/user/CommonBaseAbstractUser.java
@@ -15,9 +15,15 @@ public JobResult doJob(CommonBaseAbstractJob job){
         if (job instanceof MaintenanceJob){
             return handle((MaintenanceJob) job);
         }
+        if (job instanceof XJob){
+            return handle((XJob) job);
+        }
+
         return defaultHandler(job);
     }
 
+
+
     protected JobResult handle(RepairJob job) {
         return defaultHandler(job);
     }
@@ -29,4 +35,8 @@ protected JobResult handle(MaintenanceJob job) {
     protected JobResult defaultHandler(CommonBaseAbstractJob job){
         throw new IllegalArgumentException(getClass().getName() + " can not handle " + job.getClass().getName());
     }
+
+    protected JobResult handle(XJob job) {
+        throw new IllegalArgumentException(getClass().getName() + " can not handle " + job.getClass().getName());
+    }
 }
diff --git a/src/main/java/io/legacyfighter/cabs/repair/legacy/user/EmployeeDriver.java b/src/main/java/io/legacyfighter/cabs/repair/legacy/user/EmployeeDriver.java
@@ -1,4 +1,11 @@
 package io.legacyfighter.cabs.repair.legacy.user;
 
+import io.legacyfighter.cabs.repair.legacy.job.JobResult;
+
 public class EmployeeDriver extends CommonBaseAbstractUser{
+
+    @Override
+    protected JobResult handle(XJob job) {
+        return super.handle(job);
+    }
 }
diff --git a/src/main/java/io/legacyfighter/cabs/repair/legacy/user/EmployeeDriverWithLeasedCar.java b/src/main/java/io/legacyfighter/cabs/repair/legacy/user/EmployeeDriverWithLeasedCar.java
@@ -9,7 +9,13 @@ public class EmployeeDriverWithLeasedCar extends EmployeeDriver{
 
     @Override
     protected JobResult handle(RepairJob job) {
-        return new JobResult(JobResult.Decision.REDIRECTION).addParam("shouldHandleBy", lasingCompanyId);
+        return new JobResult(JobResult.Decision.REDIRECTION)
+                .addParam("shouldHandleBy", lasingCompanyId);
+    }
+
+    @Override
+    protected JobResult handle(XJob job) {
+        return super.handle(job);
     }
 
     public Long getLasingCompanyId() {
diff --git a/src/main/java/io/legacyfighter/cabs/repair/legacy/user/EmployeeDriverWithOwnCar.java b/src/main/java/io/legacyfighter/cabs/repair/legacy/user/EmployeeDriverWithOwnCar.java
@@ -21,10 +21,17 @@ protected JobResult handle(RepairJob job) {
         Set<Parts> acceptedParts = new HashSet<>(job.getPartsToRepair());
         acceptedParts.retainAll(contract.getCoveredParts());
 
-        Money coveredCost = job.getEstimatedValue().percentage(contract.getCoverageRatio());
+        Money coveredCost = job.getEstimatedValue()
+                .percentage(contract.getCoverageRatio());
         Money totalCost = job.getEstimatedValue().subtract(coveredCost);
 
-        return new JobResult(JobResult.Decision.ACCEPTED).addParam("totalCost", totalCost).addParam("acceptedParts", acceptedParts);
+        return new JobResult(JobResult.Decision.ACCEPTED)
+                .addParam("totalCost", totalCost).addParam("acceptedParts", acceptedParts);
+    }
+
+    @Override
+    protected JobResult handle(XJob job) {
+        return super.handle(job);
     }
 
     public void setContract(SignedContract contract) {
diff --git a/src/main/java/io/legacyfighter/cabs/repair/legacy/user/XJob.java b/src/main/java/io/legacyfighter/cabs/repair/legacy/user/XJob.java
@@ -0,0 +1,6 @@
+package io.legacyfighter.cabs.repair.legacy.user;
+
+import io.legacyfighter.cabs.repair.legacy.job.CommonBaseAbstractJob;
+
+public class XJob extends CommonBaseAbstractJob {
+}
diff --git a/src/main/java/io/legacyfighter/cabs/repair/model/roles/repair/Warranty.java b/src/main/java/io/legacyfighter/cabs/repair/model/roles/repair/Warranty.java
@@ -7,7 +7,6 @@
 
 import java.util.HashSet;
 import java.util.Set;
-
 public class Warranty extends RoleForRepairer {
 
     public Warranty(Party party) {
diff --git a/src/test/java/io/legacyfighter/cabs/contracts/model/state/dynamic/AcmeContractTest.java b/src/test/java/io/legacyfighter/cabs/contracts/model/state/dynamic/AcmeContractTest.java
@@ -39,7 +39,8 @@ public void draftCanBeVerifiedByUserOtherThanCreator(){
         //given
         State state = draft().changeContent(ANY_VERSION);
         //when
-        state = state.changeState(new ChangeCommand(AcmeContractStateAssembler.VERIFIED).withParam(AcmeContractStateAssembler.PARAM_VERIFIER, OTHER_USER));
+        state = state.changeState(new ChangeCommand(AcmeContractStateAssembler.VERIFIED)
+                .withParam(AcmeContractStateAssembler.PARAM_VERIFIER, OTHER_USER));
         //then
         assertEquals(AcmeContractStateAssembler.VERIFIED, state.getStateDescriptor());
         assertEquals(OTHER_USER, state.getDocumentHeader().getVerifier());
@@ -49,7 +50,8 @@ public void draftCanBeVerifiedByUserOtherThanCreator(){
     public void canNotChangePublished(){
         //given
         State state = state = draft().changeContent(ANY_VERSION)
-                .changeState(new ChangeCommand(AcmeContractStateAssembler.VERIFIED).withParam(AcmeContractStateAssembler.PARAM_VERIFIER, OTHER_USER))
+                .changeState(new ChangeCommand(AcmeContractStateAssembler.VERIFIED)
+                        .withParam(AcmeContractStateAssembler.PARAM_VERIFIER, OTHER_USER))
                 .changeState(new ChangeCommand(AcmeContractStateAssembler.PUBLISHED));
 
         publisher.contains(DocumentPublished.class);
@@ -66,7 +68,8 @@ public void canNotChangePublished(){
     public void changingVerifiedMovesToDraft(){
         //given
         State state = draft().changeContent(ANY_VERSION)
-                .changeState(new ChangeCommand(AcmeContractStateAssembler.VERIFIED).withParam(AcmeContractStateAssembler.PARAM_VERIFIER, OTHER_USER));
+                .changeState(new ChangeCommand(AcmeContractStateAssembler.VERIFIED)
+                        .withParam(AcmeContractStateAssembler.PARAM_VERIFIER, OTHER_USER));
         //when
         state = state.changeContent(OTHER_VERSION);
         //then
@@ -82,9 +85,11 @@ public void canChangeStateToTheSame(){
         state.changeState(new ChangeCommand(AcmeContractStateAssembler.DRAFT));
         assertEquals(AcmeContractStateAssembler.DRAFT, state.getStateDescriptor());
 
-        state = state.changeState(new ChangeCommand(AcmeContractStateAssembler.VERIFIED).withParam(AcmeContractStateAssembler.PARAM_VERIFIER, OTHER_USER));
+        state = state.changeState(new ChangeCommand(AcmeContractStateAssembler.VERIFIED)
+                .withParam(AcmeContractStateAssembler.PARAM_VERIFIER, OTHER_USER));
         assertEquals(AcmeContractStateAssembler.VERIFIED, state.getStateDescriptor());
-        state = state.changeState(new ChangeCommand(AcmeContractStateAssembler.VERIFIED).withParam(AcmeContractStateAssembler.PARAM_VERIFIER, OTHER_USER));
+        state = state.changeState(new ChangeCommand(AcmeContractStateAssembler.VERIFIED)
+                .withParam(AcmeContractStateAssembler.PARAM_VERIFIER, OTHER_USER));
         assertEquals(AcmeContractStateAssembler.VERIFIED, state.getStateDescriptor());
 
         state = state.changeState(new ChangeCommand(AcmeContractStateAssembler.PUBLISHED));
diff --git a/src/test/java/io/legacyfighter/cabs/repair/api/RepairProcessTest.java b/src/test/java/io/legacyfighter/cabs/repair/api/RepairProcessTest.java
@@ -25,20 +25,23 @@ public void warrantyByInsuranceCoversAllButPaint(){
         //given
         contractManager.extendedWarrantyContractSigned(handlingParty, vehicle);
 
-        Set<Parts> parts = Set.of(new Parts[] {Parts.ENGINE, Parts.GEARBOX, Parts.PAINT, Parts.SUSPENSION});
+        Set<Parts> parts = Set.of(new Parts[] {Parts.ENGINE, Parts.GEARBOX,
+                                               Parts.PAINT, Parts.SUSPENSION});
         RepairRequest repairRequest = new RepairRequest(vehicle, parts);
         //when
         ResolveResult result = vehicleRepairProcess.resolve(repairRequest);
         //then
-        new VehicleRepairAssert(result).by(handlingParty).free().allPartsBut(parts, new Parts[] {Parts.PAINT});
+        new VehicleRepairAssert(result).by(handlingParty).free().allPartsBut(parts,
+                                                        new Parts[] {Parts.PAINT});
     }
 
     @Test
     public void manufacturerWarrantyCoversAll(){
         //given
         contractManager.manufacturerWarrantyRegistered(handlingParty, vehicle);
 
-        Set<Parts> parts = Set.of(new Parts[]{Parts.ENGINE, Parts.GEARBOX, Parts.PAINT, Parts.SUSPENSION});
+        Set<Parts> parts = Set.of(new Parts[]{Parts.ENGINE, Parts.GEARBOX,
+                                              Parts.PAINT, Parts.SUSPENSION});
         RepairRequest repairRequest = new RepairRequest(vehicle, parts);
         //when
         ResolveResult result = vehicleRepairProcess.resolve(repairRequest);

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ public class AuthorIsNotAVerifier implements BiFunction<State, ChangeCommand, Bo`
`12`	`12`
`13`	`13`	`@Override`
`14`	`14`	`public Boolean apply(State state, ChangeCommand command) {`
`15`		`- return ! command.getParam(PARAM_VERIFIER, Long.class).equals(state.getDocumentHeader().getAuthorId());`
	`15`	`+ return ! command.getParam(PARAM_VERIFIER, Long.class)`
	`16`	`+ .equals(state.getDocumentHeader().getAuthorId());`
`16`	`17`	`}`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`import java.util.Optional;`
`6`	`6`
`7`	`7`	`public interface PartyRelationshipRepository {`
`8`		`- PartyRelationship put(String partyRelationship, String partyARole, Party partyA, String partyBRole, Party partyB);`
	`8`	`+ PartyRelationship put(String partyRelationship,`
	`9`	`+ String partyARole, Party partyA,`
	`10`	`+ String partyBRole, Party partyB);`
`9`	`11`	`Optional<PartyRelationship> findRelationshipFor(PartyId id, String relationshipName);`
`10`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,15 @@ public JobResult doJob(CommonBaseAbstractJob job){`
`15`	`15`	`if (job instanceof MaintenanceJob){`
`16`	`16`	`return handle((MaintenanceJob) job);`
`17`	`17`	`}`
	`18`	`+ if (job instanceof XJob){`
	`19`	`+ return handle((XJob) job);`
	`20`	`+ }`
	`21`	`+`
`18`	`22`	`return defaultHandler(job);`
`19`	`23`	`}`
`20`	`24`
	`25`	`+`
	`26`	`+`
`21`	`27`	`protected JobResult handle(RepairJob job) {`
`22`	`28`	`return defaultHandler(job);`
`23`	`29`	`}`
`@@ -29,4 +35,8 @@ protected JobResult handle(MaintenanceJob job) {`
`29`	`35`	`protected JobResult defaultHandler(CommonBaseAbstractJob job){`
`30`	`36`	`throw new IllegalArgumentException(getClass().getName() + " can not handle " + job.getClass().getName());`
`31`	`37`	`}`
	`38`	`+`
	`39`	`+ protected JobResult handle(XJob job) {`
	`40`	`+ throw new IllegalArgumentException(getClass().getName() + " can not handle " + job.getClass().getName());`
	`41`	`+ }`
`32`	`42`	`}`