refactor: move complexity in solidify for sub resource update

- for funding agencies with org unit
- for deposit with author

src/app/features/admin/funding-agencies/components/presentationals/admin-funding-agencies-form/admin-funding-agencies-form.presentational.ts

@@ -60,6 +60,10 @@ export class AdminFundingAgenciesFormPresentational extends SharedAbstractFormPr
   }
 
   protected treatmentBeforeSubmit(fundingAgency: FundingAgencyExtended): FundingAgencyExtended {
+    fundingAgency.organizationalUnits = [];
+    this.form.get(this.formDefinition.organizationalUnits).value.forEach(resId => {
+      fundingAgency.organizationalUnits.push({resId: resId});
+    });
     return fundingAgency;
   }
 }

src/app/features/admin/funding-agencies/stores/admin-funding-agencies.state.ts

@@ -2,7 +2,10 @@ import {
   AdminFundingAgenciesAction,
   adminFundingAgenciesActionNameSpace,
 } from "@admin/funding-agencies/stores/admin-funding-agencies.action";
-import {adminFundingAgenciesOrgUnitActionNameSpace} from "@admin/funding-agencies/stores/organizational-unit/admin-organizational-unit-preservation-policy.action";
+import {
+  AdminFundingAgenciesOrgUnitAction,
+  adminFundingAgenciesOrgUnitActionNameSpace,
+} from "@admin/funding-agencies/stores/organizational-unit/admin-organizational-unit-preservation-policy.action";
 import {
   AdminFundingAgenciesOrganizationalUnitState,
   AdminFundingAgenciesOrganizationalUnitStateModel,
@@ -26,8 +29,6 @@ import {Observable} from "rxjs";
 import {tap} from "rxjs/operators";
 import {
   ApiService,
-  AssociationActionHelper,
-  ChangeModeEnum,
   defaultResourceStateInitValue,
   NotificationService,
   OverrideDefaultAction,
@@ -97,10 +98,14 @@ export class AdminFundingAgenciesState extends ResourceState<FundingAgencyExtend
     return super.internalCreate(ctx, action)
       .pipe(
         tap(model => {
-          const oldOrgUnit = [];
-          const newOrgUnit = action.modelFormControlEvent.model[LocalModelAttributeEnum.organizationalUnits];
-          const updateSubResourceAction = AssociationActionHelper.update(adminFundingAgenciesOrgUnitActionNameSpace, model.resId, oldOrgUnit, newOrgUnit);
-          StoreUtil.updateSubResource(ChangeModeEnum.create, this.actions$, ctx, updateSubResourceAction, adminFundingAgenciesActionNameSpace, adminFundingAgenciesOrgUnitActionNameSpace);
+          this.updateSubResource(model, action, ctx)
+            .subscribe(success => {
+              if (success) {
+                ctx.dispatch(new AdminFundingAgenciesAction.CreateSuccess(action, model));
+              } else {
+                ctx.dispatch(new AdminFundingAgenciesAction.CreateFail(action));
+              }
+            });
         }),
       );
   }
@@ -111,14 +116,31 @@ export class AdminFundingAgenciesState extends ResourceState<FundingAgencyExtend
     return super.internalUpdate(ctx, action)
       .pipe(
         tap(model => {
-          const oldOrgUnit = _.map(ctx.getState().admin_fundingAgencies_organizationalUnit.selected, LocalModelAttributeEnum.resId);
-          const newOrgUnit = action.modelFormControlEvent.model[LocalModelAttributeEnum.organizationalUnits];
-          const updateSubResourceAction = AssociationActionHelper.update(adminFundingAgenciesOrgUnitActionNameSpace, model.resId, oldOrgUnit, newOrgUnit);
-          StoreUtil.updateSubResource(ChangeModeEnum.update, this.actions$, ctx, updateSubResourceAction, adminFundingAgenciesActionNameSpace, adminFundingAgenciesOrgUnitActionNameSpace);
+          this.updateSubResource(model, action, ctx)
+            .subscribe(success => {
+              if (success) {
+                ctx.dispatch(new AdminFundingAgenciesAction.UpdateSuccess(action, model));
+              } else {
+                ctx.dispatch(new AdminFundingAgenciesAction.UpdateFail(action));
+              }
+            });
         }),
       );
   }
 
+  private updateSubResource(model: FundingAgencyExtended, action: AdminFundingAgenciesAction.Create | AdminFundingAgenciesAction.Update, ctx: StateContext<AdminFundingAgenciesStateModel>): Observable<boolean> {
+    const fundingAgencyId = model.resId;
+    const newOrgUnit = action.modelFormControlEvent.model.organizationalUnits.map(o => o.resId);
+
+    return StoreUtil.dispatchParallelActionAndWaitForSubActionsCompletion(ctx, [{
+      action: new AdminFundingAgenciesOrgUnitAction.Update(fundingAgencyId, newOrgUnit),
+      subActionCompletions: [
+        this.actions$.pipe(ofActionCompleted(AdminFundingAgenciesOrgUnitAction.UpdateSuccess)),
+        this.actions$.pipe(ofActionCompleted(AdminFundingAgenciesOrgUnitAction.UpdateFail)),
+      ],
+    }]);
+  }
+
   @OverrideDefaultAction()
   @Action(AdminFundingAgenciesAction.Delete)
   delete(ctx: StateContext<AdminFundingAgenciesStateModel>, action: AdminFundingAgenciesAction.Delete): Observable<FundingAgencyExtended> | any {

src/app/features/deposit/models/funding-agency-extended.model.ts

@@ -2,5 +2,5 @@ import {FundingAgency} from "@app/generated-api";
 import {OrganizationalUnitExtended} from "./organizational-unit-extended.model";
 
 export interface FundingAgencyExtended extends FundingAgency {
-  organizationalUnits: OrganizationalUnitExtended[];
+  organizationalUnits?: OrganizationalUnitExtended[];
 }

src/app/features/deposit/models/organizational-unit-extended.model.ts

@@ -5,8 +5,8 @@ import {
 } from "@app/generated-api";
 
 export interface OrganizationalUnitExtended extends OrganizationalUnit {
-  defaultSubmissionPolicy: SubmissionPolicy;
-  defaultPreservationPolicy: PreservationPolicy;
-  submissionPolicies: SubmissionPolicy[];
-  preservationPolicies: PreservationPolicy[];
+  defaultSubmissionPolicy?: SubmissionPolicy;
+  defaultPreservationPolicy?: PreservationPolicy;
+  submissionPolicies?: SubmissionPolicy[];
+  preservationPolicies?: PreservationPolicy[];
 }

src/app/features/deposit/stores/deposit.state.ts

@@ -21,7 +21,7 @@ import {
   DepositPeopleState,
   DepositPersonStateModel,
 } from "@app/features/deposit/stores/people/deposit-people.state";
-import {depositPersonActionNameSpace} from "@app/features/deposit/stores/people/deposit-person.action";
+import {DepositPersonAction} from "@app/features/deposit/stores/people/deposit-person.action";
 import {Deposit} from "@app/generated-api";
 import {ApiActionEnum} from "@app/shared/enums/api-action.enum";
 import {PreIngestResourceApiEnum} from "@app/shared/enums/api.enum";
@@ -39,6 +39,7 @@ import {Navigate} from "@ngxs/router-plugin";
 import {
   Action,
   Actions,
+  ofActionCompleted,
   State,
   StateContext,
   Store,
@@ -48,7 +49,6 @@ import {
   defaultDlcmResourceStateInitValue,
   DlcmResourceState,
 } from "@shared/stores/dlcm-resource/dlcm-resource.state";
-import _ from "lodash";
 import {Observable} from "rxjs";
 import {
   catchError,
@@ -57,8 +57,6 @@ import {
 } from "rxjs/operators";
 import {
   ApiService,
-  AssociationRemoteActionHelper,
-  ChangeModeEnum,
   CompositionActionHelper,
   ErrorDto,
   HttpStatus,
@@ -149,10 +147,18 @@ export class DepositState extends DlcmResourceState<DepositExtended> {
     return super.internalCreate(ctx, action)
       .pipe(
         tap(model => {
-          const oldAuthors = [];
-          const newAuthors = action.modelFormControlEvent.model[LocalModelAttributeEnum.authors];
-          const updateSubResourceAction = AssociationRemoteActionHelper.update(depositPersonActionNameSpace, model.resId, oldAuthors, newAuthors);
-          StoreUtil.updateSubResource(ChangeModeEnum.create, this.actions$, ctx, updateSubResourceAction, depositActionNameSpace, depositPersonActionNameSpace);
+          this.updateSubResource(model, action, ctx)
+            .subscribe(success => {
+              if (success) {
+                ctx.dispatch(new DepositAction.CreateSuccess(action, model));
+              } else {
+                ctx.dispatch(new DepositAction.CreateFail(action));
+              }
+            });
+          // const oldAuthors = [];
+          // const newAuthors = action.modelFormControlEvent.model[LocalModelAttributeEnum.authors];
+          // const updateSubResourceAction = AssociationRemoteActionHelper.update(depositPersonActionNameSpace, model.resId, oldAuthors, newAuthors);
+          // StoreUtil.updateSubResource(ChangeModeEnum.create, this.actions$, ctx, updateSubResourceAction, depositActionNameSpace, depositPersonActionNameSpace);
         }),
       );
   }
@@ -163,14 +169,36 @@ export class DepositState extends DlcmResourceState<DepositExtended> {
     return super.internalUpdate(ctx, action)
       .pipe(
         tap(model => {
-          const oldAuthors = _.map(ctx.getState().deposit_person.selected, LocalModelAttributeEnum.resId);
-          const newAuthors = action.modelFormControlEvent.model[LocalModelAttributeEnum.authors];
-          const updateSubResourceAction = AssociationRemoteActionHelper.update(depositPersonActionNameSpace, action.modelFormControlEvent.model.resId, oldAuthors, newAuthors);
-          StoreUtil.updateSubResource(ChangeModeEnum.update, this.actions$, ctx, updateSubResourceAction, depositActionNameSpace, depositPersonActionNameSpace);
+          this.updateSubResource(model, action, ctx)
+            .subscribe(success => {
+              if (success) {
+                ctx.dispatch(new DepositAction.UpdateSuccess(action, model));
+              } else {
+                ctx.dispatch(new DepositAction.UpdateFail(action));
+              }
+            });
+
+          // const oldAuthors = _.map(ctx.getState().deposit_person.selected, LocalModelAttributeEnum.resId);
+          // const newAuthors = action.modelFormControlEvent.model[LocalModelAttributeEnum.authors];
+          // const updateSubResourceAction = AssociationRemoteActionHelper.update(depositPersonActionNameSpace, action.modelFormControlEvent.model.resId, oldAuthors, newAuthors);
+          // StoreUtil.updateSubResource(ChangeModeEnum.update, this.actions$, ctx, updateSubResourceAction, depositActionNameSpace, depositPersonActionNameSpace);
         }),
       );
   }
 
+  private updateSubResource(model: DepositExtended, action: DepositAction.Create | DepositAction.Update, ctx: StateContext<DepositStateModel>): Observable<boolean> {
+    const depositId = model.resId;
+    const newAuthors: string[] = action.modelFormControlEvent.model[LocalModelAttributeEnum.authors];
+
+    return StoreUtil.dispatchParallelActionAndWaitForSubActionsCompletion(ctx, [{
+      action: new DepositPersonAction.Update(depositId, newAuthors),
+      subActionCompletions: [
+        this.actions$.pipe(ofActionCompleted(DepositPersonAction.UpdateSuccess)),
+        this.actions$.pipe(ofActionCompleted(DepositPersonAction.UpdateFail)),
+      ],
+    }]);
+  }
+
   @Action(DepositAction.Submit)
   submit(ctx: StateContext<DepositStateModel>, action: DepositAction.Submit): Observable<DepositExtended> {
     let submissionWithApproval = false;