diff --git a/src/app/main/component/user/services/user-notification.service.ts b/src/app/main/component/user/services/user-notification.service.ts index ddcc9e7639..f2ed18b3e5 100644 --- a/src/app/main/component/user/services/user-notification.service.ts +++ b/src/app/main/component/user/services/user-notification.service.ts @@ -12,7 +12,7 @@ export class UserNotificationService { url: string = environment.backendLink; pickUpUrl: string = environment.backendUbsLink + '/'; - constructor(private http: HttpClient) {} + constructor(private readonly http: HttpClient) {} getAllNotifications(params: HttpParams): Observable { return this.http.get(`${this.url}notifications`, { params }); @@ -23,13 +23,17 @@ export class UserNotificationService { } readNotification(id: number, isPickUp: boolean): Observable { - const url = isPickUp ? this.pickUpUrl : this.url; - return this.http.post(`${url}notifications/${id}/viewNotification`, {}); + if (isPickUp) { + return this.http.patch(`${this.pickUpUrl}notifications/${id}/viewNotification`, {}); + } + return this.http.post(`${this.url}notifications/${id}/viewNotification`, {}); } unReadNotification(id: number, isPickUp: boolean): Observable { - const url = isPickUp ? this.pickUpUrl : this.url; - return this.http.post(`${url}notifications/${id}/unreadNotification`, {}); + if (isPickUp) { + return this.http.patch(`${this.pickUpUrl}notifications/${id}/unreadNotification`, {}); + } + return this.http.post(`${this.url}notifications/${id}/unreadNotification`, {}); } deleteNotification(id: number, isPickUp: boolean): Observable { diff --git a/src/app/shared/ubs-base-sidebar/ubs-base-sidebar.component.html b/src/app/shared/ubs-base-sidebar/ubs-base-sidebar.component.html index 46bb06c473..6a21ec7eb6 100644 --- a/src/app/shared/ubs-base-sidebar/ubs-base-sidebar.component.html +++ b/src/app/shared/ubs-base-sidebar/ubs-base-sidebar.component.html @@ -39,11 +39,11 @@ {{ listItem.name | translate }} icon {{ listItem.name | translate }} - ({{ serviceUserMessages.countOfNoReadeMessages }}) + ({{ serviceUserMessages.countOfNoReadMessages }}) diff --git a/src/app/shared/ubs-base-sidebar/ubs-base-sidebar.component.spec.ts b/src/app/shared/ubs-base-sidebar/ubs-base-sidebar.component.spec.ts index c5653ea38a..ce93f6c3cc 100644 --- a/src/app/shared/ubs-base-sidebar/ubs-base-sidebar.component.spec.ts +++ b/src/app/shared/ubs-base-sidebar/ubs-base-sidebar.component.spec.ts @@ -62,7 +62,7 @@ describe('UbsBaseSidebarComponent', () => { fixture = TestBed.createComponent(UbsBaseSidebarComponent); component = fixture.componentInstance; spyOn(global, 'setTimeout'); - userMessagesService.countOfNoReadeMessages = 0; + userMessagesService.countOfNoReadMessages = 0; fixture.detectChanges(); }); @@ -76,7 +76,7 @@ describe('UbsBaseSidebarComponent', () => { }); it('should return default icon link', () => { - userMessagesService.countOfNoReadeMessages = 1; + userMessagesService.countOfNoReadMessages = 1; listItem.link = component.bellsNoneNotification; expect(component.getIcon(listItem)).toBe(component.bellsNotification); }); diff --git a/src/app/shared/ubs-base-sidebar/ubs-base-sidebar.component.ts b/src/app/shared/ubs-base-sidebar/ubs-base-sidebar.component.ts index d767dd4fb8..31df400680 100644 --- a/src/app/shared/ubs-base-sidebar/ubs-base-sidebar.component.ts +++ b/src/app/shared/ubs-base-sidebar/ubs-base-sidebar.component.ts @@ -69,8 +69,8 @@ export class UbsBaseSidebarComponent implements AfterViewInit, AfterViewChecked, } } - getIcon(listItem): string { - return listItem.link === this.bellsNoneNotification && this.serviceUserMessages.countOfNoReadeMessages + getIcon(listItem: listElements): string { + return listItem.link === this.bellsNoneNotification && this.serviceUserMessages.countOfNoReadMessages ? this.bellsNotification : listItem.link; } @@ -93,7 +93,7 @@ export class UbsBaseSidebarComponent implements AfterViewInit, AfterViewChecked, .getCountUnreadNotification() .pipe(takeUntil(this.destroy)) .subscribe((response) => { - this.serviceUserMessages.countOfNoReadeMessages = response; + this.serviceUserMessages.countOfNoReadMessages = response; }); } else { this.isAdmin = true; diff --git a/src/app/ubs/ubs-user/services/user-messages-service.spec.ts b/src/app/ubs/ubs-user/services/user-messages-service.spec.ts deleted file mode 100644 index 9431ce3183..0000000000 --- a/src/app/ubs/ubs-user/services/user-messages-service.spec.ts +++ /dev/null @@ -1,88 +0,0 @@ -import { UserMessagesService } from './user-messages.service'; -import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; -import { Notifications } from '../../../ubs/ubs-admin/models/ubs-user.model'; -import { environment } from '@environment/environment'; - -const url = environment.backendUbsLink; -const expectNotification: Notifications = { - page: [ - { - id: 1, - notificationTime: '2021-10-16T18:01:52.091747', - orderId: 2111, - read: false, - title: 'Неоплачене замовлення' - }, - { - id: 2, - orderId: 2111, - read: false, - title: 'Неоплачене замовлення', - notificationTime: '2021-10-16T18:01:52.091747' - } - ], - totalElements: 2, - currentPage: 0, - totalPages: 1 -}; -const expectBodyNotification = { - body: 'WWWWW', - title: 'Unpaid order' -}; -const appServiceNotificationSpy = jasmine.createSpyObj('UserMessagesService', { - getNotification: expectNotification, - getCountUnreadNotification: 100, - setReadNotification: expectBodyNotification -}); -describe('UserMessagesService', () => { - const lang = 'ua'; - let serviceNotification: UserMessagesService; - let httpMock: HttpTestingController; - let httpClientSpy: { get: jasmine.Spy }; - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [UserMessagesService] - }); - httpClientSpy = jasmine.createSpyObj('HttpClient', ['get']); - serviceNotification = TestBed.inject(UserMessagesService); - httpMock = TestBed.inject(HttpTestingController); - }); - - it('should create', () => { - expect(serviceNotification).toBeDefined(); - }); - - it('should return expected Notifications (HttpClient called once)', () => { - serviceNotification.getNotification(0, 2).subscribe((notifications) => { - expect(notifications).toEqual(expectNotification); - }); - const req = httpMock.expectOne(`${url}/notifications?lang=${serviceNotification.language}&page=0&size=2`); - expect(req.request.method).toBe('GET'); - req.flush(expectNotification); - }); - - it('should return count of unread notifications ', () => { - const expectCountUnreadNotification = 100; - serviceNotification.getCountUnreadNotification().subscribe((response) => { - expect(response).toEqual(expectCountUnreadNotification); - }); - const req = httpMock.expectOne(`${url}/notifications/quantityUnreadenNotifications`); - expect(req.request.method).toBe('GET'); - req.flush(expectCountUnreadNotification); - }); - - it('should change status notification unread or read and should return body', () => { - serviceNotification.setReadNotification(1).subscribe((response) => { - expect(response).toEqual(expectBodyNotification); - }); - const req = httpMock.expectOne(`${url}/notifications/1?lang=${serviceNotification.language}`); - expect(req.request.method).toBe('POST'); - req.flush(expectBodyNotification); - }); - - afterEach(() => { - httpMock.verify(); - }); -}); diff --git a/src/app/ubs/ubs-user/services/user-messages.service.spec.ts b/src/app/ubs/ubs-user/services/user-messages.service.spec.ts index 8dd0f00c8a..42e2a10dee 100644 --- a/src/app/ubs/ubs-user/services/user-messages.service.spec.ts +++ b/src/app/ubs/ubs-user/services/user-messages.service.spec.ts @@ -10,7 +10,6 @@ describe('UserMessagesService', () => { let httpMock: HttpTestingController; let service: UserMessagesService; let langMock = null; - const IDMock = 3900; const localStorageServiceMock: LocalStorageService = jasmine.createSpyObj('LocalStorageService', ['languageBehaviourSubject']); localStorageServiceMock.languageBehaviourSubject = new BehaviorSubject('en'); @@ -40,7 +39,7 @@ describe('UserMessagesService', () => { }); it('should return 10 notifications', () => { - service.getNotification(0, 10).subscribe((data) => { + service.getNotification(0, 10, 'en').subscribe((data) => { expect(data).toBeDefined(); expect(data.page.length).toBe(10); }); @@ -56,17 +55,19 @@ describe('UserMessagesService', () => { expect(req.request.method).toBe('GET'); }); - it('should return current notification', () => { - service.setReadNotification(IDMock).subscribe((data) => { - expect(data).toBeDefined(); - }); - const req = httpMock.expectOne(`${mainUbsLink}/notifications/${IDMock}?lang=en`); - expect(req.request.method).toBe('POST'); + it('should call the correct URL and method for setReadNotification', () => { + const notificationId = 1; + + service.markNotificationAsRead(notificationId).subscribe(); + const req = httpMock.expectOne(`${service.url}/notifications/${notificationId}/viewNotification`); + expect(req.request.method).toBe('PATCH'); }); - it('onDestroy should be called', () => { - const spy = spyOn(service, 'ngOnDestroy'); - service.ngOnDestroy(); - expect(spy).toHaveBeenCalledTimes(1); + it('should call the correct URL and method for deleteNotification', () => { + const notificationId = 1; + + service.deleteNotification(notificationId).subscribe(); + const req = httpMock.expectOne(`${service.url}/notifications/${notificationId}`); + expect(req.request.method).toBe('DELETE'); }); }); diff --git a/src/app/ubs/ubs-user/services/user-messages.service.ts b/src/app/ubs/ubs-user/services/user-messages.service.ts index 6d3df8e115..8709c5c60e 100644 --- a/src/app/ubs/ubs-user/services/user-messages.service.ts +++ b/src/app/ubs/ubs-user/services/user-messages.service.ts @@ -3,35 +3,32 @@ import { Observable, ReplaySubject } from 'rxjs'; import { HttpClient } from '@angular/common/http'; import { environment } from '@environment/environment'; import { Notifications } from '../../../ubs/ubs-admin/models/ubs-user.model'; -import { LocalStorageService } from '@global-service/localstorage/local-storage.service'; -import { takeUntil } from 'rxjs/operators'; @Injectable({ providedIn: 'root' }) export class UserMessagesService implements OnDestroy { url = environment.backendUbsLink; - private destroyed$: ReplaySubject = new ReplaySubject(1); - countOfNoReadeMessages: any; + private readonly destroyed$: ReplaySubject = new ReplaySubject(1); + countOfNoReadMessages: any; language: string; - constructor( - private http: HttpClient, - private localStorageService: LocalStorageService - ) { - localStorageService.languageBehaviourSubject.pipe(takeUntil(this.destroyed$)).subscribe((language) => (this.language = language)); - } + constructor(private readonly http: HttpClient) {} - getNotification(currentPage: number, size: number): Observable { - return this.http.get(`${this.url}/notifications?lang=${this.language}&page=${currentPage}&size=${size}`); + getNotification(currentPage: number, size: number, language: string): Observable { + return this.http.get(`${this.url}/notifications?lang=${language}&page=${currentPage}&size=${size}`); } getCountUnreadNotification(): Observable { return this.http.get(`${this.url}/notifications/quantityUnreadenNotifications`); } - setReadNotification(id: number): Observable { - return this.http.post(`${this.url}/notifications/${id}?lang=${this.language}`, {}); + markNotificationAsRead(id: number): Observable { + return this.http.patch(`${this.url}/notifications/${id}/viewNotification`, {}); + } + + deleteNotification(id: number): Observable { + return this.http.delete(`${this.url}/notifications/${id}`); } ngOnDestroy() { diff --git a/src/app/ubs/ubs-user/ubs-user-messages/ubs-user-messages.component.html b/src/app/ubs/ubs-user/ubs-user-messages/ubs-user-messages.component.html index 0f33edb6e5..88bf60e947 100644 --- a/src/app/ubs/ubs-user/ubs-user-messages/ubs-user-messages.component.html +++ b/src/app/ubs/ubs-user/ubs-user-messages/ubs-user-messages.component.html @@ -2,9 +2,9 @@
{{ localization.title | translate }}
-
{{ localization.id | translate }}
-
{{ localization.themeMessages | translate }}
-
{{ localization.time | translate }}
+
{{ localization.id | translate }}
+
{{ localization.themeMessages | translate }}
+
{{ localization.time | translate }}