update: add new field for subscription of user when purchased

src/modules/users/entities/user-group.entity.ts

@@ -2,7 +2,6 @@ import { Column, Entity, JoinTable, ManyToMany, OneToMany } from "typeorm";
 
 import { User } from "./user.entity";
 import { BaseEntity } from "../../../common/entities/base.entity";
-import { Announcement } from "../../announcements/entities/announcement.entity";
 import { TicketCategory } from "../../tickets/entities/ticket-category.entity";
 
 @Entity()
@@ -17,9 +16,9 @@ export class UserGroup extends BaseEntity {
   @JoinTable()
   users: User[];
 
-  @ManyToMany(() => Announcement, (announcement) => announcement.targetGroups)
-  @JoinTable()
-  announcements: Announcement[];
+  // @ManyToMany(() => Announcement, (announcement) => announcement.targetGroups)
+  // @JoinTable()
+  // announcements: Announcement[];
 
   @OneToMany(() => TicketCategory, (ticketCategory) => ticketCategory.group)
   ticketCategories: TicketCategory[];

src/modules/users/entities/user.entity.ts

@@ -8,7 +8,6 @@ import { UserGroup } from "./user-group.entity";
 import { BaseEntity } from "../../../common/entities/base.entity";
 import { Address } from "../../address/entities/address.entity";
 import { City } from "../../address/entities/city.entity";
-import { Announcement } from "../../announcements/entities/announcement.entity";
 import { UserAnnouncement } from "../../announcements/entities/user-announcement.entity";
 import { Criticism } from "../../criticisms/entities/criticism.entity";
 import { DanakServiceReview } from "../../danak-services/entities/danak-service-review.entity";
@@ -90,9 +89,6 @@ export class User extends BaseEntity {
   @OneToMany(() => Criticism, (criticism) => criticism.user)
   criticisms: Criticism[];
 
-  @OneToMany(() => UserAnnouncement, (userAnnouncement) => userAnnouncement.user)
-  userAnnouncements: UserAnnouncement[];
-
   @OneToMany(() => UserSetting, (settings) => settings.user, { nullable: false })
   settings: UserSetting;
 
@@ -130,8 +126,8 @@ export class User extends BaseEntity {
   @ManyToMany(() => UsageDiscount, (usageDiscount) => usageDiscount.users)
   usageDiscounts: UsageDiscount[];
 
-  @ManyToMany(() => Announcement, (announcement) => announcement.users)
-  announcements: Announcement[];
+  @OneToMany(() => UserAnnouncement, (userAnnouncement) => userAnnouncement.user)
+  userAnnouncements: UserAnnouncement[];
 
   @OneToMany(() => UserQuickAccess, (quickAccess) => quickAccess.user)
   quickAccesses: UserQuickAccess[];

src/modules/users/providers/users.service.ts

@@ -374,9 +374,8 @@ export class UsersService {
 
   ///****************************************************** */
 
-  async getUsersByIds(ids: string[]) {
+  async findUsersByIds(ids: string[]) {
     const users = await this.userRepository.find({ where: { id: In(ids) } });
-    if (!users) throw new BadRequestException(UserMessage.USER_NOT_FOUND);
     return users;
   }