refactor user accounts structure

This commit is contained in:
2026-03-16 00:33:40 +03:30
parent d2215b9f04
commit 0ad6a3200e
118 changed files with 18774 additions and 8764 deletions
@@ -1,5 +1,3 @@
import { PasswordUtil } from '@/common/utils/password.util'
import { AccountStatus } from '@/generated/prisma/enums'
import { PrismaService } from '@/prisma/prisma.service'
import { Injectable } from '@nestjs/common'
import { ResponseMapper } from 'common/response/response-mapper'
@@ -10,42 +8,37 @@ export class AccountsService {
constructor(private readonly prisma: PrismaService) {}
async findAll(userId: string) {
const accounts = await this.prisma.account.findMany({
where: { user_id: userId },
omit: { password: true, user_id: true },
})
return ResponseMapper.list(accounts)
console.log('first')
// const accounts = await this.prisma.account.findMany({
// where: { user_id: userId },
// omit: { password: true, user_id: true },
// })
return ResponseMapper.list([])
}
async findOne(id: string) {
const account = await this.prisma.account.findUnique({
where: { id },
omit: { password: true, user_id: true },
include: {
pos: true,
business: true,
provider: true,
partner: true,
},
})
return ResponseMapper.single(account)
// const account = await this.prisma.account.findUnique({
// where: { id },
// omit: { password: true, user_id: true },
// })
return ResponseMapper.single({})
}
async create(userId: string, data: CreateAccountDto) {
// Assuming password hashing is handled elsewhere or add bcrypt here
const account = await this.prisma.account.create({
data: {
...data,
password: await PasswordUtil.hash(data.password),
status: AccountStatus.ACTIVE,
user: {
connect: {
id: userId,
},
},
},
})
return ResponseMapper.create(account)
// const account = await this.prisma.account.create({
// data: {
// ...data,
// password: await PasswordUtil.hash(data.password),
// status: AccountStatus.ACTIVE,
// user: {
// connect: {
// id: userId,
// },
// },
// },
// })
return ResponseMapper.create({})
}
async update(id: string, data: UpdateAccountDto) {
@@ -1,35 +1,24 @@
import { ApiProperty, PartialType } from '@nestjs/swagger'
import { IsEnum, IsOptional, IsString } from 'class-validator'
import { AccountStatus, AccountType } from 'generated/prisma/enums'
export class CreateAccountDto {
@IsString()
@ApiProperty()
username: string
@IsEnum(AccountType)
type: AccountType
@IsString()
@ApiProperty()
password: string
@IsEnum(AccountType)
@ApiProperty({ enum: AccountType })
type: AccountType
}
export class UpdateAccountDto {
@IsOptional()
@IsString()
username?: string
@IsOptional()
@IsEnum(AccountType)
type?: AccountType
export class UpdateAccountDto extends PartialType(CreateAccountDto) {
@IsOptional()
@IsEnum(AccountStatus)
@ApiProperty({ enum: AccountStatus })
status?: AccountStatus
@IsOptional()
@IsString()
password?: string
@IsOptional()
@IsString()
user_id?: string
}
@@ -0,0 +1,24 @@
import { ApiProperty, PartialType } from '@nestjs/swagger'
import { IsEnum, IsOptional, IsString } from 'class-validator'
import { AccountStatus, AccountType } from 'generated/prisma/enums'
export class CreateAccountDto {
@IsString()
@ApiProperty()
username: string
@IsString()
@ApiProperty()
password: string
@IsEnum(AccountType)
@ApiProperty({ enum: AccountType })
type: AccountType
}
export class UpdateAccountDto extends PartialType(CreateAccountDto) {
@IsOptional()
@IsEnum(AccountStatus)
@ApiProperty({ enum: AccountStatus })
status?: AccountStatus
}
@@ -0,0 +1,20 @@
import { Body, Controller, Get, Param, Post } from '@nestjs/common'
import { ApiTags } from '@nestjs/swagger'
import { CreateAccountDto } from './dto/permission.dto'
import { AccountsService } from './permissions.service'
@ApiTags('AdminAccounts')
@Controller('admin/users/:userId/accounts/:accountId/permissions')
export class AccountPermissionsController {
constructor(private readonly service: AccountsService) {}
@Get()
async findAll(@Param('userId') userId: string, @Param('accountId') accountId: string) {
return this.service.findAll(userId, accountId)
}
@Post()
async create(@Param('userId') userId: string, @Body() data: CreateAccountDto) {
return this.service.create(userId, data)
}
}
@@ -0,0 +1,12 @@
import { PrismaModule } from '@/prisma/prisma.module'
import { Module } from '@nestjs/common'
import { AccountPermissionsController } from './permissions.controller'
import { AccountsService } from './permissions.service'
@Module({
imports: [PrismaModule],
controllers: [AccountPermissionsController],
providers: [AccountsService],
exports: [AccountsService],
})
export class AdminAccountPermissionsModule {}
@@ -0,0 +1,116 @@
import { PrismaService } from '@/prisma/prisma.service'
import { Injectable } from '@nestjs/common'
import { ResponseMapper } from 'common/response/response-mapper'
import { CreateAccountDto } from './dto/permission.dto'
@Injectable()
export class AccountsService {
constructor(private readonly prisma: PrismaService) {}
async findAll(userId: string, account_id: string) {
const businessActivities = await this.prisma.businessActivity.findMany({
where: {
user_id: userId,
},
select: {
id: true,
name: true,
complexes: {
select: {
id: true,
name: true,
pos_list: {
select: {
id: true,
name: true,
},
},
},
},
},
})
const permissions = await this.prisma.permissionConsumer.findMany({
where: {
account_id,
},
select: {
posPermissions: {
select: {
pos_id: true,
role: true,
},
},
businessPermissions: {
select: {
business_id: true,
role: true,
},
},
complexPermissions: {
select: {
complex_id: true,
role: true,
},
},
},
})
const businesses = [] as any
const complexes = [] as any
const poses = [] as any
businessActivities.forEach(businessActivity => {
businesses.push({
id: businessActivity.id,
name: businessActivity.name,
hasAccess: false,
role: null,
})
businessActivity.complexes.forEach(complex => {
complexes.push({
id: complex.id,
name: complex.name,
hasAccess: false,
role: null,
})
complex.pos_list.forEach(pos => {
poses.push({
id: pos.id,
name: pos.name,
hasAccess: false,
role: null,
})
})
})
})
permissions.forEach(permission => {
permission.posPermissions.forEach(posPermission => {
poses.map(pos => {
if (pos.id === posPermission.pos_id) {
return {
...pos,
role: posPermission.role,
hasAccess: true,
}
}
return pos
})
})
})
}
async findOne(id: string) {
const account = await this.prisma.account.findUnique({
where: { id },
})
return ResponseMapper.single(account)
}
async create(userId: string, data: CreateAccountDto) {
return ResponseMapper.create({})
}
}
@@ -1,57 +0,0 @@
import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common'
import { ApiTags } from '@nestjs/swagger'
import { BusinessActivityAccountsService } from './accounts.service'
import { CreateAccountDto, UpdateAccountDto } from './dto/account.dto'
@ApiTags('AdminAccounts')
@Controller('admin/users/:userId/business_activities/:businessActivityId/accounts')
export class BusinessActivityAccountsController {
constructor(
private readonly businessActivityAccountsService: BusinessActivityAccountsService,
) {}
@Get()
async findAll(
@Param('userId') userId: string,
@Param('businessActivityId') businessActivityId: string,
) {
return this.businessActivityAccountsService.findAll(userId, businessActivityId)
}
@Get(':id')
async findOne(
@Param('id') id: string,
@Param('businessActivityId') businessActivityId: string,
) {
return this.businessActivityAccountsService.findOne(id, businessActivityId)
}
@Post()
async create(
@Param('userId') userId: string,
@Param('businessActivityId') businessActivityId: string,
@Body() data: CreateAccountDto,
) {
return this.businessActivityAccountsService.create(userId, businessActivityId, data)
}
@Patch(':id')
async update(
@Param('userId') userId: string,
@Param('businessActivityId') businessActivityId: string,
@Param('id') id: string,
@Body() data: UpdateAccountDto,
) {
return this.businessActivityAccountsService.update(
userId,
businessActivityId,
id,
data,
)
}
// @Delete(':id')
// async delete(@Param('id') id: string) {
// return this.businessActivityAccountsService.delete(id)
// }
}
@@ -1,12 +0,0 @@
import { PrismaModule } from '@/prisma/prisma.module'
import { Module } from '@nestjs/common'
import { BusinessActivityAccountsController } from './accounts.controller'
import { BusinessActivityAccountsService } from './accounts.service'
@Module({
imports: [PrismaModule],
controllers: [BusinessActivityAccountsController],
providers: [BusinessActivityAccountsService],
exports: [BusinessActivityAccountsService],
})
export class AdminUserBusinessActivityAccountsModule {}
@@ -1,77 +0,0 @@
import { PasswordUtil } from '@/common/utils/password.util'
import { AccountStatus, AccountType } from '@/generated/prisma/enums'
import { PrismaService } from '@/prisma/prisma.service'
import { Injectable } from '@nestjs/common'
import { ResponseMapper } from 'common/response/response-mapper'
import { CreateAccountDto, UpdateAccountDto } from './dto/account.dto'
@Injectable()
export class BusinessActivityAccountsService {
constructor(private readonly prisma: PrismaService) {}
async findAll(userId: string, business_id: string) {
const accounts = await this.prisma.account.findMany({
where: { user_id: userId, business_id },
select: {
id: true,
username: true,
status: true,
},
})
return ResponseMapper.list(accounts)
}
async findOne(business_id: string, id: string) {
const account = await this.prisma.account.findUnique({
where: { business_id, id },
select: {
id: true,
username: true,
status: true,
},
})
return ResponseMapper.single(account)
}
async create(userId: string, business_id: string, data: CreateAccountDto) {
// Assuming password hashing is handled elsewhere or add bcrypt here
const account = await this.prisma.account.create({
data: {
...data,
password: await PasswordUtil.hash(data.password),
status: AccountStatus.ACTIVE,
type: AccountType.BUSINESS,
user: {
connect: {
id: userId,
},
},
business: {
connect: {
id: business_id,
},
},
},
})
return ResponseMapper.create(account)
}
async update(user_id: string, business_id: string, id: string, data: UpdateAccountDto) {
const account = await this.prisma.account.update({
where: {
user_id_business_id: {
user_id,
business_id,
},
id,
},
data,
})
return ResponseMapper.update(account)
}
async delete(id: string) {
await this.prisma.account.delete({ where: { id } })
return ResponseMapper.delete()
}
}
@@ -1,28 +0,0 @@
import { IsEnum, IsOptional, IsString } from 'class-validator'
import { AccountStatus } from 'generated/prisma/enums'
export class CreateAccountDto {
@IsString()
username: string
@IsString()
password: string
}
export class UpdateAccountDto {
@IsOptional()
@IsString()
username?: string
@IsOptional()
@IsEnum(AccountStatus)
status?: AccountStatus
@IsOptional()
@IsString()
password?: string
@IsOptional()
@IsString()
user_id?: string
}
@@ -1,40 +0,0 @@
import { Body, Controller, Get, Param, Post } from '@nestjs/common'
import { BusinessActivitiesService } from './business-activities.service'
import { CreateBusinessActivitiesDto } from './dto/create-business-activities.dto'
@Controller('admin/users/:userId/business_activities')
export class BusinessActivitiesController {
constructor(private readonly businessActivitiesService: BusinessActivitiesService) {}
@Get()
async findAll(@Param('userId') userId: string) {
return this.businessActivitiesService.findAll(userId)
}
@Get(':id')
async findOne(@Param('userId') userId: string, @Param('id') id: string) {
return this.businessActivitiesService.findOne(userId, id)
}
@Post()
async create(
@Param('userId') userId: string,
@Body() data: CreateBusinessActivitiesDto,
) {
return this.businessActivitiesService.create(userId, data)
}
// @Put(':id')
// async update(
// @Param('userId') userId: string,
// @Param('id') id: string,
// @Body() data: UpdateBusinessActivityDto,
// ) {
// return this.businessActivitiesService.update(userId, id, data)
// }
// @Delete(':id')
// async delete(@Param('id') id: string) {
// return this.businessActivitiesService.delete(id)
// }
}
@@ -1,12 +0,0 @@
import { PrismaModule } from '@/prisma/prisma.module'
import { Module } from '@nestjs/common'
import { BusinessActivitiesController } from './business-activities.controller'
import { BusinessActivitiesService } from './business-activities.service'
import { AdminBusinessActivityComplexesModule } from './complexes/complexes.module'
@Module({
imports: [PrismaModule, AdminBusinessActivityComplexesModule],
controllers: [BusinessActivitiesController],
providers: [BusinessActivitiesService],
})
export class AdminUserBusinessActivitiesModule {}
@@ -1,75 +0,0 @@
import { BusinessActivitySelect } from '@/generated/prisma/models'
import { PrismaService } from '@/prisma/prisma.service'
import { Injectable } from '@nestjs/common'
import { ResponseMapper } from 'common/response/response-mapper'
import { CreateBusinessActivitiesDto } from './dto/create-business-activities.dto'
@Injectable()
export class BusinessActivitiesService {
constructor(private readonly prisma: PrismaService) {}
defaultSelect = {
guild: {
select: {
id: true,
code: true,
name: true,
},
},
id: true,
name: true,
created_at: true,
} as BusinessActivitySelect
async findAll(userId: string) {
const businessActivities = await this.prisma.businessActivity.findMany({
where: {
owner_id: userId,
},
select: this.defaultSelect,
})
return ResponseMapper.list(businessActivities)
}
async findOne(userId: string, id: string) {
const businessActivity = await this.prisma.businessActivity.findUnique({
where: { owner_id: userId, id },
select: this.defaultSelect,
})
return ResponseMapper.single(businessActivity)
}
async create(userId: string, data: CreateBusinessActivitiesDto) {
const businessActivity = await this.prisma.businessActivity.create({
data: {
name: data.name,
guild: {
connect: {
id: data.guild_id,
},
},
user: {
connect: {
id: userId,
},
},
},
select: this.defaultSelect,
})
return ResponseMapper.create(businessActivity)
}
async update(id: string, data: any) {
const businessActivity = await this.prisma.businessActivity.update({
where: { id },
data,
select: this.defaultSelect,
})
return ResponseMapper.update(businessActivity)
}
async delete(id: string) {
await this.prisma.businessActivity.delete({ where: { id } })
return ResponseMapper.delete()
}
}
@@ -1,50 +0,0 @@
import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common'
import { ApiTags } from '@nestjs/swagger'
import { BusinessActivityComplexesService } from './complexes.service'
import { CreateComplexDto, UpdateComplexDto } from './dto/complex.dto'
@ApiTags('AdminBusinessActivityComplexes')
@Controller('admin/users/:userId/business_activities/:businessActivityId/complexes')
export class BusinessActivityComplexesController {
constructor(private readonly service: BusinessActivityComplexesService) {}
@Get()
async findAll(
@Param('userId') userId: string,
@Param('businessActivityId') businessActivityId: string,
) {
return this.service.findAll(userId, businessActivityId)
}
@Get(':id')
async findOne(
@Param('userId') userId: string,
@Param('businessActivityId') businessActivityId: string,
@Param('id') id: string,
) {
return this.service.findOne(userId, businessActivityId, id)
}
@Post()
async create(
@Param('businessActivityId') businessActivityId: string,
@Body() data: CreateComplexDto,
) {
return this.service.create(businessActivityId, data)
}
@Patch(':id')
async update(
@Param('id') id: string,
@Param('userId') userId: string,
@Param('businessActivityId') businessActivityId: string,
@Body() data: UpdateComplexDto,
) {
return this.service.update(userId, businessActivityId, id, data)
}
// @Delete(':id')
// async delete(@Param('id') id: string) {
// return this.businessActivityAccountsService.delete(id)
// }
}
@@ -1,13 +0,0 @@
import { PrismaModule } from '@/prisma/prisma.module'
import { Module } from '@nestjs/common'
import { BusinessActivityComplexesController } from './complexes.controller'
import { BusinessActivityComplexesService } from './complexes.service'
import { AdminComplexPosesModule } from './poses/poses.module'
@Module({
imports: [PrismaModule, AdminComplexPosesModule],
controllers: [BusinessActivityComplexesController],
providers: [BusinessActivityComplexesService],
exports: [BusinessActivityComplexesService],
})
export class AdminBusinessActivityComplexesModule {}
@@ -1,89 +0,0 @@
import { ComplexSelect } from '@/generated/prisma/models'
import { PrismaService } from '@/prisma/prisma.service'
import { Injectable } from '@nestjs/common'
import { ResponseMapper } from 'common/response/response-mapper'
import { CreateComplexDto, UpdateComplexDto } from './dto/complex.dto'
@Injectable()
export class BusinessActivityComplexesService {
constructor(private readonly prisma: PrismaService) {}
defaultSelect = {
id: true,
name: true,
address: true,
tax_id: true,
created_at: true,
} as ComplexSelect
async findAll(user_id: string, business_activity_id: string) {
const accounts = await this.prisma.complex.findMany({
where: {
business_activity: {
id: business_activity_id,
user: {
id: user_id,
},
},
},
select: this.defaultSelect,
})
return ResponseMapper.list(accounts)
}
async findOne(user_id: string, business_activity_id: string, id: string) {
const account = await this.prisma.complex.findUnique({
where: {
business_activity: {
id: business_activity_id,
user: {
id: user_id,
},
},
id,
},
select: this.defaultSelect,
})
return ResponseMapper.single(account)
}
async create(business_id: string, data: CreateComplexDto) {
const account = await this.prisma.complex.create({
data: {
...data,
business_activity: {
connect: {
id: business_id,
},
},
},
})
return ResponseMapper.create(account)
}
async update(
user_id: string,
business_activity_id: string,
id: string,
data: UpdateComplexDto,
) {
const account = await this.prisma.complex.update({
where: {
business_activity: {
id: business_activity_id,
user: {
id: user_id,
},
},
id,
},
data,
})
return ResponseMapper.update(account)
}
// async delete(id: string) {
// await this.prisma.complex.delete({ where: { id } })
// return ResponseMapper.delete()
// }
}
@@ -1,18 +0,0 @@
import { ApiProperty, PartialType } from '@nestjs/swagger'
import { IsString } from 'class-validator'
export class CreateComplexDto {
@IsString()
@ApiProperty({})
name: string
@IsString()
@ApiProperty({})
tax_id: string
@IsString()
@ApiProperty({})
address: string
}
export class UpdateComplexDto extends PartialType(CreateComplexDto) {}
@@ -1,39 +0,0 @@
import { POSStatus, POSType } from '@/generated/prisma/enums'
import { ApiProperty, PartialType } from '@nestjs/swagger'
import { IsEnum, IsOptional, IsString } from 'class-validator'
export class CreatePosDto {
@IsString()
@ApiProperty({})
name: string
@IsString()
@ApiProperty({})
serial: string
// @IsString()
// @IsOptional()
// @ApiProperty({ required: false })
// model: string
@IsEnum(POSType)
@ApiProperty({ enum: POSType })
pos_type: POSType
@IsString()
@IsOptional()
@ApiProperty({})
device_id: string
@IsString()
@IsOptional()
@ApiProperty()
provider_id: string
}
export class UpdatePosDto extends PartialType(CreatePosDto) {
@IsEnum(POSStatus)
@IsOptional()
@ApiProperty({ enum: POSStatus })
status: POSStatus
}
@@ -1,47 +0,0 @@
import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common'
import { ApiTags } from '@nestjs/swagger'
import { CreatePosDto, UpdatePosDto } from './dto/pos.dto'
import { ComplexPosesService } from './poses.service'
@ApiTags('AdminComplexPoses')
@Controller('admin/business_activities/:businessActivityId/complexes/:complexId/poses')
export class ComplexPosesController {
constructor(private readonly service: ComplexPosesService) {}
@Get()
async findAll(
@Param('businessActivityId') businessActivityId: string,
@Param('complexId') complexId: string,
) {
return this.service.findAll(businessActivityId, complexId)
}
@Get(':id')
async findOne(
@Param('businessActivityId') businessActivityId: string,
@Param('complexId') complexId: string,
@Param('id') id: string,
) {
return this.service.findOne(businessActivityId, complexId, id)
}
@Post()
async create(@Param('complexId') complexId: string, @Body() data: CreatePosDto) {
return this.service.create(complexId, data)
}
@Patch(':id')
async update(
@Param('businessActivityId') businessActivityId: string,
@Param('complexId') complexId: string,
@Param('id') id: string,
@Body() data: UpdatePosDto,
) {
return this.service.update(businessActivityId, complexId, id, data)
}
// @Delete(':id')
// async delete(@Param('id') id: string) {
// return this.businessActivityAccountsService.delete(id)
// }
}
@@ -1,12 +0,0 @@
import { PrismaModule } from '@/prisma/prisma.module'
import { Module } from '@nestjs/common'
import { ComplexPosesController } from './poses.controller'
import { ComplexPosesService } from './poses.service'
@Module({
imports: [PrismaModule],
controllers: [ComplexPosesController],
providers: [ComplexPosesService],
exports: [ComplexPosesService],
})
export class AdminComplexPosesModule {}
@@ -1,168 +0,0 @@
import { POSStatus } from '@/generated/prisma/enums'
import { PosCreateInput, PosSelect } from '@/generated/prisma/models'
import { PrismaService } from '@/prisma/prisma.service'
import { Injectable } from '@nestjs/common'
import { ResponseMapper } from 'common/response/response-mapper'
import { CreatePosDto, UpdatePosDto } from './dto/pos.dto'
@Injectable()
export class ComplexPosesService {
constructor(private readonly prisma: PrismaService) {}
defaultSelect = {
id: true,
name: true,
model: true,
serial: true,
status: true,
created_at: true,
pos_type: true,
provider: {
select: {
id: true,
name: true,
},
},
device: {
select: {
name: true,
id: true,
brand: {
select: {
id: true,
name: true,
},
},
},
},
complex: {
select: {
id: true,
name: true,
business_activity: {
select: {
id: true,
name: true,
},
},
},
},
} as PosSelect
defaultInsert = (data: CreatePosDto, complex_id: string) => {
const { device_id, provider_id, ...rest } = data
return {
...rest,
complex: {
connect: {
id: complex_id,
},
},
provider: provider_id
? {
connect: {
id: provider_id,
},
}
: undefined,
device: device_id
? {
connect: {
id: device_id,
},
}
: undefined,
} as PosCreateInput
}
async findAll(business_activity_id: string, complex_id: string) {
const accounts = await this.prisma.pos.findMany({
where: {
complex: {
id: complex_id,
business_activity: {
id: business_activity_id,
},
},
},
select: this.defaultSelect,
})
return ResponseMapper.list(accounts)
}
async findOne(business_activity_id: string, complex_id: string, id: string) {
const account = await this.prisma.pos.findUnique({
where: {
complex: {
id: complex_id,
business_activity: {
id: business_activity_id,
},
},
id,
},
select: this.defaultSelect,
})
return ResponseMapper.single(account)
}
async create(complex_id: string, data: CreatePosDto) {
const account = await this.prisma.pos.create({
data: {
...this.defaultInsert(data, complex_id),
status: POSStatus.ACTIVE,
},
})
return ResponseMapper.create(account)
}
async update(
business_activity_id: string,
complex_id: string,
id: string,
data: UpdatePosDto,
) {
const { device_id, provider_id, ...rest } = data
const account = await this.prisma.pos.update({
where: {
complex: {
id: complex_id,
business_activity: {
id: business_activity_id,
},
},
id,
},
data: {
complex: {
connect: {
id: complex_id,
},
},
provider: provider_id
? {
connect: {
id: provider_id,
},
}
: undefined,
device: device_id
? {
connect: {
id: device_id,
},
}
: undefined,
...rest,
},
})
return ResponseMapper.update(account)
}
// async delete(id: string) {
// await this.prisma.complex.delete({ where: { id } })
// return ResponseMapper.delete()
// }
}
@@ -1,12 +0,0 @@
import { ApiProperty } from '@nestjs/swagger'
import { IsString } from 'class-validator'
export class CreateBusinessActivitiesDto {
@IsString()
@ApiProperty({})
name: string
@IsString()
@ApiProperty({})
guild_id: string
}
@@ -1,4 +0,0 @@
import { PartialType } from '@nestjs/swagger'
import { CreateBusinessActivitiesDto } from './create-business-activities.dto'
export class UpdateBusinessActivityDto extends PartialType(CreateBusinessActivitiesDto) {}
+1 -2
View File
@@ -1,12 +1,11 @@
import { PrismaModule } from '@/prisma/prisma.module'
import { Module } from '@nestjs/common'
import { AdminUserAccountsModule } from './accounts/accounts.module'
import { AdminUserBusinessActivitiesModule } from './business-activities/business-activities.module'
import { AdminUsersController } from './users.controller'
import { AdminUsersService } from './users.service'
@Module({
imports: [PrismaModule, AdminUserAccountsModule, AdminUserBusinessActivitiesModule],
imports: [PrismaModule, AdminUserAccountsModule],
controllers: [AdminUsersController],
providers: [AdminUsersService],
exports: [AdminUserAccountsModule],
+6 -6
View File
@@ -9,8 +9,8 @@ export class AdminUsersService {
async findAll() {
const [users, count] = await this.prisma.$transaction([
this.prisma.user.findMany(),
this.prisma.user.count(),
this.prisma.admin.findMany(),
this.prisma.admin.count(),
])
return ResponseMapper.paginate(
users.map(user => ({ ...user, fullname: `${user.first_name} ${user.last_name}` })),
@@ -19,7 +19,7 @@ export class AdminUsersService {
}
async findOne(id: string) {
const user = await this.prisma.user.findUnique({
const user = await this.prisma.admin.findUnique({
where: { id },
})
@@ -33,14 +33,14 @@ export class AdminUsersService {
}
async create(data: CreateUserDto) {
return this.prisma.user.create({ data })
return this.prisma.admin.create({ data })
}
async update(id: string, data: UpdateUserDto) {
return this.prisma.user.update({ where: { id }, data })
return this.prisma.admin.update({ where: { id }, data })
}
async delete(id: string) {
return this.prisma.user.delete({ where: { id } })
return this.prisma.admin.delete({ where: { id } })
}
}