Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ testem.log
Thumbs.db

# Config
appConfig.json
authConfig.json
appConfig*.json
authConfig*.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
[extensions]="extensions"
[formControl]="control"
namespace="deposit"
noToolbar
type="DepositParams"
></cc-fistful-thrift-form>
<v-dialog-actions>
Expand All @@ -13,7 +12,3 @@
</button>
</v-dialog-actions>
</v-dialog>

<ng-template #sourceCashTemplate let-cashControl="control">
<cc-source-cash-field [formControl]="cashControl"></cc-source-cash-field>
</ng-template>
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
import { BehaviorSubject, of } from 'rxjs';
import { first, map, switchMap } from 'rxjs/operators';
import { Overwrite } from 'utility-types';
import { BehaviorSubject, combineLatest, first, map, of, switchMap } from 'rxjs';

import { Component, DestroyRef, TemplateRef, ViewChild, inject } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormControl, Validators } from '@angular/forms';

import { DepositParams } from '@vality/fistful-proto/deposit';
import { DialogSuperclass, NotifyLogService, progressTo } from '@vality/matez';
import { DialogSuperclass, NotifyLogService, progressTo, tapLog } from '@vality/matez';
import { ThriftFormExtension, isTypeWithAliases } from '@vality/ng-thrift';

import { ThriftDepositManagementService } from '~/api/services';
import { SourceCash } from '~/components/source-cash-field';
import { DomainObjectsStoreService } from '~/api/domain-config';
import { ThriftDepositManagementService, ThriftRepositoryClientService } from '~/api/services';
import { getDomainObjectOption } from '~/components/thrift-api-crud/domain/services/domain-metadata-form-extensions/utils/get-domain-object-option';
import { UserInfoBasedIdGeneratorService } from '~/services';

import { FetchSourcesService } from '../../../sources';
Expand All @@ -21,13 +20,15 @@ import { FetchSourcesService } from '../../../sources';
standalone: false,
})
export class CreateDepositDialogComponent extends DialogSuperclass<CreateDepositDialogComponent> {
private destroyRef = inject(DestroyRef);
private dr = inject(DestroyRef);
private depositManagementService = inject(ThriftDepositManagementService);
private log = inject(NotifyLogService);
private userInfoBasedIdGeneratorService = inject(UserInfoBasedIdGeneratorService);
private domainStoreService = inject(DomainObjectsStoreService);
private fetchSourcesService = inject(FetchSourcesService);
private thriftRepositoryClientService = inject(ThriftRepositoryClientService);

@ViewChild('sourceCashTemplate') sourceCashTemplate: TemplateRef<unknown>;
@ViewChild('currencyTemplate') currencyTemplate: TemplateRef<unknown>;

control = new FormControl(this.getDefaultValue(), [Validators.required]);
progress$ = new BehaviorSubject(0);
Expand All @@ -37,40 +38,59 @@ export class CreateDepositDialogComponent extends DialogSuperclass<CreateDeposit
of(
isTypeWithAliases(data, 'ContextSet', 'context') ||
isTypeWithAliases(data, 'DepositID', 'deposit') ||
isTypeWithAliases(data, 'SourceID', 'deposit'),
isTypeWithAliases(data, 'SourceID', 'deposit') ||
isTypeWithAliases(data, 'PartyID', 'deposit'),
),
extension: () => of({ hidden: true }),
},
{
determinant: (data) => of(isTypeWithAliases(data, 'Cash', 'base')),
extension: () => of({ template: this.sourceCashTemplate }),
determinant: (data) => of(isTypeWithAliases(data, 'CurrencySymbolicCode', 'base')),
extension: () =>
this.fetchSourcesService.sources$.pipe(
map((sources) => ({
options: sources.map((source) => ({
label: source.name,
value: source.id,
details: source,
})),
isIdentifier: true,
})),
),
},
{
determinant: (data) => of(isTypeWithAliases(data, 'WalletID', 'deposit')),
extension: () =>
this.domainStoreService.getLimitedObjects('wallet_config').value$.pipe(
map((objects) => ({
options: objects.map((obj) => getDomainObjectOption(obj)),
isIdentifier: true,
})),
),
},
];

create() {
const { body: sourceCash, ...value } = this.control.value;
this.fetchSourcesService.sources$
const value = this.control.value;
combineLatest([
this.fetchSourcesService.sources$.pipe(first()),
this.thriftRepositoryClientService.CheckoutObject(
{ head: {} },
{ wallet_config: { id: value.wallet_id } },
),
])
.pipe(
first(),
map(
(sources) =>
sources.find((s) => s.id === sourceCash.sourceId).currency_symbolic_code,
),
switchMap((symbolicCode) =>
this.depositManagementService.Create(
{
...value,
source_id: sourceCash.sourceId,
body: {
amount: sourceCash.amount,
currency: { symbolic_code: symbolicCode },
},
},
new Map(),
),
([sources, wallet]): DepositParams => ({
...value,
party_id: wallet.object.wallet_config.data.party_ref.id,
source_id: sources.find((s) => s.id === value.body.currency.symbolic_code)
?.id,
}),
),
tapLog(),
switchMap((params) => this.depositManagementService.Create(params, new Map())),
progressTo(this.progress$),
takeUntilDestroyed(this.destroyRef),
takeUntilDestroyed(this.dr),
)
.subscribe({
next: () => this.closeWithSuccess(),
Expand All @@ -81,7 +101,8 @@ export class CreateDepositDialogComponent extends DialogSuperclass<CreateDeposit
getDefaultValue() {
return {
id: this.userInfoBasedIdGeneratorService.getUsernameBasedId(),
source_id: 'STUB',
} as Overwrite<DepositParams, { body: SourceCash }>;
source_id: '___AUTO___',
party_id: '___AUTO___',
} as DepositParams;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { DialogModule } from '@vality/matez';

import { CurrencySourceFieldComponent } from '~/components/currency-source-field';
import { FistfulThriftFormComponent } from '~/components/fistful-thrift-form';
import { SourceCashFieldComponent } from '~/components/source-cash-field';
import { UserInfoBasedIdGeneratorModule } from '~/services';

import { CreateDepositDialogComponent } from './create-deposit-dialog.component';
Expand All @@ -31,7 +30,6 @@ import { CreateDepositDialogComponent } from './create-deposit-dialog.component'
DialogModule,
CurrencySourceFieldComponent,
FistfulThriftFormComponent,
SourceCashFieldComponent,
],
declarations: [CreateDepositDialogComponent],
})
Expand Down
1 change: 0 additions & 1 deletion src/app/payments/payments.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
(selectedChange)="selected$.next($event)"
(update)="reload($event ?? {})"
>

<button [disabled]="!(selected$ | async)?.length" mat-button (click)="failMachines()">
Fail machines
</button>
Expand Down
Loading