From 214db2afd5a46d95d53164d8fae834e265f4fad7 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Fri, 17 Feb 2023 17:33:45 +0200
Subject: [PATCH] RED-6170: fix notifications sorting

---
 .../notifications.component.html              |  2 +-
 .../notifications/notifications.component.ts  | 30 +++++++++++++++----
 .../src/app/services/notifications.service.ts |  8 +----
 apps/red-ui/src/assets/i18n/redact/de.json    |  1 +
 apps/red-ui/src/assets/i18n/redact/en.json    |  1 +
 apps/red-ui/src/assets/i18n/scm/de.json       |  1 +
 apps/red-ui/src/assets/i18n/scm/en.json       |  1 +
 .../lib/notifications/notification.model.ts   |  2 +-
 8 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.html b/apps/red-ui/src/app/components/notifications/notifications.component.html
index 1ed50b65c..518a46c85 100644
--- a/apps/red-ui/src/app/components/notifications/notifications.component.html
+++ b/apps/red-ui/src/app/components/notifications/notifications.component.html
@@ -29,7 +29,7 @@
 
                     <div class="notification-content">
                         <div [innerHTML]="notification.message"></div>
-                        <div class="small-label mt-2">{{ notification.time }}</div>
+                        <div class="small-label mt-2">{{ notification.creationDate | date : 'exactDate' }}</div>
                     </div>
                     <div
                         (click)="markRead($event, [notification], !notification.readDate)"
diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.ts b/apps/red-ui/src/app/components/notifications/notifications.component.ts
index 305801583..14568e121 100644
--- a/apps/red-ui/src/app/components/notifications/notifications.component.ts
+++ b/apps/red-ui/src/app/components/notifications/notifications.component.ts
@@ -5,13 +5,18 @@ import { Notification } from '@red/domain';
 import { distinctUntilChanged, map } from 'rxjs/operators';
 import { Observable } from 'rxjs';
 import { isToday, shareLast } from '@iqser/common-ui';
-import dayjs from 'dayjs';
+import dayjs, { Dayjs } from 'dayjs';
+import { TranslateService } from '@ngx-translate/core';
 
 interface NotificationsGroup {
     date: string;
     notifications: Notification[];
 }
 
+export function isOlderThan(date: string | Date | Dayjs, years: number) {
+    return dayjs(date).year() <= dayjs(Date.now()).subtract(years, 'year').year();
+}
+
 function chronologically(first: string, second: string) {
     return dayjs(first).isAfter(second) ? -1 : 1;
 }
@@ -25,7 +30,11 @@ export class NotificationsComponent {
     readonly hasUnreadNotifications$: Observable<boolean>;
     readonly groupedNotifications$: Observable<NotificationsGroup[]>;
 
-    constructor(private readonly _notificationsService: NotificationsService, private readonly _datePipe: DatePipe) {
+    constructor(
+        private readonly _notificationsService: NotificationsService,
+        private readonly _datePipe: DatePipe,
+        private readonly _translateService: TranslateService,
+    ) {
         this.groupedNotifications$ = this._notificationsService.all$.pipe(map(notifications => this.#groupNotifications(notifications)));
         this.hasUnreadNotifications$ = this.#hasUnreadNotifications$;
     }
@@ -51,12 +60,21 @@ export class NotificationsComponent {
     }
 
     #groupNotifications(notifications: Notification[]): NotificationsGroup[] {
-        const grouped = [
-            ...notifications.groupBy(n => (isToday(n.creationDate) ? n.creationDate : n.creationDate.split('T')[0])).entries(),
-        ];
+        const todayTranslation = this._translateService.instant('today');
+        const groupedMap = notifications.groupBy(n => {
+            if (isOlderThan(n.creationDate, 2)) {
+                return dayjs(n.creationDate).year().toString();
+            } else if (isOlderThan(n.creationDate, 1)) {
+                return dayjs(n.creationDate).format('YYYY-MM');
+            }
+
+            return n.creationDate.split('T')[0];
+        });
+
+        const grouped = [...groupedMap.entries()];
         const sorted = grouped.sort(([aDate], [bDate]) => chronologically(aDate, bDate));
         return sorted.map(([date, _notifications]) => ({
-            date: this._datePipe.transform(date, 'sophisticatedDate'),
+            date: isToday(date) ? todayTranslation : this._datePipe.transform(date, 'sophisticatedDate'),
             notifications: _notifications.sort((a, b) => chronologically(a.creationDate, b.creationDate)),
         }));
     }
diff --git a/apps/red-ui/src/app/services/notifications.service.ts b/apps/red-ui/src/app/services/notifications.service.ts
index 86d468ba5..b4187e969 100644
--- a/apps/red-ui/src/app/services/notifications.service.ts
+++ b/apps/red-ui/src/app/services/notifications.service.ts
@@ -7,7 +7,6 @@ import { map, switchMap, tap } from 'rxjs/operators';
 import { notificationsTranslations } from '@translations/notifications-translations';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { UserService } from '@users/user.service';
-import dayjs from 'dayjs';
 import { CHANGED_CHECK_INTERVAL } from '@utils/constants';
 import { DossiersCacheService } from './dossiers/dossiers-cache.service';
 
@@ -71,12 +70,7 @@ export class NotificationsService extends EntitiesService<INotification, Notific
 
     private _new(notification: INotification) {
         const message = this._translate(notification, notificationsTranslations[notification.notificationType] as string);
-        const time = this._getTime(notification.creationDate);
-        return new Notification(notification, message, time);
-    }
-
-    private _getTime(date: string): string {
-        return dayjs(date).format('hh:mm A');
+        return new Notification(notification, message);
     }
 
     private _translate(notification: INotification, translation: string): string {
diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index f8477d735..c87a21c93 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -2057,6 +2057,7 @@
     "less-than-an-hour": "< 1 Stunde",
     "no-time-left": "Frist für Wiederherstellung verstrichen"
   },
+  "today": "",
   "toggle-auto-analysis-message": {
     "error": "",
     "success": ""
diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json
index 32a57e514..2c29a6d3c 100644
--- a/apps/red-ui/src/assets/i18n/redact/en.json
+++ b/apps/red-ui/src/assets/i18n/redact/en.json
@@ -2057,6 +2057,7 @@
     "less-than-an-hour": "< 1 hour",
     "no-time-left": "Time to restore already passed"
   },
+  "today": "Today",
   "toggle-auto-analysis-message": {
     "error": "Something went wrong.",
     "success": "{toggleOperation} automatic processing."
diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json
index 764960042..29b71265d 100644
--- a/apps/red-ui/src/assets/i18n/scm/de.json
+++ b/apps/red-ui/src/assets/i18n/scm/de.json
@@ -2057,6 +2057,7 @@
     "less-than-an-hour": "< 1 Stunde",
     "no-time-left": "Frist für Wiederherstellung verstrichen"
   },
+  "today": "",
   "toggle-auto-analysis-message": {
     "error": "",
     "success": ""
diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json
index d7258c40f..819404810 100644
--- a/apps/red-ui/src/assets/i18n/scm/en.json
+++ b/apps/red-ui/src/assets/i18n/scm/en.json
@@ -2057,6 +2057,7 @@
     "less-than-an-hour": "< 1 hour",
     "no-time-left": "Time to restore already passed"
   },
+  "today": "Today",
   "toggle-auto-analysis-message": {
     "error": "Something went wrong.",
     "success": "{toggleOperation} automatic processing."
diff --git a/libs/red-domain/src/lib/notifications/notification.model.ts b/libs/red-domain/src/lib/notifications/notification.model.ts
index e5e35502b..200c519a9 100644
--- a/libs/red-domain/src/lib/notifications/notification.model.ts
+++ b/libs/red-domain/src/lib/notifications/notification.model.ts
@@ -14,7 +14,7 @@ export class Notification implements INotification, IListable {
     readonly userId: string;
     readonly id: string;
 
-    constructor(notification: INotification, readonly message: string, readonly time: string) {
+    constructor(notification: INotification, readonly message: string) {
         this.creationDate = notification.creationDate;
         this.issuerId = notification.issuerId;
         this.notificationDetails = notification.notificationDetails;