4nk/lecoffre-back
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
OxSaitama 2023-10-09 11:46:23 +02:00
commit 94e1eb24d4
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/api/notary/OfficeFolderAnchorsController.ts
View File

@ -2,7 +2,7 @@ import { Response, Request } from "express";
import { Controller, Get, Post } from "@ControllerPattern/index"; import { Controller, Get, Post } from "@ControllerPattern/index";
import ApiController from "@Common/system/controller-pattern/ApiController"; import ApiController from "@Common/system/controller-pattern/ApiController";
import { Service } from "typedi"; import { Service } from "typedi";
import { OfficeFolder } from "le-coffre-resources/dist/Notary"; import { Document, OfficeFolder } from "le-coffre-resources/dist/Notary";
import { getFolderHashes } from "@Common/optics/notary"; import { getFolderHashes } from "@Common/optics/notary";
import OfficeFoldersService from "@Services/notary/OfficeFoldersService/OfficeFoldersService"; import OfficeFoldersService from "@Services/notary/OfficeFoldersService/OfficeFoldersService";
import OfficeFolderAnchorsRepository from "@Repositories/OfficeFolderAnchorsRepository"; import OfficeFolderAnchorsRepository from "@Repositories/OfficeFolderAnchorsRepository";
@ -136,6 +136,18 @@ export default class OfficeFoldersController extends ApiController {
const officeFolder = OfficeFolder.hydrate<OfficeFolder>(officeFolderFound, { strategy: "excludeAll" }); const officeFolder = OfficeFolder.hydrate<OfficeFolder>(officeFolderFound, { strategy: "excludeAll" });
// Check if every document is validated in a folder
const documents = officeFolder.documents ?? [];
const documentsValidated = documents.filter((document) => {
let documentHydrated = Document.hydrate<Document>(document, { strategy: "excludeAll" });
return documentHydrated.document_status === "VALIDATED";
});
if (documentsValidated.length !== documents.length && documents.length !== 0) {
this.httpBadRequest(response, "Cannot anchor a folder with non validated documents");
return;
}
const folderHashes = getFolderHashes(officeFolder); const folderHashes = getFolderHashes(officeFolder);
if (folderHashes.length === 0) { if (folderHashes.length === 0) {

9
src/app/api/super-admin/UsersController.ts
View File

@ -128,11 +128,10 @@ export default class UsersController extends ApiController {
return; return;
} }
// Not needed if you're super admin you can assign every roles from every offices if (officeRole.office_uid != userFound.office_uid) {
// if (officeRole.office_uid != userFound.office_uid) { this.httpBadRequest(response, "Cannot assign an office role from another office");
// this.httpBadRequest(response, "Cannot assign an office role from another office"); return;
// return; }
// }
} }
//call service to get prisma entity //call service to get prisma entity