Merge branch 'staging' of github.com:smart-chain-fr/leCoffre-back into staging

src/app/api/admin/OfficeRolesController.ts

@@ -29,7 +29,7 @@ export default class OfficeRolesController extends ApiController {
 			let query: Prisma.OfficeRolesFindManyArgs = {};
 			if (req.query["q"]) {
 				query = JSON.parse(req.query["q"] as string);
-				if(query.where?.uid) {
+				if (query.where?.uid) {
 					this.httpBadRequest(response, "You can't filter by uid");
 					return;
 				}
@@ -79,10 +79,7 @@ export default class OfficeRolesController extends ApiController {
 				where: {
 					OR: [
 						{
-							namespace: "notary",
+							namespace: "global",
-						},
-						{
-							namespace: "collaborator",
 						},
 					],
 				},
@@ -128,23 +125,28 @@ export default class OfficeRolesController extends ApiController {
 			}
 
 			if (req.body.rules) {
+				console.log(req.body.rules);
+				
 				const allRules = await this.rulesService.get({
 					where: {
-						OR: [
+						namespace: "global",
-							{
+					},
-								namespace: "notary",
+				});				
-							},
+
-							{
+				const specificRules = await this.rulesService.get({
-								namespace: "collaborator",
+					where: {
-							},
+						namespace: "collaborator",
-						],
 					},
 				});
 
 				req.body.rules = req.body.rules.filter((rule: any) => {
-					const ruleFound = allRules.find((r) => r.uid === rule.uid && (r.namespace === "notary" || r.namespace === "collaborator"));
+					const ruleFound = specificRules.find(
+						(r) => r.uid === rule.uid && (r.namespace === "collaborator"),
+					);
 					return ruleFound;
 				});
+				
+				req.body.rules = req.body.rules.concat(allRules);
 			}
 			//init IOfficeRole resource with request body values
 			const officeRoleEntity = OfficeRole.hydrate<OfficeRole>(req.body);

src/common/databases/seeders/seeder.ts

@@ -527,28 +527,28 @@ export default async function main() {
 				label: "Lecture des utilisateurs",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "collaborator",
+				namespace: "global",
 			},
 			{
 				name: "GET offices",
 				label: "Afficher des offices",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "collaborator",
+				namespace: "global",
 			},
 			{
 				name: "GET customers",
 				label: "Afficher des clients",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "collaborator",
+				namespace: "global",
 			},
 			{
 				name: "GET deeds",
 				label: "Voir des types d'acte",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "collaborator",
+				namespace: "global",
 			},
 			{
 				name: "GET deed-types",
@@ -562,7 +562,7 @@ export default async function main() {
 				label: "Afficher des documents",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "collaborator",
+				namespace: "global",
 			},
 			{
 				name: "GET document-types",
@@ -576,112 +576,112 @@ export default async function main() {
 				label: "Lecture des fichiers",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "collaborator",
+				namespace: "global",
 			},
 			{
 				name: "GET folders",
 				label: "Afficher les dossiers",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "collaborator",
+				namespace: "global",
 			},
 			{
 				name: "GET roles",
 				label: "Afficher les rôles",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "collaborator",
+				namespace: "global",
 			},
 			{
 				name: "GET rules",
 				label: "Afficher les droits",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "collaborator",
+				namespace: "global",
 			},
 			{
 				name: "GET office-roles",
 				label: "Lecture des rôles d'office",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "collaborator",
+				namespace: "global",
 			},
 			{
 				name: "POST deeds",
 				label: "Créer un template de type d'acte",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "collaborator",
 			},
 			{
 				name: "PUT deeds",
 				label: "Modifier un type d'acte",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "collaborator",
 			},
 			{
 				name: "DELETE deeds",
 				label: "Supprimer des types d'actes",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "collaborator",
 			},
 			{
 				name: "POST folders",
 				label: "Créer un dossier",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "global",
 			},
 			{
 				name: "PUT folders",
 				label: "Modifier des dossiers",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "global",
 			},
 			{
 				name: "DELETE folders",
 				label: "Supprimer un dossier vide",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "global",
 			},
 			{
 				name: "POST documents",
 				label: "Demander des documents à un client",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "global",
 			},
 			{
 				name: "PUT documents",
 				label: "Valider des documents",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "global",
 			},
 			{
 				name: "DELETE documents",
 				label: "Supprimer un document demandé",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "global",
 			},
 			{
 				name: "POST customers",
 				label: "Créer des clients",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "global",
 			},
 			{
 				name: "PUT customers",
 				label: "Modifier des clients",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "global",
 			},
 			{
 				name: "DELETE customers",
@@ -695,56 +695,56 @@ export default async function main() {
 				label: "Ancrer un dossier",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "global",
 			},
 			{
 				name: "GET anchors",
 				label: "Vérifier l'ancrage un dossier",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "global",
 			},
 			{
 				name: "POST deed-types",
 				label: "Création des types d'actes",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "admin",
+				namespace: "collaborator",
 			},
 			{
 				name: "PUT deed-types",
 				label: "Modification des types d'actes",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "admin",
+				namespace: "collaborator",
 			},
 			{
 				name: "DELETE deed-types",
 				label: "Suppression des types d'actes",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "admin",
+				namespace: "collaborator",
 			},
 			{
 				name: "POST document-types",
 				label: "Création des types de documents",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "admin",
+				namespace: "collaborator",
 			},
 			{
 				name: "PUT document-types",
 				label: "Modification des types de documents",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "admin",
+				namespace: "collaborator",
 			},
 			{
 				name: "DELETE document-types",
 				label: "Suppression des types de documents",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "admin",
+				namespace: "collaborator",
 			},
 			{
 				name: "POST office-roles",
@@ -793,63 +793,63 @@ export default async function main() {
 				label: "Editer le RIB de l'office",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "collaborator",
 			},
 			{
 				name: "GET rib",
 				label: "Lire le RIB de l'office",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "collaborator",
 			},
 			{
 				name: "POST rib",
 				label: "Déposer le RIB de l'office",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "collaborator",
 			},
 			{
 				name: "DELETE rib",
 				label: "Supprimer le RIB de l'office",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "collaborator",
 			},
 			{
 				name: "GET subscriptions",
 				label: "Récupérer les abonnements",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "collaborator",
 			},
 			{
 				name: "POST subscriptions",
 				label: "Inviter un collaborateur à l'abonnement",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "collaborator",
 			},
 			{
 				name: "PUT subscriptions",
 				label: "Modifier l'abonnement",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "collaborator",
 			},
 			{
 				name: "GET stripe",
 				label: "Gérer l'abonnement de l'office",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "collaborator",
 			},
 			{
 				name: "POST stripe",
 				label: "Payer un abonnement",
 				created_at: new Date(),
 				updated_at: new Date(),
-				namespace: "notary",
+				namespace: "collaborator",
 			},
 		];
 
@@ -862,6 +862,14 @@ export default async function main() {
 					"POST deeds",
 					"PUT deeds",
 					"DELETE deeds",
+					"GET document-types",
+					"DELETE deed-types",
+					"PUT deed-types",
+					"DELETE document-types",
+					"GET deed-types",
+					"POST document-types",
+					"POST deed-types",
+					"PUT document-types",
 				]
 			},
 			{
@@ -891,7 +899,8 @@ export default async function main() {
 
 		const collaboratorRules = rules.filter((rule) => rule.namespace === "collaborator");
 		const notaryRules = [...collaboratorRules, ...rules.filter((rule) => rule.namespace === "notary")];
-		const adminRules = [...notaryRules, ...rules.filter((rule) => rule.namespace === "admin")];
+		const globalRules = [...notaryRules, ...rules.filter((rule) => rule.namespace === "global")];
+		const adminRules = [...globalRules, ...rules.filter((rule) => rule.namespace === "admin")];
 		const superAdminRules = [...adminRules, ...rules.filter((rule) => rule.namespace === "super-admin")];
 
 		const roles: Role[] = [
@@ -931,14 +940,14 @@ export default async function main() {
 				created_at: new Date(),
 				updated_at: new Date(),
 				office: offices[0]!,
-				rules: notaryRules,
+				rules: globalRules,
 			},
 			{
 				name: "Collaborateur",
 				created_at: new Date(),
 				updated_at: new Date(),
 				office: offices[0]!,
-				rules: notaryRules,
+				rules: globalRules,
 			},
 		];