Merge branch 'dev' into staging
This commit is contained in:
commit
b47a54bdd3
@ -34,8 +34,8 @@ export default class CustomersController extends ApiController {
|
||||
}
|
||||
|
||||
const officeId: string = req.body.user.office_Id;
|
||||
if (query.where?.office_folders) delete query.where.office_folders;
|
||||
const customerWhereInput: Prisma.CustomersWhereInput = { ...query.where, office_folders: { some: { office_uid: officeId } } };
|
||||
if (query.where?.office) delete query.where.office;
|
||||
const customerWhereInput: Prisma.CustomersWhereInput = { ...query.where, office: { uid: officeId } };
|
||||
query.where = customerWhereInput;
|
||||
|
||||
//call service to get prisma entity
|
||||
@ -60,6 +60,8 @@ export default class CustomersController extends ApiController {
|
||||
try {
|
||||
//init IUser resource with request body values
|
||||
const customerEntity = Customer.hydrate<Customer>(req.body);
|
||||
const officeId: string = req.body.user.office_Id;
|
||||
customerEntity.office = { uid: officeId } as any;
|
||||
//validate user
|
||||
try {
|
||||
await validateOrReject(customerEntity, { groups: ["createCustomer"], forbidUnknownValues: false });
|
||||
|
Loading…
x
Reference in New Issue
Block a user