Fixed processFindManyQueries to json queries (#19)

Replaced prisma-queries formatter to standard json queries

src/app/api/super-admin/CustomersController.ts

@@ -3,7 +3,6 @@ import { Controller, Get, Post, Put } from "@ControllerPattern/index";
 import ApiController from "@Common/system/controller-pattern/ApiController";
 import CustomersService from "@Services/super-admin/CustomersService/CustomersService";
 import { Service } from "typedi";
-import { processFindManyQuery } from "prisma-query";
 import ObjectHydrate from "@Common/helpers/ObjectHydrate";
 import { Customer } from "le-coffre-resources/dist/SuperAdmin";
 import { Customers } from "@prisma/client";
@@ -24,7 +23,7 @@ export default class CustomersController extends ApiController {
 	protected async get(req: Request, response: Response) {
 		try {
 			//get query
-			const query = processFindManyQuery(req.query);
+			const query = JSON.parse(req.query["q"] as string);
 
 			//call service to get prisma entity
 			const customersEntity: Customers[] = await this.customersService.get(query);

src/app/api/super-admin/DeedTypesController.ts

@@ -3,7 +3,6 @@ import { Controller, Get, Post, Put } from "@ControllerPattern/index";
 import ApiController from "@Common/system/controller-pattern/ApiController";
 import { Service } from "typedi";
 import DeedTypesService from "@Services/super-admin/DeedTypesService/DeedTypesService";
-import { processFindManyQuery } from "prisma-query";
 import { DeedTypes } from "@prisma/client";
 import ObjectHydrate from "@Common/helpers/ObjectHydrate";
 import { DeedType } from "le-coffre-resources/dist/SuperAdmin";
@@ -24,8 +23,7 @@ export default class DeedTypesController extends ApiController {
 	protected async get(req: Request, response: Response) {
 		try {
 			//get query
-			const query = processFindManyQuery(req.query);
-
+			const query = JSON.parse(req.query["q"] as string);
 			//call service to get prisma entity
 			const prismaEntity: DeedTypes[] = await this.deedTypesService.get(query);
 

src/app/api/super-admin/DeedsController.ts

@@ -3,7 +3,6 @@ import { Controller, Get } from "@ControllerPattern/index";
 import ApiController from "@Common/system/controller-pattern/ApiController";
 import DeedsService from "@Services/super-admin/DeedsService/DeedsService";
 import { Service } from "typedi";
-import { processFindManyQuery } from "prisma-query";
 import { Deeds } from "@prisma/client";
 import Deed from "le-coffre-resources/dist/SuperAdmin";
 import ObjectHydrate from "@Common/helpers/ObjectHydrate";
@@ -23,8 +22,7 @@ export default class DeedsController extends ApiController {
 	protected async get(req: Request, response: Response) {
 		try {
 			//get query
-			const query = processFindManyQuery(req.query);
-
+			const query = JSON.parse(req.query["q"] as string);
 			//call service to get prisma entity
 			const prismaEntity: Deeds[] = await this.deedsService.get(query);
 

src/app/api/super-admin/DocumentTypesController.ts

@@ -3,7 +3,6 @@ import { Controller, Get, Post, Put } from "@ControllerPattern/index";
 import ApiController from "@Common/system/controller-pattern/ApiController";
 import { Service } from "typedi";
 import DocumentTypesService from "@Services/super-admin/DocumentTypesService/DocumentTypesService";
-import { processFindManyQuery } from "prisma-query";
 import { DocumentTypes } from "@prisma/client";
 import ObjectHydrate from "@Common/helpers/ObjectHydrate";
 import { DocumentType } from "le-coffre-resources/dist/SuperAdmin";
@@ -25,7 +24,7 @@ export default class DocumentTypesController extends ApiController {
 	protected async get(req: Request, response: Response) {
 		try {
 			//get query
-			const query = processFindManyQuery(req.query);
+			const query = JSON.parse(req.query["q"] as string);
 
 			//call service to get prisma entity
 			const prismaEntity: DocumentTypes[] = await this.documentTypesService.get(query);

src/app/api/super-admin/DocumentsController.ts

@@ -23,7 +23,7 @@ export default class DocumentsController extends ApiController {
 	// protected async get(req: Request, response: Response) {
 	// 	try {
 	// 		//get query
-	// 		const query = processFindManyQuery(req.query);
+	// 		const query = JSON.parse(req.query["q"] as string);
 
 	// 		//call service to get prisma entity
 	// 		const prismaEntity: Documents[] = await this.documentsService.get(query);

src/app/api/super-admin/OfficeFoldersController.ts

@@ -24,7 +24,7 @@ export default class OfficeFoldersController extends ApiController {
 	protected async get(req: Request, response: Response) {
 		try {
 			//get query
-			// const query = processFindManyQuery(req.query);
+			// const query = JSON.parse(req.query["q"] as string);
 			// //call service to get prisma entity
 			// const prismaEntity: OfficeFolders[] = await this.officeFoldersService.get(query);
 			// //Hydrate ressource with prisma entity

src/app/api/super-admin/OfficesController.ts

@@ -3,7 +3,6 @@ import { Controller, Get, Post, Put } from "@ControllerPattern/index";
 import ApiController from "@Common/system/controller-pattern/ApiController";
 import OfficesService from "@Services/super-admin/OfficesService/OfficesService";
 import { Service } from "typedi";
-import { processFindManyQuery } from "prisma-query";
 import { Offices } from "@prisma/client";
 import ObjectHydrate from "@Common/helpers/ObjectHydrate";
 import { Office as OfficeRessource } from "le-coffre-resources/dist/SuperAdmin";
@@ -23,7 +22,7 @@ export default class OfficesController extends ApiController {
 	protected async get(req: Request, response: Response) {
 		try {
 			//get query
-			const query = processFindManyQuery(req.query);
+			const query = JSON.parse(req.query["q"] as string);
 			//call service to get prisma entity
 			const officesEntity: Offices[] = await this.officesService.get(query);
 			//Hydrate ressource with prisma entity

src/app/api/super-admin/UsersController.ts

@@ -6,7 +6,6 @@ import { Service } from "typedi";
 import ObjectHydrate from "@Common/helpers/ObjectHydrate";
 import { validateOrReject } from "class-validator";
 import User from "le-coffre-resources/dist/SuperAdmin";
-import { processFindManyQuery } from "prisma-query";
 import { Users } from "@prisma/client";
 
 @Controller()
@@ -24,7 +23,7 @@ export default class UsersController extends ApiController {
 	protected async get(req: Request, response: Response) {
 		try {
 			//get query
-			const query = processFindManyQuery(req.query);
+			const query = JSON.parse(req.query["q"] as string);
 
 			//call service to get prisma entity
 			const usersEntity: Users[] = await this.usersService.get(query);

src/common/repositories/ContactRepository.ts

@@ -1,7 +1,6 @@
 import Database from "@Common/databases/database";
 import BaseRepository from "@Repositories/BaseRepository";
 import { Service } from "typedi";
-import { processFindManyQuery } from "prisma-query";
 import { Addresses } from "@prisma/client";
 
 @Service()
@@ -19,7 +18,7 @@ export default class AddressesRepository extends BaseRepository {
 	/**
 	 * @description : Find many users
 	 */
-	public async findMany(query: ReturnType<typeof processFindManyQuery>): Promise<Addresses[]> {
+	public async findMany(query: any): Promise<Addresses[]> {
 		query.take = Math.min(query.take || this.defaultFetchRows, this.maxFetchRows);
 		return this.model.findMany(query);
 	}

src/common/repositories/DocumentsRepository.ts

@@ -1,7 +1,6 @@
 import Database from "@Common/databases/database";
 import BaseRepository from "@Repositories/BaseRepository";
 import { Service } from "typedi";
-import { processFindManyQuery } from "prisma-query";
 import { Documents } from "@prisma/client";
 
 @Service()
@@ -19,7 +18,7 @@ export default class DocumentsRepository extends BaseRepository {
 	/**
 	 * @description : Find many users
 	 */
-	public async findMany(query: ReturnType<typeof processFindManyQuery>): Promise<Documents[]> {
+	public async findMany(query: any): Promise<Documents[]> {
 		query.take = Math.min(query.take || this.defaultFetchRows, this.maxFetchRows);
 		return this.model.findMany(query);
 	}

src/common/repositories/OfficeFoldersRepository.ts

@@ -2,7 +2,6 @@ import Database from "@Common/databases/database";
 import { ORMBadQueryError } from "@Common/system/database/exceptions/ORMBadQueryError";
 import BaseRepository from "@Repositories/BaseRepository";
 import { Service } from "typedi";
-import { processFindManyQuery } from "prisma-query";
 import { EFolderStatus, OfficeFolders } from "@prisma/client";
 import { OfficeFolder } from "le-coffre-resources/dist/SuperAdmin";
 
@@ -21,7 +20,7 @@ export default class OfficeFoldersRepository extends BaseRepository {
 	/**
 	 * @description : Find many office folders
 	 */
-	public async findMany(query: ReturnType<typeof processFindManyQuery>): Promise<OfficeFolders[]> {
+	public async findMany(query: any): Promise<OfficeFolders[]> {
 		try {
 			const limit = Math.min(query.take || this.defaultFetchRows, this.maxFetchRows);
 

src/common/repositories/OfficesRepository.ts

@@ -2,7 +2,6 @@ import Database from "@Common/databases/database";
 import { ORMBadQueryError } from "@Common/system/database/exceptions/ORMBadQueryError";
 import BaseRepository from "@Repositories/BaseRepository";
 import { Service } from "typedi";
-import { processFindManyQuery } from "prisma-query";
 import { EOfficeStatus, Offices } from "@prisma/client";
 import { Office as OfficeRessource } from "le-coffre-resources/dist/SuperAdmin";
 
@@ -21,7 +20,7 @@ export default class OfficesRepository extends BaseRepository {
 	/**
 	 * @description : Find many users
 	 */
-	public async findMany(query: ReturnType<typeof processFindManyQuery>): Promise<Offices[]> {
+	public async findMany(query: any): Promise<Offices[]> {
 		try {
 			const limit = Math.min(query.take || this.defaultFetchRows, this.maxFetchRows);
 

src/common/repositories/UsersRepository.ts

@@ -3,7 +3,6 @@ import BaseRepository from "@Repositories/BaseRepository";
 import { Service } from "typedi";
 import { ECivility, Users } from "@prisma/client";
 import User from "le-coffre-resources/dist/SuperAdmin";
-import { processFindManyQuery } from "prisma-query";
 
 @Service()
 export default class UsersRepository extends BaseRepository {
@@ -20,7 +19,7 @@ export default class UsersRepository extends BaseRepository {
 	/**
 	 * @description : Find many users
 	 */
-	public async findMany(query: ReturnType<typeof processFindManyQuery>): Promise<Users[]> {
+	public async findMany(query: any): Promise<Users[]> {
 		query.take = Math.min(query.take || this.defaultFetchRows, this.maxFetchRows);
 		return await this.model.findMany(query);
 	}

src/services/private-services/AddressesService/AddressesService.ts

@@ -2,7 +2,6 @@
 import { Addresses } from "@prisma/client";
 import AddressesRepository from "@Repositories/AddressesRepository";
 import BaseService from "@Services/BaseService";
-import { processFindManyQuery } from "prisma-query";
 import Container, { Service } from "typedi";
 
 @Service()
@@ -17,7 +16,7 @@ export default class AddressesService extends BaseService {
 	 * @throws {Error} If addresses cannot be get
 	 * @param : projectEntity: Partial<ProjectEntity>
 	 */
-	public async get(query: ReturnType<typeof processFindManyQuery>) {
+	public async get(query: any) {
 		//init repo
 		const repo = Container.get(AddressesRepository);
 

src/services/super-admin/DocumentsService/DocumentsService.ts

@@ -1,7 +1,6 @@
 import DocumentTypesRepository from "@Repositories/DocumentTypesRepository";
 //import { DocumentTypes } from "prisma/prisma-client";
 import BaseService from "@Services/BaseService";
-import { processFindManyQuery } from "prisma-query";
 import Container, { Service } from "typedi";
 
 @Service()
@@ -14,9 +13,8 @@ export default class DocumentsService extends BaseService {
 	 * @description : Get all documents
 	 * @returns : Document[]
 	 * @throws {Error} If documents cannot be get
-	 * @param : ReturnType<typeof processFindManyQuery>
 	 */
-	public async get(query: ReturnType<typeof processFindManyQuery>) {
+	public async get(query: any) {
 		//init repo
 		const repo = Container.get(DocumentTypesRepository);
 

src/services/super-admin/OfficeFoldersService/OfficeFoldersService.ts

@@ -2,7 +2,6 @@ import { OfficeFolders } from ".prisma/client";
 import OfficeFoldersRepository from "@Repositories/OfficeFoldersRepository";
 import BaseService from "@Services/BaseService";
 import { OfficeFolder } from "le-coffre-resources/dist/SuperAdmin";
-import { processFindManyQuery } from "prisma-query";
 import Container, { Service } from "typedi";
 
 @Service()
@@ -15,9 +14,8 @@ export default class OfficeFoldersService extends BaseService {
 	 * @description : Get all folders
 	 * @returns : OfficeFolders[]
 	 * @throws {Error} If folders cannot be get
-	 * @param : query: ReturnType<typeof processFindManyQuery>
 	 */
-	public async get(query: ReturnType<typeof processFindManyQuery>) {
+	public async get(query: any) {
 		//init repo
 		const repo = Container.get(OfficeFoldersRepository);
 

src/services/super-admin/OfficesService/OfficesService.ts

@@ -3,7 +3,6 @@ import { Offices } from "@prisma/client";
 import OfficesRepository from "@Repositories/OfficesRepository";
 import BaseService from "@Services/BaseService";
 import { Office as OfficeRessource } from "le-coffre-resources/dist/SuperAdmin";
-import { processFindManyQuery } from "prisma-query";
 import { Service } from "typedi";
 
 @Service()
@@ -16,7 +15,7 @@ export default class OfficesService extends BaseService {
 	 * @description : Get all offices
 	 * @throws {Error} If offices cannot be get
 	 */
-	public async get(query: ReturnType<typeof processFindManyQuery>): Promise<Offices[]> {
+	public async get(query: any): Promise<Offices[]> {
 		return this.officeRepository.findMany(query);
 	}
 

src/test/services/super-admin/CustomersService.test.ts

@@ -2,7 +2,6 @@ import "module-alias/register";
 import "reflect-metadata";
 import { Customer } from "le-coffre-resources/dist/SuperAdmin";
 import CustomersService from "@Services/super-admin/CustomersService/CustomersService";
-import { processFindManyQuery } from "prisma-query";
 import { PrismaClient } from "@prisma/client";
 import { customer, customer_, userContact, userContact_ } from "./MockedData";
 import Container from "typedi";
@@ -152,7 +151,7 @@ describe("test update function", () => {
 
 describe("test get function", () => {
 	it("should return an array of Customers", async () => {
-		const req = processFindManyQuery({});
+		const req = {}
 		const customers = await CustomersServiceTest.get(req);
 
 		// verify result typing

src/test/services/super-admin/UsersService.test.ts

@@ -2,7 +2,6 @@ import "module-alias/register";
 import "reflect-metadata";
 import User from "le-coffre-resources/dist/SuperAdmin";
 import UsersService from "@Services/super-admin/UsersService/UsersService";
-import { processFindManyQuery } from "prisma-query";
 import { PrismaClient } from "@prisma/client";
 import { user, userContact, userContact_, user_ } from "./MockedData";
 import UsersRepository from "@Repositories/UsersRepository";
@@ -192,7 +191,7 @@ describe("test update function", () => {
 
 describe("test get function", () => {
 	it("should return an array of Users", async () => {
-		const req = processFindManyQuery({});
+		const req = {};
 		const users = await UsersServiceTest.get(req);
 
 		// verify result typing