feat: show outgoing notifications (DAP-4770, DAP-4771, DAP-4772) (#35)

Co-authored-by: Lisofffa <lisofffa@gmail.com>

Author: alsakhaev

libs/backend/src/config.ts

@@ -33,9 +33,9 @@ export const NearConfigs: { [networkId: string]: NearConfig } = {
       ear: 'bos.dapplets.near/widget/ContextActionsGroup',
     },
     timeReference: {
-      timestamp: 1731150806896,
-      height: 132297337,
-      avgBlockTime: 1122, // https://nearblocks.io/
+      timestamp: 1733844432230,
+      height: 134671239,
+      avgBlockTime: 1091, // https://nearblocks.io/
     },
   },
   testnet: {
@@ -50,8 +50,8 @@ export const NearConfigs: { [networkId: string]: NearConfig } = {
       ear: 'bos.dapplets.testnet/widget/ContextActionsGroup',
     },
     timeReference: {
-      timestamp: 1731150806896,
-      height: 179057513,
+      timestamp: 1733844492601,
+      height: 181770025,
       avgBlockTime: 1000, // https://testnet.nearblocks.io/
     },
   },

libs/backend/src/index.ts

@@ -35,6 +35,8 @@ export {
   PullRequestResult,
   PullRequestStatus,
 } from './services/notification/types/pull-request'
+export { PullRequestAcceptedPayload } from './services/notification/types/pull-request-accepted'
+export { PullRequestRejectedPayload } from './services/notification/types/pull-request-rejected'
 export { RegularPayload } from './services/notification/types/regular'
 
 // ToDo: replace with DTO

libs/backend/src/services/base/base.repository.ts

@@ -270,9 +270,12 @@ export class BaseRepository<T extends Base> implements IRepository<T> {
       throw new Error('User is not logged in')
     }
 
+    const id = [authorId, this._entityKey, localId].join(KeyDelimiter)
+
     // @ts-ignore
     const entity: T = this.EntityType.create({
       ...item,
+      id,
       localId,
       authorId,
       source: EntitySourceType.Origin,

libs/backend/src/services/mutation/mutation.service.ts

@@ -257,14 +257,34 @@ export class MutationService {
       Promise.all([
         this._applyChangesToOrigin(sourceMutation, tx),
         this.notificationService.acceptNotification(notificationId, tx),
+        this._notifyAboutAcceptedPullRequest(sourceMutationId, targetMutationId, tx),
       ])
     )
 
     return freshNotification
   }
 
   async rejectPullRequest(notificationId: EntityId): Promise<NotificationDto> {
-    return this.notificationService.rejectNotification(notificationId)
+    const notification = await this.notificationService.getNotification(notificationId)
+
+    if (!notification) {
+      throw new Error('Notification not found')
+    }
+
+    if (notification.type !== NotificationType.PullRequest) {
+      throw new Error('Notification is not a pull request')
+    }
+
+    const { sourceMutationId, targetMutationId } = notification.payload as PullRequestPayload
+
+    const [freshNotification] = await this.unitOfWorkService.runInTransaction((tx) =>
+      Promise.all([
+        this.notificationService.rejectNotification(notificationId, tx),
+        this._notifyAboutRejectedPullRequest(sourceMutationId, targetMutationId, tx),
+      ])
+    )
+
+    return freshNotification
   }
 
   async removeMutationFromRecents(mutationId: MutationId): Promise<void> {
@@ -380,4 +400,44 @@ export class MutationService {
 
     return mutation
   }
+
+  private async _notifyAboutAcceptedPullRequest(
+    sourceMutationId: string,
+    targetMutationId: string,
+    tx?: Transaction
+  ) {
+    const [sourceAuthorId] = sourceMutationId.split('/')
+
+    const notification: NotificationCreateDto = {
+      source: EntitySourceType.Origin,
+      type: NotificationType.PullRequestAccepted,
+      recipients: [sourceAuthorId],
+      payload: {
+        sourceMutationId: sourceMutationId,
+        targetMutationId: targetMutationId,
+      },
+    }
+
+    await this.notificationService.createNotification(notification, tx)
+  }
+
+  private async _notifyAboutRejectedPullRequest(
+    sourceMutationId: string,
+    targetMutationId: string,
+    tx?: Transaction
+  ) {
+    const [sourceAuthorId] = sourceMutationId.split('/')
+
+    const notification: NotificationCreateDto = {
+      source: EntitySourceType.Origin,
+      type: NotificationType.PullRequestRejected,
+      recipients: [sourceAuthorId],
+      payload: {
+        sourceMutationId: sourceMutationId,
+        targetMutationId: targetMutationId,
+      },
+    }
+
+    await this.notificationService.createNotification(notification, tx)
+  }
 }

libs/backend/src/services/notification/dtos/notification-create.dto.ts

@@ -2,9 +2,15 @@ import { BaseCreateDto } from '../../base/base-create.dto'
 import { NotificationType } from '../notification.entity'
 import { RegularPayload } from '../types/regular'
 import { PullRequestPayload } from '../types/pull-request'
+import { PullRequestAcceptedPayload } from '../types/pull-request-accepted'
+import { PullRequestRejectedPayload } from '../types/pull-request-rejected'
 
 export type NotificationCreateDto = BaseCreateDto & {
   type: NotificationType
-  payload: RegularPayload | PullRequestPayload
+  payload:
+    | RegularPayload
+    | PullRequestPayload
+    | PullRequestAcceptedPayload
+    | PullRequestRejectedPayload
   recipients: string[]
 }

libs/backend/src/services/notification/dtos/notification.dto.ts

@@ -2,11 +2,18 @@ import { BaseDto } from '../../base/base.dto'
 import { NotificationType } from '../notification.entity'
 import { NotificationStatus } from '../resolution.entity'
 import { PullRequestPayload, PullRequestResult } from '../types/pull-request'
+import { PullRequestAcceptedPayload } from '../types/pull-request-accepted'
+import { PullRequestRejectedPayload } from '../types/pull-request-rejected'
 import { RegularPayload } from '../types/regular'
 
 export type NotificationDto = BaseDto & {
   type: NotificationType
-  payload: RegularPayload | PullRequestPayload | null
+  payload:
+    | RegularPayload
+    | PullRequestPayload
+    | PullRequestAcceptedPayload
+    | PullRequestRejectedPayload
+    | null
   recipients: string[]
   status: NotificationStatus
   result: PullRequestResult | null

libs/backend/src/services/notification/notification.entity.ts

@@ -3,10 +3,14 @@ import { Entity } from '../base/decorators/entity'
 import { Column, ColumnType } from '../base/decorators/column'
 import { RegularPayload } from './types/regular'
 import { PullRequestPayload } from './types/pull-request'
+import { PullRequestAcceptedPayload } from './types/pull-request-accepted'
+import { PullRequestRejectedPayload } from './types/pull-request-rejected'
 
 export enum NotificationType {
   Regular = 'regular',
   PullRequest = 'pull-request',
+  PullRequestAccepted = 'pull-request-accepted',
+  PullRequestRejected = 'pull-request-rejected',
   Unknown = 'unknown', // ToDo: workaround to construct Notification
 }
 
@@ -16,7 +20,12 @@ export class Notification extends Base {
   type: NotificationType = NotificationType.Unknown
 
   @Column({ type: ColumnType.Json })
-  payload: RegularPayload | PullRequestPayload | null = null
+  payload:
+    | RegularPayload
+    | PullRequestPayload
+    | PullRequestAcceptedPayload
+    | PullRequestRejectedPayload
+    | null = null
 
   @Column({ type: ColumnType.Set })
   recipients: string[] = []

libs/backend/src/services/notification/notification.service.ts

@@ -1,4 +1,4 @@
-import { EntityId } from '../base/base.entity'
+import { EntityId, EntitySourceType } from '../base/base.entity'
 import { NearSigner } from '../near-signer/near-signer.service'
 import { Transaction } from '../unit-of-work/transaction'
 import { UserLinkService } from '../user-link/user-link.service'
@@ -11,6 +11,8 @@ import { UnitOfWorkService } from '../unit-of-work/unit-of-work.service'
 import { generateGuid } from '../../common/generate-guid'
 import { IRepository } from '../base/repository.interface'
 
+const KeyDelimiter = '/'
+
 export class NotificationService {
   constructor(
     private notificationRepository: IRepository<Notification>,
@@ -38,20 +40,32 @@ export class NotificationService {
 
   // ToDo: move DTOs to controllers?
 
-  async getNotificationsByRecipient(recipientId: string): Promise<NotificationDto[]> {
-    if (!recipientId) return []
+  async getMyNotifications(accountId: string): Promise<NotificationDto[]> {
+    if (!accountId) return []
+
+    const incomingNotifications = await this.notificationRepository.getItemsByIndex({
+      recipients: [accountId],
+    })
 
-    const notifications = await this.notificationRepository.getItemsByIndex({
-      recipients: [recipientId],
+    const outgoingNotifications = await this.notificationRepository.getItems({
+      authorId: accountId,
     })
 
+    const allNotifications = incomingNotifications
+
+    for (const outgoingNotification of outgoingNotifications) {
+      if (!allNotifications.some((n) => n.id === outgoingNotification.id)) {
+        allNotifications.push(outgoingNotification)
+      }
+    }
+
     const resolutions = await Promise.all(
-      notifications.map((notification) =>
-        this._getResolutionForNotification(notification.id, notification.type, recipientId)
+      allNotifications.map((notification) =>
+        this._getResolutionForNotification(notification.id, notification.type, accountId)
       )
     )
 
-    return notifications.map((notification, i) => {
+    return allNotifications.map((notification, i) => {
       const resolution = resolutions[i]
       return this._toDto(notification, resolution)
     })
@@ -72,7 +86,7 @@ export class NotificationService {
   }
 
   async viewAllNotifcations(recipientId: string): Promise<NotificationDto[]> {
-    const notifications = await this.getNotificationsByRecipient(recipientId)
+    const notifications = await this.getMyNotifications(recipientId)
 
     const notificationsToBeViewed = notifications.filter(
       (notification) => notification.status === NotificationStatus.New
@@ -184,9 +198,10 @@ export class NotificationService {
       throw new Error('Not logged in')
     }
 
-    if (!notification.recipients.includes(accountId)) {
-      throw new Error('You are not a recipient of this notification')
-    }
+    //todo: commented, but not resolved
+    // if (!notification.recipients.includes(accountId)) {
+    //   throw new Error('You are not a recipient of this notification')
+    // }
 
     const resolution = await this._getResolutionForNotification(
       notification.id,
@@ -205,10 +220,11 @@ export class NotificationService {
   private async _getResolutionForNotification(
     notificationId: EntityId,
     notificationType: NotificationType,
-    accountId: string
+    recipientId: string
   ): Promise<Resolution> {
+    const [senderId] = notificationId.split(KeyDelimiter)
     const hash = UserLinkService._hashString(notificationId)
-    const resolutionId = `${accountId}/resolution/${hash}`
+    const resolutionId = `${recipientId}/resolution/${hash}`
 
     const resolution = await this.resolutionRepository.getItem({ id: resolutionId })
 
@@ -221,15 +237,19 @@ export class NotificationService {
       case NotificationType.PullRequest:
         return Resolution.create({
           id: resolutionId,
-          status: NotificationStatus.New,
+          source: EntitySourceType.Origin,
+          // ToDo: outgoing notifications are viewed by default
+          status: recipientId === senderId ? NotificationStatus.Viewed : NotificationStatus.New,
           result: { status: PullRequestStatus.Open },
         })
 
       case NotificationType.Regular:
       default:
         return Resolution.create({
           id: resolutionId,
-          status: NotificationStatus.New,
+          source: EntitySourceType.Origin,
+          // ToDo: outgoing notifications are viewed by default
+          status: recipientId === senderId ? NotificationStatus.Viewed : NotificationStatus.New,
         })
     }
   }

libs/backend/src/services/notification/types/pull-request-accepted.ts

@@ -0,0 +1,4 @@
+export type PullRequestAcceptedPayload = {
+  sourceMutationId: string // nikter.near/mutation/Sandbox
+  targetMutationId: string // dapplets.near/mutation/Sandbox
+}

libs/backend/src/services/notification/types/pull-request-rejected.ts

@@ -0,0 +1,4 @@
+export type PullRequestRejectedPayload = {
+  sourceMutationId: string // nikter.near/mutation/Sandbox
+  targetMutationId: string // dapplets.near/mutation/Sandbox
+}