change entity names

src/modules/admin/providers/admin.service.ts

@@ -2,14 +2,14 @@ import { ConflictException, Injectable, NotFoundException } from '@nestjs/common
 import { InjectRepository } from '@mikro-orm/nestjs';
 import { EntityRepository } from '@mikro-orm/core';
 import { Admin } from '../entities/admin.entity';
-import { Role } from '../../roles/entities/role.entity';
-import { Restaurant } from '../../restaurants/entities/restaurant.entity';
+import { Role } from '../../../roles/entities/role.entity';
+import { Shop } from ../../..shops/entities/shop.entity';
 import { EntityManager } from '@mikro-orm/postgresql';
-import { CacheService } from '../../utils/cache.service';
-import { CreateMyRestaurantAdminDto } from '../dto/create-my-restaurant-admin.dto';
+import { CacheService } from '../../../utils/cache.service';
+import { CreateMyRestaurantAdminDto } from '../dto/create-my-shop-admin.dto';
 import { UpdateAdminDto } from '../dto/update-admin.dto';
 import { AdminRole } from '../entities/adminRole.entity';
-import { normalizePhone } from '../../utils/phone.util';
+import { normalizePhone } from '../../../utils/phone.util';
 
 @Injectable()
 export class AdminService {
@@ -29,14 +29,14 @@ export class AdminService {
 
   async findById(adminId: string, restId: string): Promise<Admin | null> {
     const admin = await this.adminRepository.findOne(
-      { id: adminId, roles: { restaurant: { id: restId } } },
+      { id: adminId, roles: { shop: { id: restId } } },
       { populate: ['roles', 'roles.role'] },
     );
     return admin;
   }
 
   async findAllByRestaurantId(restId: string): Promise<Admin[]> {
-    return this.adminRepository.find({ roles: { restaurant: { id: restId } } }, { populate: ['roles', 'roles.role'] });
+    return this.adminRepository.find({ roles: { shop: { id: restId } } }, { populate: ['roles', 'roles.role'] });
   }
 
   async createAdminForMyRestaurant(restId: string, dto: CreateMyRestaurantAdminDto) {
@@ -57,19 +57,19 @@ export class AdminService {
     const role = await this.em.findOne(Role, { id: roleId, isSystem: false });
     if (!role) throw new NotFoundException('Role not found');
 
-    const restaurant = await this.em.findOne(Restaurant, { id: restId });
-    if (!restaurant) throw new NotFoundException('Restaurant not found');
+    const shop = await this.em.findOne(Shop, { id: restId });
+    if (!shop) throw new NotFoundException('Shop not found');
 
     let adminRole = await this.adminRoleRepository.findOne({
       admin: admin,
-      restaurant: restaurant,
+      shop: shop,
     });
 
     if (!adminRole) {
       adminRole = this.adminRoleRepository.create({
         admin: admin,
         role,
-        restaurant,
+        shop,
       });
     } else {
       adminRole.role = role;
@@ -97,19 +97,19 @@ export class AdminService {
     const role = await this.em.findOne(Role, { id: roleId });
     if (!role) throw new NotFoundException('Role* not found' + roleId);
 
-    const restaurant = await this.em.findOne(Restaurant, { id: restId });
-    if (!restaurant) throw new NotFoundException('Restaurant not found');
+    const shop = await this.em.findOne(Shop, { id: restId });
+    if (!shop) throw new NotFoundException('Shop not found');
 
     let adminRole = await this.adminRoleRepository.findOne({
       admin: admin,
-      restaurant: restaurant,
+      shop: shop,
     });
 
     if (!adminRole) {
       adminRole = this.adminRoleRepository.create({
         admin: admin,
         role,
-        restaurant,
+        shop,
       });
     } else {
       adminRole.role = role;
@@ -120,16 +120,16 @@ export class AdminService {
   }
 
   async getAdminsForRestaurantBySuperAdmin(restId: string): Promise<Admin[]> {
-    const restaurant = await this.em.findOne(Restaurant, { id: restId });
-    if (!restaurant) throw new NotFoundException('Restaurant not found');
+    const shop = await this.em.findOne(Shop, { id: restId });
+    if (!shop) throw new NotFoundException('Shop not found');
 
-    return this.adminRepository.find({ roles: { restaurant: restaurant } }, { populate: ['roles', 'roles.role'] });
+    return this.adminRepository.find({ roles: { shop: shop } }, { populate: ['roles', 'roles.role'] });
   }
 
   async update(adminId: string, restId: string, dto: UpdateAdminDto): Promise<Admin> {
     const admin = await this.adminRepository.findOne(
-      { id: adminId, roles: { restaurant: { id: restId } } },
-      { populate: ['roles', 'roles.role', 'roles.restaurant'] },
+      { id: adminId, roles: { shop: { id: restId } } },
+      { populate: ['roles', 'roles.role', 'roles.shop'] },
     );
 
     if (!admin) {
@@ -161,23 +161,23 @@ export class AdminService {
         throw new NotFoundException('Role not found');
       }
 
-      // Find existing AdminRole for this admin and restaurant
+      // Find existing AdminRole for this admin and shop
       const existingAdminRole = await this.em.findOne(AdminRole, {
         admin: { id: adminId },
-        restaurant: { id: restId },
+        shop: { id: restId },
       });
 
       if (existingAdminRole) {
         // Update existing role
         existingAdminRole.role = role;
       } else {
-        const restaurant = await this.em.findOne(Restaurant, { id: restId });
-        if (!restaurant) throw new NotFoundException('Restaurant not found');
+        const shop = await this.em.findOne(Shop, { id: restId });
+        if (!shop) throw new NotFoundException('Shop not found');
         // Create new AdminRole
         const newAdminRole = this.em.create(AdminRole, {
           admin,
           role,
-          restaurant,
+          shop,
         });
         admin.roles.add(newAdminRole);
       }
@@ -188,7 +188,7 @@ export class AdminService {
   }
 
   async remove(adminId: string, restId: string): Promise<void> {
-    const adminRole = await this.adminRoleRepository.findOne({ admin: { id: adminId }, restaurant: { id: restId } });
+    const adminRole = await this.adminRoleRepository.findOne({ admin: { id: adminId }, shop: { id: restId } });
     if (!adminRole) {
       throw new NotFoundException('Admin role not found');
     }