chore: upgrade mongoose version to 7

.cspell.json

@@ -504,6 +504,7 @@
     "errmsg",
     "shelljs",
     "prefiltering",
+    "virtuals",
     "autodocs",
     "stackalt",
     "mediumdark",

apps/api/src/app/change/e2e/promote-changes.e2e.ts

@@ -270,7 +270,7 @@ describe('Promote changes', () => {
 
       const prodVersion = await notificationTemplateRepository.findOne({
         _organizationId: session.organization._id,
-        _notificationId: prodEnv._id,
+        _environmentId: prodEnv._id,
         _parentId: notificationTemplateId,
       });
 

apps/api/src/app/subscribers/e2e/mark-all-subscriber-messages.e2e.ts

@@ -2,14 +2,15 @@ import { expect } from 'chai';
 import axios from 'axios';
 import { ChannelTypeEnum, MarkMessagesAsEnum } from '@novu/shared';
 import { UserSession } from '@novu/testing';
-import { NotificationTemplateEntity, MessageRepository } from '@novu/dal';
+import { NotificationTemplateEntity, MessageRepository, SubscriberRepository } from '@novu/dal';
 
 const axiosInstance = axios.create();
 
 describe('Mark All Subscriber Messages - /subscribers/:subscriberId/messages/mark-all (POST)', function () {
   let session: UserSession;
   let template: NotificationTemplateEntity;
   const messageRepository = new MessageRepository();
+  const subscriberRepository = new SubscriberRepository();
 
   beforeEach(async () => {
     session = new UserSession();
@@ -36,27 +37,29 @@ describe('Mark All Subscriber Messages - /subscribers/:subscriberId/messages/mar
   });
 
   it('should mark all the subscriber messages as read', async function () {
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
+    const subscriberId = session.subscriberId;
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
 
     await session.awaitRunningJobs(template._id);
 
-    const notificationsFeedResponse = await getSubscriberNotifications(session, session.subscriberId);
+    const notificationsFeedResponse = await getSubscriberNotifications(session, subscriberId);
     expect(notificationsFeedResponse.totalCount).to.equal(5);
 
     const messagesMarkedAsReadResponse = await markAllSubscriberMessagesAs(
       session,
-      session.subscriberId,
+      subscriberId,
       MarkMessagesAsEnum.READ
     );
     expect(messagesMarkedAsReadResponse.data).to.equal(5);
 
+    const subscriber = await subscriberRepository.findBySubscriberId(session.environment._id, subscriberId);
     const feed = await messageRepository.find({
       _environmentId: session.environment._id,
-      subscriberId: session.subscriberId,
+      _subscriberId: subscriber?._id,
       channel: ChannelTypeEnum.IN_APP,
       seen: true,
       read: true,
@@ -70,21 +73,23 @@ describe('Mark All Subscriber Messages - /subscribers/:subscriberId/messages/mar
   });
 
   it('should not mark all the messages as read if they are already read', async function () {
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
+    const subscriberId = session.subscriberId;
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
 
     await session.awaitRunningJobs(template._id);
 
-    const notificationsFeedResponse = await getSubscriberNotifications(session, session.subscriberId);
+    const notificationsFeedResponse = await getSubscriberNotifications(session, subscriberId);
     expect(notificationsFeedResponse.totalCount).to.equal(5);
 
+    const subscriber = await subscriberRepository.findBySubscriberId(session.environment._id, subscriberId);
     await messageRepository.update(
       {
         _environmentId: session.environment._id,
-        subscriberId: session.subscriberId,
+        _subscriberId: subscriber?._id,
         channel: ChannelTypeEnum.IN_APP,
         seen: false,
         read: false,
@@ -94,14 +99,14 @@ describe('Mark All Subscriber Messages - /subscribers/:subscriberId/messages/mar
 
     const messagesMarkedAsReadResponse = await markAllSubscriberMessagesAs(
       session,
-      session.subscriberId,
+      subscriberId,
       MarkMessagesAsEnum.READ
     );
     expect(messagesMarkedAsReadResponse.data).to.equal(0);
 
     const feed = await messageRepository.find({
       _environmentId: session.environment._id,
-      subscriberId: session.subscriberId,
+      _subscriberId: subscriber?._id,
       channel: ChannelTypeEnum.IN_APP,
       seen: true,
       read: true,
@@ -115,21 +120,23 @@ describe('Mark All Subscriber Messages - /subscribers/:subscriberId/messages/mar
   });
 
   it('should mark all the subscriber messages as unread', async function () {
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
+    const subscriberId = session.subscriberId;
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
 
     await session.awaitRunningJobs(template._id);
 
-    const notificationsFeedResponse = await getSubscriberNotifications(session, session.subscriberId);
+    const notificationsFeedResponse = await getSubscriberNotifications(session, subscriberId);
     expect(notificationsFeedResponse.totalCount).to.equal(5);
 
+    const subscriber = await subscriberRepository.findBySubscriberId(session.environment._id, subscriberId);
     await messageRepository.update(
       {
         _environmentId: session.environment._id,
-        subscriberId: session.subscriberId,
+        _subscriberId: subscriber?._id,
         channel: ChannelTypeEnum.IN_APP,
         seen: false,
         read: false,
@@ -139,14 +146,14 @@ describe('Mark All Subscriber Messages - /subscribers/:subscriberId/messages/mar
 
     const messagesMarkedAsReadResponse = await markAllSubscriberMessagesAs(
       session,
-      session.subscriberId,
+      subscriberId,
       MarkMessagesAsEnum.UNREAD
     );
     expect(messagesMarkedAsReadResponse.data).to.equal(5);
 
     const feed = await messageRepository.find({
       _environmentId: session.environment._id,
-      subscriberId: session.subscriberId,
+      _subscriberId: subscriber?._id,
       channel: ChannelTypeEnum.IN_APP,
       seen: true,
       read: false,
@@ -160,27 +167,29 @@ describe('Mark All Subscriber Messages - /subscribers/:subscriberId/messages/mar
   });
 
   it('should mark all the subscriber messages as seen', async function () {
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
+    const subscriberId = session.subscriberId;
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
 
     await session.awaitRunningJobs(template._id);
 
-    const notificationsFeedResponse = await getSubscriberNotifications(session, session.subscriberId);
+    const notificationsFeedResponse = await getSubscriberNotifications(session, subscriberId);
     expect(notificationsFeedResponse.totalCount).to.equal(5);
 
     const messagesMarkedAsReadResponse = await markAllSubscriberMessagesAs(
       session,
-      session.subscriberId,
+      subscriberId,
       MarkMessagesAsEnum.SEEN
     );
     expect(messagesMarkedAsReadResponse.data).to.equal(5);
 
+    const subscriber = await subscriberRepository.findBySubscriberId(session.environment._id, subscriberId);
     const feed = await messageRepository.find({
       _environmentId: session.environment._id,
-      subscriberId: session.subscriberId,
+      _subscriberId: subscriber?._id,
       channel: ChannelTypeEnum.IN_APP,
       seen: true,
       read: false,
@@ -194,21 +203,23 @@ describe('Mark All Subscriber Messages - /subscribers/:subscriberId/messages/mar
   });
 
   it('should mark all the subscriber messages as unseen', async function () {
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
-    await session.triggerEvent(template.triggers[0].identifier, session.subscriberId);
+    const subscriberId = session.subscriberId;
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
+    await session.triggerEvent(template.triggers[0].identifier, subscriberId);
 
     await session.awaitRunningJobs(template._id);
 
-    const notificationsFeedResponse = await getSubscriberNotifications(session, session.subscriberId);
+    const notificationsFeedResponse = await getSubscriberNotifications(session, subscriberId);
     expect(notificationsFeedResponse.totalCount).to.equal(5);
 
+    const subscriber = await subscriberRepository.findBySubscriberId(session.environment._id, subscriberId);
     await messageRepository.update(
       {
         _environmentId: session.environment._id,
-        subscriberId: session.subscriberId,
+        _subscriberId: subscriber?._id,
         channel: ChannelTypeEnum.IN_APP,
         seen: false,
         read: false,
@@ -218,14 +229,14 @@ describe('Mark All Subscriber Messages - /subscribers/:subscriberId/messages/mar
 
     const messagesMarkedAsReadResponse = await markAllSubscriberMessagesAs(
       session,
-      session.subscriberId,
+      subscriberId,
       MarkMessagesAsEnum.UNSEEN
     );
     expect(messagesMarkedAsReadResponse.data).to.equal(5);
 
     const feed = await messageRepository.find({
       _environmentId: session.environment._id,
-      subscriberId: session.subscriberId,
+      _subscriberId: subscriber?._id,
       channel: ChannelTypeEnum.IN_APP,
       seen: false,
       read: false,
@@ -256,7 +267,7 @@ async function markAllSubscriberMessagesAs(session: UserSession, subscriberId: s
 }
 
 async function getSubscriberNotifications(session: UserSession, subscriberId: string) {
-  const response = await axios.get(`${session.serverUrl}/v1/subscribers/${session.subscriberId}/notifications/feed`, {
+  const response = await axios.get(`${session.serverUrl}/v1/subscribers/${subscriberId}/notifications/feed`, {
     params: {
       limit: 100,
     },

apps/api/src/app/tenant/usecases/delete-tenant/delete-tenant.usecase.ts

@@ -20,7 +20,7 @@ export class DeleteTenant {
     );
 
     try {
-      return await this.tenantRepository.delete({
+      await this.tenantRepository.delete({
         _environmentId: command.environmentId,
         _organizationId: command.organizationId,
         identifier: command.identifier,

apps/api/src/app/workflows/usecases/create-notification-template/create-notification-template.usecase.ts

@@ -209,7 +209,7 @@ export class CreateNotificationTemplate {
 
       const blueprintFeed = await this.feedRepository.findOne({
         _organizationId: this.getBlueprintOrganizationId,
-        id: step.template._feedId,
+        _id: step.template._feedId,
       });
 
       if (!blueprintFeed) {

apps/web/src/pages/templates/filter/FilterModal.tsx

@@ -75,8 +75,8 @@ export function FilterModal({
 
   function handleOnChildOnChange(index: number) {
     return (data) => {
-      const newField = Object.assign({}, fields[index], { on: data });
-      update(index, newField);
+      const { id: _, ...rest } = fields[index];
+      update(index, { ...rest, on: data });
     };
   }
 

libs/dal/package.json

@@ -40,8 +40,8 @@
     "googleapis": "^60.0.1",
     "intercom-client": "^2.11.0",
     "jsonfile": "^6.0.1",
-    "mongoose": "6.11.3",
-    "mongoose-delete": "^0.5.4",
+    "mongoose": "^7.5.0",
+    "mongoose-delete": "^1.0.1",
     "ng-intercom": "^8.0.2",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",

libs/dal/src/repositories/base-repository.ts

@@ -58,8 +58,13 @@ export class BaseRepository<T_DBModel, T_MappedEntity, T_Enforcement = object> {
     return this.mapEntity(data.toObject());
   }
 
-  async delete(query: FilterQuery<T_DBModel> & T_Enforcement): Promise<void> {
-    return await this.MongooseModel.remove(query);
+  async delete(query: FilterQuery<T_DBModel> & T_Enforcement): Promise<{
+    /** Indicates whether this writes result was acknowledged. If not, then all other members of this result will be undefined. */
+    acknowledged: boolean;
+    /** The number of documents that were deleted */
+    deletedCount: number;
+  }> {
+    return await this.MongooseModel.deleteMany(query);
   }
 
   async find(

libs/dal/src/repositories/feed/feed.repository.ts

@@ -25,7 +25,7 @@ export class FeedRepository extends BaseRepository<FeedDBModel, FeedEntity, Enfo
     );
     if (relatedMessages.length) throw new DalException(`Can not delete feed that has existing message`);
 
-    await this.feed.delete({ _id: feed._id, _environmentId: feed._environmentId });
+    return await this.feed.delete({ _id: feed._id, _environmentId: feed._environmentId });
   }
 
   async findDeleted(query: FilterQuery<FeedEntity>): Promise<FeedEntity> {

libs/dal/src/repositories/integration/integration.repository.ts

@@ -74,7 +74,7 @@ export class IntegrationRepository extends BaseRepository<IntegrationDBModel, In
     const integration = await this.findOne({ _id: query._id, _organizationId: query._organizationId });
     if (!integration) throw new DalException(`Could not find integration with id ${query._id}`);
 
-    await this.integration.delete({ _id: integration._id, _organizationId: integration._organizationId });
+    return await this.integration.delete({ _id: integration._id, _organizationId: integration._organizationId });
   }
 
   async deleteMany(query: IntegrationQuery): Promise<IDeleteResult> {

libs/dal/src/repositories/member/member.repository.ts

@@ -20,8 +20,16 @@ export class MemberRepository extends BaseRepository<MemberDBModel, MemberEntity
     super(Member, MemberEntity);
   }
 
-  async removeMemberById(organizationId: string, memberId: string) {
-    return this.MongooseModel.remove({
+  async removeMemberById(
+    organizationId: string,
+    memberId: string
+  ): Promise<{
+    /** Indicates whether this write result was acknowledged. If not, then all other members of this result will be undefined. */
+    acknowledged: boolean;
+    /** The number of documents that were deleted */
+    deletedCount: number;
+  }> {
+    return this.MongooseModel.deleteOne({
       _id: memberId,
       _organizationId: organizationId,
     });

libs/dal/src/repositories/message-template/message-template.repository.ts

@@ -47,7 +47,10 @@ export class MessageTemplateRepository extends BaseRepository<
       throw new DalException(`Could not find a message template with id ${query._id}`);
     }
 
-    await this.messageTemplate.delete({ _id: messageTemplate._id, _environmentId: messageTemplate._environmentId });
+    return await this.messageTemplate.delete({
+      _id: messageTemplate._id,
+      _environmentId: messageTemplate._environmentId,
+    });
   }
 
   async findDeleted(query: MessageTemplateQuery): Promise<MessageTemplateEntity> {

libs/dal/src/repositories/message/message.repository.ts

@@ -321,7 +321,7 @@ export class MessageRepository extends BaseRepository<MessageDBModel, MessageEnt
       throw new DalException(`Could not find a message with id ${query._id}`);
     }
 
-    await this.message.delete({ _id: message._id, _environmentId: message._environmentId });
+    return await this.message.delete({ _id: message._id, _environmentId: message._environmentId });
   }
 
   async deleteMany(query: MessageQuery) {

libs/dal/src/repositories/notification-template/notification-template.repository.ts

@@ -183,7 +183,8 @@ export class NotificationTemplateRepository extends BaseRepository<
   async delete(query: NotificationTemplateQuery) {
     const item = await this.findOne({ _id: query._id, _environmentId: query._environmentId });
     if (!item) throw new DalException(`Could not find workflow with id ${query._id}`);
-    await this.notificationTemplate.delete({ _id: item._id, _environmentId: item._environmentId });
+
+    return await this.notificationTemplate.delete({ _id: item._id, _environmentId: item._environmentId });
   }
 
   async findDeleted(query: NotificationTemplateQuery): Promise<NotificationTemplateEntity> {

libs/dal/src/repositories/schema-default.options.ts

@@ -1,5 +1,6 @@
 export const schemaOptions = {
   timestamps: true,
+  id: true,
   toJSON: {
     virtuals: true,
   },