sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-31 09:37:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged PR 1236: #3122 Warenausgabe Endpoints angepasst

Browse Source 
#3122 Warenausgabe Endpoints angepasst

Related work items: #3122
This commit is contained in:
Andreas Schickinger
2022-05-16 09:32:52 +00:00
committed by Nino Righi
parent fbf8c282e8
commit e870eb241b
6 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
apps/domain/oms/src/lib/goods.service.spec.ts
View File

@@ -25,24 +25,42 @@ describe('DomainGoodsInServie', () => {
expect(spectator.service).toBeDefined();
});
describe('search', () => {
describe('searchWareneingang', () => {
it('should call AbholfachService.AbholfachWareneingang', () => {
const queryTokenDto: QueryTokenDTO = {};
abholfachServiceMock.AbholfachWareneingang.and.returnValue(hot('-a|', { a: {} }));
expect(spectator.service.search(queryTokenDto)).toBeObservable(cold('-a|', { a: {} }));
expect(spectator.service.searchWareneingang(queryTokenDto)).toBeObservable(cold('-a|', { a: {} }));
expect(abholfachServiceMock.AbholfachWareneingang).toHaveBeenCalledWith(queryTokenDto);
});
});
describe('complete', () => {
describe('searchWarenausgabe', () => {
it('should call AbholfachService.AbholfachWarenausgabe', () => {
const queryTokenDto: QueryTokenDTO = {};
abholfachServiceMock.AbholfachWarenausgabe.and.returnValue(hot('-a|', { a: {} }));
expect(spectator.service.searchWarenausgabe(queryTokenDto)).toBeObservable(cold('-a|', { a: {} }));
expect(abholfachServiceMock.AbholfachWarenausgabe).toHaveBeenCalledWith(queryTokenDto);
});
});
describe('wareneingangComplete', () => {
it('should call AbholfachService.AbholfachWareneingangAutocomplete', () => {
const autocompleteToken: AutocompleteTokenDTO = {};
abholfachServiceMock.AbholfachWareneingangAutocomplete.and.returnValue(hot('-a|', { a: {} }));
expect(spectator.service.complete(autocompleteToken)).toBeObservable(cold('-a|', { a: {} }));
expect(spectator.service.wareneingangComplete(autocompleteToken)).toBeObservable(cold('-a|', { a: {} }));
expect(abholfachServiceMock.AbholfachWareneingangAutocomplete).toHaveBeenCalledWith(autocompleteToken);
});
});
describe('warenausgabeComplete', () => {
it('should call AbholfachService.AbholfachWarenausgabeAutocomplete', () => {
const autocompleteToken: AutocompleteTokenDTO = {};
abholfachServiceMock.AbholfachWarenausgabeAutocomplete.and.returnValue(hot('-a|', { a: {} }));
expect(spectator.service.warenausgabeComplete(autocompleteToken)).toBeObservable(cold('-a|', { a: {} }));
expect(abholfachServiceMock.AbholfachWarenausgabeAutocomplete).toHaveBeenCalledWith(autocompleteToken);
});
});
describe('list', () => {
it('should call search with queryToken', () => {
const queryToken: QueryTokenDTO = {
@@ -58,7 +76,7 @@ describe('DomainGoodsInServie', () => {
spyOn(dateAdapter, 'today').and.returnValue(new Date(2021, 5, 7));
spyOn(spectator.service, 'search').and.returnValue(hot('-a|', { a: {} }));
expect(spectator.service.list()).toBeObservable(cold('-a|', { a: {} }));
expect(spectator.service.search).toHaveBeenCalledWith(queryToken);
expect(spectator.service.searchWareneingang).toHaveBeenCalledWith(queryToken);
});
});

14
apps/domain/oms/src/lib/goods.service.ts
View File

@@ -7,14 +7,22 @@ import { shareReplay } from 'rxjs/operators';
export class DomainGoodsService {
constructor(private abholfachService: AbholfachService, private dateAdapter: DateAdapter) {}
search(queryToken: QueryTokenDTO) {
searchWareneingang(queryToken: QueryTokenDTO) {
return this.abholfachService.AbholfachWareneingang(queryToken);
}
complete(autocompleteToken: AutocompleteTokenDTO) {
searchWarenausgabe(queryToken: QueryTokenDTO) {
return this.abholfachService.AbholfachWarenausgabe(queryToken);
}
wareneingangComplete(autocompleteToken: AutocompleteTokenDTO) {
return this.abholfachService.AbholfachWareneingangAutocomplete(autocompleteToken);
}
warenausgabeComplete(autocompleteToken: AutocompleteTokenDTO) {
return this.abholfachService.AbholfachWarenausgabeAutocomplete(autocompleteToken);
}
getItemByOrderNumber(orderNumber: string) {
return this.abholfachService.AbholfachWareneingang({
filter: { all_branches: 'true', archive: 'true' },
@@ -56,7 +64,7 @@ export class DomainGoodsService {
skip: 0,
take: 20,
};
return this.search(queryToken);
return this.searchWareneingang(queryToken);
}
@memorize()

2
apps/page/goods-in/src/lib/goods-in-search/goods-in-search.store.ts
View File

@@ -142,7 +142,7 @@ export class GoodsInSearchStore extends ComponentStore<GoodsInSearchState> {
filter((f) => f instanceof UiFilter),
take(1),
mergeMap((filter) =>
this._domainGoodsInService.search({
this._domainGoodsInService.searchWareneingang({
...filter.getQueryToken(),
skip: options?.skip ?? this.results.length,
take: options?.take ?? 50,

2
apps/page/goods-in/src/lib/goods-in-search/providers/goods-in-search-main-autocomplete.provider.ts
View File

@@ -19,7 +19,7 @@ export class GoodsInSearchMainAutocompleteProvider extends UiFilterAutocompleteP
if (input.value.length >= 3) {
return this.domainGoodsInService
.complete({
.wareneingangComplete({
filter,
input: input.value,
take: 5,

2
apps/page/goods-out/src/lib/goods-out-search/goods-out-search.store.ts
View File

@@ -147,7 +147,7 @@ export class GoodsOutSearchStore extends ComponentStore<GoodsOutSearchState> {
filter((f) => f instanceof UiFilter),
take(1),
mergeMap((filter) =>
this._domainGoodsInService.search({
this._domainGoodsInService.searchWarenausgabe({
...filter.getQueryToken(),
skip: options?.skip ?? this.results.length,
take: options?.take ?? 50,

2
apps/page/goods-out/src/lib/goods-out-search/providers/goods-out-search-main-autocomplete.provider.ts
View File

@@ -19,7 +19,7 @@ export class GoodsOutSearchMainAutocompleteProvider extends UiFilterAutocomplete
if (input.value.length >= 3) {
return this.domainGoodsInService
.complete({
.warenausgabeComplete({
filter,
input: input.value,
take: 5,