inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AAE-5529] Include sorting params in the PeopleContentQueryRequestModel (#7193)

Browse Source
This commit is contained in:
siva kumar
2021-08-02 15:10:46 +05:30
committed by GitHub
parent 4befb779f8
commit 5d5b582e32
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/core/services/people-content.service.spec.ts
View File

@@ -94,7 +94,7 @@ describe('PeopleContentService', () => {
}); });
}); });
it('should call listPeople api with requested query params', async () => { it('should call listPeople api with requested sorting params', async () => {
const listPeopleSpy = spyOn(service.peopleApi, 'listPeople').and.returnValue(Promise.resolve(fakeEcmUserList)); const listPeopleSpy = spyOn(service.peopleApi, 'listPeople').and.returnValue(Promise.resolve(fakeEcmUserList));
const requestQueryParams: PeopleContentQueryRequestModel = { skipCount: 10, maxItems: 20, sorting: { orderBy: 'firstName', direction: 'asc' } }; const requestQueryParams: PeopleContentQueryRequestModel = { skipCount: 10, maxItems: 20, sorting: { orderBy: 'firstName', direction: 'asc' } };
const expectedValue = { skipCount: 10, maxItems: 20, orderBy: ['firstName ASC'] }; const expectedValue = { skipCount: 10, maxItems: 20, orderBy: ['firstName ASC'] };
@@ -104,6 +104,16 @@ describe('PeopleContentService', () => {
expect(listPeopleSpy).toHaveBeenCalledWith(expectedValue); expect(listPeopleSpy).toHaveBeenCalledWith(expectedValue);
}); });
it('should not call listPeople api with sorting params if sorting is not defined', async () => {
const listPeopleSpy = spyOn(service.peopleApi, 'listPeople').and.returnValue(Promise.resolve(fakeEcmUserList));
const requestQueryParams: PeopleContentQueryRequestModel = { skipCount: 10, maxItems: 20, sorting: undefined };
const expectedValue = { skipCount: 10, maxItems: 20 };
await service.listPeople(requestQueryParams).toPromise();
expect(listPeopleSpy).toHaveBeenCalledWith(expectedValue);
});
it('should be able to create new person', (done) => { it('should be able to create new person', (done) => {
spyOn(service.peopleApi, 'createPerson').and.returnValue(Promise.resolve(new PersonEntry({ entry: fakeEcmUser }))); spyOn(service.peopleApi, 'createPerson').and.returnValue(Promise.resolve(new PersonEntry({ entry: fakeEcmUser })));
service.createPerson(createNewPersonMock).subscribe((person) => { service.createPerson(createNewPersonMock).subscribe((person) => {

18
lib/core/services/people-content.service.ts
View File

@@ -52,8 +52,6 @@ export class PeopleContentService {
private _peopleApi: PeopleApi; private _peopleApi: PeopleApi;
defaultSorting = ['firstName ASC'];
constructor(private apiService: AlfrescoApiService, private logService: LogService) {} constructor(private apiService: AlfrescoApiService, private logService: LogService) {}
get peopleApi() { get peopleApi() {
@@ -87,12 +85,12 @@ export class PeopleContentService {
* @returns Response containing pagination and list of entries * @returns Response containing pagination and list of entries
*/ */
listPeople(requestQuery?: PeopleContentQueryRequestModel): Observable<PeopleContentQueryResponse> { listPeople(requestQuery?: PeopleContentQueryRequestModel): Observable<PeopleContentQueryResponse> {
const orderBy = this.buildOrderArray(requestQuery?.sorting.orderBy, requestQuery?.sorting.direction); const requestQueryParams = { skipCount: requestQuery?.skipCount, maxItems: requestQuery?.maxItems };
const requestQueryParams = { const orderBy = this.buildOrderArray(requestQuery?.sorting);
skipCount: requestQuery?.skipCount, if (orderBy.length) {
maxItems: requestQuery?.maxItems, requestQueryParams['orderBy'] = orderBy;
orderBy }
};
const promise = this.peopleApi.listPeople(requestQueryParams); const promise = this.peopleApi.listPeople(requestQueryParams);
return from(promise).pipe( return from(promise).pipe(
map(response => { map(response => {
@@ -127,8 +125,8 @@ export class PeopleContentService {
return this.hasContentAdminRole; return this.hasContentAdminRole;
} }
private buildOrderArray(key: string, direction: string): string[] { private buildOrderArray(sorting: PeopleContentSortingModel): string[] {
return key && direction ? [ `${key} ${direction.toUpperCase()}` ] : this.defaultSorting ; return sorting?.orderBy && sorting?.direction ? [ `${sorting.orderBy} ${sorting.direction.toUpperCase()}` ] : [];
} }
private handleError(error: any) { private handleError(error: any) {