Skip to content
Snippets Groups Projects
Verified Commit 6329cfd8 authored by Damien's avatar Damien
Browse files

FEAT #10769 TIME 0:30 Remove creator

parent f3d4a04d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
sql/sample.sql
+ 29
− 29
View file @ 6329cfd8
......@@ -8,7 +8,7 @@ TRUNCATE TABLE adr_attachments;
-- DO $$
-- BEGIN
-- FOR r in 1..500 LOOP
-- INSERT INTO main_documents (id, reference, title, sender, creator, creation_date) VALUES (r, '2018/A/' || r, 'Mon Courrier ' || r, 'Oliver Queen', 2, CURRENT_TIMESTAMP);
-- INSERT INTO main_documents (id, reference, title, sender, creation_date) VALUES (r, '2018/A/' || r, 'Mon Courrier ' || r, 'Oliver Queen', CURRENT_TIMESTAMP);
-- INSERT INTO adr_main_documents (main_document_id, type, path, filename, fingerprint) VALUES (r, 'DOC', 'tests/', '1.pdf', '67e1cde83cf6710cb4f3644db6bb0ce67bf5cc23178f641065921e92b5c654a1d7e6595ebd0bbc211750a9e16c2fbf7dac81707021700c79c6eee7e14ed488e9');
-- INSERT INTO attachments (id, main_document_id, reference, title, creation_date) VALUES (r, r, '2018/PJ/' || r, 'PJ 1', CURRENT_TIMESTAMP);
......@@ -23,8 +23,8 @@ TRUNCATE TABLE adr_attachments;
-- DEMO WITH MAARCH COURRIER
-- LIST OF TO VISA/SIGN DOCS
INSERT INTO main_documents (id, reference, title, sender, creator, creation_date)
VALUES (1, 'MAARCH/2019D/1', 'Réponse à votre demande', 'Barbara Bain', 2, CURRENT_TIMESTAMP);
INSERT INTO main_documents (id, reference, title, sender, creation_date)
VALUES (1, 'MAARCH/2019D/1', 'Réponse à votre demande', 'Barbara Bain', CURRENT_TIMESTAMP);
INSERT INTO adr_main_documents (main_document_id, type, path, filename, fingerprint)
VALUES (1, 'DOC', 'tests/', 'ar_derogation.pdf', '9b0d6e8bf6e868d3a72c91660eab2c5d4b77c482672f6ae71b404d496e78d5856ba28f6f9a9ddb957ae16eece39ae7b3d04aa259fc58506d38edd18a6fbf578c');
INSERT INTO attachments (id, main_document_id, reference, title, creation_date)
......@@ -34,8 +34,8 @@ VALUES (1, 'ATTACH', 'tests/', 'demande_derogation.pdf', '8a41c12d4b1885f6929a91
INSERT INTO workflows (user_id, main_document_id, mode, "order") VALUES (1, 1, 'visa', 1);
INSERT INTO workflows (user_id, main_document_id, mode, "order") VALUES (1, 1, 'sign', 2);
--
INSERT INTO main_documents (id, reference, title, sender, creator, creation_date)
VALUES (2, 'MAARCH/2019D/2', 'Accusé de Réception de votre demande intervenant dans le cadre d’une décision implicite d’acceptation', 'Charlotte Charles', 2 , CURRENT_TIMESTAMP);
INSERT INTO main_documents (id, reference, title, sender, creation_date)
VALUES (2, 'MAARCH/2019D/2', 'Accusé de Réception de votre demande intervenant dans le cadre d’une décision implicite d’acceptation', 'Charlotte Charles', CURRENT_TIMESTAMP);
INSERT INTO adr_main_documents (main_document_id, type, path, filename, fingerprint)
VALUES (2, 'DOC', 'tests/', 'ar_sva.pdf', 'e723ec86ec468a30d981f626193ee7d96e4bd45dbf97daa1e03a6720ad9af1299fc60bc30e9e81886652d3af1d42876d37c27e6158493c23bd240abbada0c40c');
INSERT INTO attachments (id, main_document_id, reference, title, creation_date)
......@@ -44,8 +44,8 @@ INSERT INTO adr_attachments (attachment_id, type, path, filename, fingerprint)
VALUES (2, 'ATTACH', 'tests/', 'sva_route_66.pdf', '7ac968279579b547867964dd1d86b8cbc2bf9c9e6f68229cd42bbdbbcaded0062cb90759d31f08eef08bd8dc21d83912085adca87e27218dfceda5f7b56d6699');
INSERT INTO workflows (user_id, main_document_id, mode, "order") VALUES (1, 2, 'visa', 1);
--
INSERT INTO main_documents (id, reference, title, sender, creator, creation_date)
VALUES (3, 'MAARCH/2019D/3', 'Accusé de Réception de votre demande intervenant dans le cadre d’une décision implicite de rejet', 'Robert Renaud', 2, CURRENT_TIMESTAMP);
INSERT INTO main_documents (id, reference, title, sender, creation_date)
VALUES (3, 'MAARCH/2019D/3', 'Accusé de Réception de votre demande intervenant dans le cadre d’une décision implicite de rejet', 'Robert Renaud', CURRENT_TIMESTAMP);
INSERT INTO adr_main_documents (main_document_id, type, path, filename, fingerprint)
VALUES (3, 'DOC', 'tests/', 'ar_svr.pdf', '6e6bb35e903c8a62dcf8e3983071398103da5b068c57e2fafd7670e84bb0cd33057d0126394675657e0547c0c602a8233c115c24c1ddfedd4bf8ee3acb5bf47c');
INSERT INTO attachments (id, main_document_id, reference, title, creation_date)
......@@ -54,8 +54,8 @@ INSERT INTO adr_attachments (attachment_id, type, path, filename, fingerprint)
VALUES (3, 'ATTACH', 'tests/', 'svr_route_chien_bruyant.pdf', '669b144a43f9b9c447e9a00794813ef95cd3b8392d5ec86f3aa8f2fbe65b6a3715fbddde8217165a3b1d7eb3b8e0eea040275a67dcab467bdc1c7783e146f18a');
INSERT INTO workflows (user_id, main_document_id, mode, "order") VALUES (1, 3, 'visa', 1);
--
INSERT INTO main_documents (id, reference, title, sender, creator, creation_date)
VALUES (4, 'MAARCH/2019D/4', 'Invitation pour échanges journée des sports', 'Barbara Bain', 2, CURRENT_TIMESTAMP);
INSERT INTO main_documents (id, reference, title, sender, creation_date)
VALUES (4, 'MAARCH/2019D/4', 'Invitation pour échanges journée des sports', 'Barbara Bain', CURRENT_TIMESTAMP);
INSERT INTO adr_main_documents (main_document_id, type, path, filename, fingerprint)
VALUES (4, 'DOC', 'tests/', 'invitation.pdf', 'd3d0f4d8cc3b4f9b5c2d0bd998737def4f769881a41d063f81d2e10166576e137ef294a81be563be04be44ce66c89897a51a4bca0755d0e3cae149501cf0d7aa');
INSERT INTO attachments (id, main_document_id, reference, title, creation_date)
......@@ -64,8 +64,8 @@ INSERT INTO adr_attachments (attachment_id, type, path, filename, fingerprint)
VALUES (4, 'ATTACH', 'tests/', 'test.pdf', '9510c93637f6baafbb9082a802aa6c3d1167f4cf6a02c432131de3a6f98d39cd3cac5f26d7b472e8fc2a50930a4e1ca89e8d9e839c81ef201198678aac3df45a');
INSERT INTO workflows (user_id, main_document_id, mode, "order") VALUES (1, 4, 'visa', 1);
--
INSERT INTO main_documents (id, reference, title, sender, creator, creation_date)
VALUES (5, 'MAARCH/2019D/5', 'Votre demande de place en crèche', 'Sabrina Saporta', 2, CURRENT_TIMESTAMP);
INSERT INTO main_documents (id, reference, title, sender, creation_date)
VALUES (5, 'MAARCH/2019D/5', 'Votre demande de place en crèche', 'Sabrina Saporta', CURRENT_TIMESTAMP);
INSERT INTO adr_main_documents (main_document_id, type, path, filename, fingerprint)
VALUES (5, 'DOC', 'tests/', 'rep_creche.pdf', '4961004985ceeb0fddde9c9e982512da251e5d82ea072b955570f3539e14f88d22f4d3d2ab0e6979443766ec70a72d8d24298ed4a1e1cb9d76e5a19113504d3f');
INSERT INTO attachments (id, main_document_id, reference, title, creation_date)
......@@ -74,8 +74,8 @@ INSERT INTO adr_attachments (attachment_id, type, path, filename, fingerprint)
VALUES (5, 'ATTACH', 'tests/', 'demande_place_creche.pdf', 'ac4190f7b9a07204d15a3c0616b36be43de732a3c7a50d4c72f00eaa2e8bef19c5219b60e5e465ddf6d22a12dfb8157b97d47b96af0cd047296f3ddb7f79ad08');
INSERT INTO workflows (user_id, main_document_id, mode, "order") VALUES (1, 5, 'sign', 1);
--
INSERT INTO main_documents (id, reference, title, sender, creator, creation_date)
VALUES (6, 'MAARCH/2019D/6', 'Mécontentement délais de réponses place crèche', 'Sabrina Saporta', 2, CURRENT_TIMESTAMP);
INSERT INTO main_documents (id, reference, title, sender, creation_date)
VALUES (6, 'MAARCH/2019D/6', 'Mécontentement délais de réponses place crèche', 'Sabrina Saporta', CURRENT_TIMESTAMP);
INSERT INTO adr_main_documents (main_document_id, type, path, filename, fingerprint)
VALUES (6, 'DOC', 'tests/', 'rep_standard.pdf', 'c64b6cc725d947168b2236951452d4e64c9a9bb5ba41b9749b5b9990d4facfef83404d160a8b5db14c046ccae8c3fa21359c4b7a628fc55b526376578f1752da');
INSERT INTO attachments (id, main_document_id, reference, title, creation_date)
......@@ -85,50 +85,50 @@ VALUES (6, 'ATTACH', 'tests/', 'relance_place_creche.pdf', 'a252b97a682f84ae27ec
INSERT INTO workflows (user_id, main_document_id, mode, "order") VALUES (1, 6, 'sign', 1);
-- LIST OF ANNOTATE DOCS
INSERT INTO main_documents (id, reference, title, sender, creator, creation_date)
VALUES (7, 'MAARCH/2019A/6', 'Pétition pour la survie du square Carré', 'Robert Renaud', 2, CURRENT_TIMESTAMP);
INSERT INTO main_documents (id, reference, title, sender, creation_date)
VALUES (7, 'MAARCH/2019A/6', 'Pétition pour la survie du square Carré', 'Robert Renaud', CURRENT_TIMESTAMP);
INSERT INTO adr_main_documents (main_document_id, type, path, filename, fingerprint)
VALUES (7, 'DOC', 'tests/', 'petition_square_carre.pdf', '3cfd864ce592a8f82c2098927369327d8dae27981e23f32ac187855369c61e87b6012717811c2654a2743b6892bb3bda1d6ac00ebf2747718f1017c00d6ece5c');
INSERT INTO workflows (user_id, main_document_id, mode, "order") VALUES (1, 7, 'note', 1);
--
INSERT INTO main_documents (id, reference, title, sender, creator, creation_date)
VALUES (8, 'MAARCH/2019A/7', 'Félicitations élections', 'Robert Renaud', 2, CURRENT_TIMESTAMP);
INSERT INTO main_documents (id, reference, title, sender, creation_date)
VALUES (8, 'MAARCH/2019A/7', 'Félicitations élections', 'Robert Renaud', CURRENT_TIMESTAMP);
INSERT INTO adr_main_documents (main_document_id, type, path, filename, fingerprint)
VALUES (8, 'DOC', 'tests/', 'felicitations.pdf', 'acddf0e9dca9f0e57dfc2b385865ab7b7fc815c47d242e5656247f3bf7caee3980717413a3c85d1ca7250db6e228b3498004d4ffd42f9e899ef837e50b3e76ac');
INSERT INTO workflows (user_id, main_document_id, mode, "order") VALUES (1, 8, 'note', 1);
--
INSERT INTO main_documents (id, reference, title, sender, creator, creation_date)
VALUES (9, 'MAARCH/2019A/8', 'Demande place creche', 'Sabrina Saporta', 2, CURRENT_TIMESTAMP);
INSERT INTO main_documents (id, reference, title, sender, creation_date)
VALUES (9, 'MAARCH/2019A/8', 'Demande place creche', 'Sabrina Saporta', CURRENT_TIMESTAMP);
INSERT INTO adr_main_documents (main_document_id, type, path, filename, fingerprint)
VALUES (9, 'DOC', 'tests/', 'formulaire_place_creche.pdf', '8f8ac7c8bdb32c4b5cc1e8e4e96cf1f3cc9a303f893b1cc58c3650b561c50eb90c34ca246264d2751d897804146da8dea4f5a162b8f95eb3ab65b8447b2d0a6b');
INSERT INTO workflows (user_id, main_document_id, mode, "order") VALUES (1, 9, 'note', 1);
--
INSERT INTO main_documents (id, reference, title, sender, creator, creation_date)
VALUES (10, 'MAARCH/2019A/9', 'Demande subvention Jokkolabs', 'Robert Renaud', 2, CURRENT_TIMESTAMP);
INSERT INTO main_documents (id, reference, title, sender, creation_date)
VALUES (10, 'MAARCH/2019A/9', 'Demande subvention Jokkolabs', 'Robert Renaud', CURRENT_TIMESTAMP);
INSERT INTO adr_main_documents (main_document_id, type, path, filename, fingerprint)
VALUES (10, 'DOC', 'tests/', 'demande_subvention.pdf', '8e8bf316a63813491f528396628c537a5faabb2c4b3065987527bcacc02819fd265adeb6f9f887e6f604ab0028b2e294b1e1085f1899ca293092139d5036b69a');
INSERT INTO workflows (user_id, main_document_id, mode, "order") VALUES (1, 10, 'note', 1);
--
INSERT INTO main_documents (id, reference, title, sender, creator, creation_date)
VALUES (11, 'MAARCH/2019A/10', 'Facture Maarch', 'Suzanne Star', 2, CURRENT_TIMESTAMP);
INSERT INTO main_documents (id, reference, title, sender, creation_date)
VALUES (11, 'MAARCH/2019A/10', 'Facture Maarch', 'Suzanne Star', CURRENT_TIMESTAMP);
INSERT INTO adr_main_documents (main_document_id, type, path, filename, fingerprint)
VALUES (11, 'DOC', 'tests/', 'facture.pdf', '7d30cc8ac072240914e0d1a9346a37b4ea13f7404cc9a39b26e94eb66e57b1ce9a57a3625fbf524839637199cb3e291063e552e54cee22bdb45d9ffbb59ed887');
INSERT INTO workflows (user_id, main_document_id, mode, "order") VALUES (1, 11, 'note', 1);
--
INSERT INTO main_documents (id, reference, title, sender, creator, creation_date)
VALUES (12, 'MAARCH/2019A/11', 'Demande état civil', 'Robert Renaud', 2, CURRENT_TIMESTAMP);
INSERT INTO main_documents (id, reference, title, sender, creation_date)
VALUES (12, 'MAARCH/2019A/11', 'Demande état civil', 'Robert Renaud', CURRENT_TIMESTAMP);
INSERT INTO adr_main_documents (main_document_id, type, path, filename, fingerprint)
VALUES (12, 'DOC', 'tests/', 'etat_civil.pdf', '957e5f08848c0cce768ee4b003e84098c569dd18f854748e080f2c258af55aff3186f9ae8458f2b202577699f2e0499f4ea9e43ccd2dacc78efe4d8e3488e863');
INSERT INTO workflows (user_id, main_document_id, mode, "order") VALUES (1, 12, 'note', 1);
--
INSERT INTO main_documents (id, reference, title, sender, creator, creation_date)
VALUES (13, 'MAARCH/2019A/12', 'Arrêt maladie vide', 'Pierre Pruvost', 2, CURRENT_TIMESTAMP);
INSERT INTO main_documents (id, reference, title, sender, creation_date)
VALUES (13, 'MAARCH/2019A/12', 'Arrêt maladie vide', 'Pierre Pruvost', CURRENT_TIMESTAMP);
INSERT INTO adr_main_documents (main_document_id, type, path, filename, fingerprint)
VALUES (13, 'DOC', 'tests/', 'arret_maladie.pdf', '3f2b7ac317782515bb1864e2b05890f07a74d22e5cb54e04a99d966625eb2a5930e940745057a7f798a332a516e609c9f1440c72f328704c6d5ac3a4e742efae');
INSERT INTO workflows (user_id, main_document_id, mode, "order") VALUES (1, 13, 'note', 1);
--
INSERT INTO main_documents (id, reference, title, sender, creator, creation_date)
VALUES (14, 'MAARCH/2019A/13', 'Inscription ecole', 'Sabrina Saporta', 2, CURRENT_TIMESTAMP);
INSERT INTO main_documents (id, reference, title, sender, creation_date)
VALUES (14, 'MAARCH/2019A/13', 'Inscription ecole', 'Sabrina Saporta', CURRENT_TIMESTAMP);
INSERT INTO adr_main_documents (main_document_id, type, path, filename, fingerprint)
VALUES (14, 'DOC', 'tests/', 'inscription_ecole.pdf', '21af4bb4f8344988b8c85de24dd21444f554f40498147f675d4a138a354df29f093bc381747bcf070a5d019e926ebb01f934b3905d5e7907595bed1314074391');
INSERT INTO workflows (user_id, main_document_id, mode, "order") VALUES (1, 14, 'note', 1);
......
sql/structure.sql
+ 0
− 1
View file @ 6329cfd8
......@@ -144,7 +144,6 @@ CREATE TABLE main_documents
sender text NOT NULL,
deadline timestamp without time zone,
metadata jsonb NOT NULL DEFAULT '{}',
creator INTEGER NOT NULL,
creation_date timestamp without time zone NOT NULL DEFAULT NOW(),
modification_date timestamp without time zone DEFAULT NOW(),
CONSTRAINT main_documents_pkey PRIMARY KEY (id)
......
src/app/document/controllers/DocumentController.php
+ 1
− 5
View file @ 6329cfd8
......@@ -137,9 +137,6 @@ class DocumentController
$date = new \DateTime($document['deadline']);
$formattedDocument['deadline'] = $date->format('d-m-Y H:i');
}
$creator = UserModel::getById(['select' => ['firstname', 'lastname', 'login'], 'id' => $document['creator']]);
$formattedDocument['creator'] = $creator['login'];
$formattedDocument['creatorDisplay'] = "{$creator['firstname']} {$creator['lastname']}";
$formattedDocument['metadata'] = [];
$metadata = json_decode($document['metadata'], true);
......@@ -306,8 +303,7 @@ class DocumentController
'description' => empty($body['description']) ? null : $body['description'],
'sender' => $body['sender'],
'deadline' => empty($body['deadline']) ? null : $body['deadline'],
'metadata' => empty($body['metadata']) ? '{}' : json_encode($body['metadata']),
'creator' => $GLOBALS['id']
'metadata' => empty($body['metadata']) ? '{}' : json_encode($body['metadata'])
]);
AdrModel::createDocumentAdr([
......
src/app/document/models/DocumentModel.php
+ 2
− 4
View file @ 6329cfd8
......@@ -59,9 +59,8 @@ class DocumentModel
public static function create(array $args)
{
ValidatorModel::notEmpty($args, ['title', 'sender', 'creator', 'metadata']);
ValidatorModel::notEmpty($args, ['title', 'sender', 'metadata']);
ValidatorModel::stringType($args, ['title', 'reference', 'description', 'sender', 'deadline', 'metadata']);
ValidatorModel::intVal($args, ['creator']);
$nextSequenceId = DatabaseModel::getNextSequenceValue(['sequenceId' => 'main_documents_id_seq']);
......@@ -74,8 +73,7 @@ class DocumentModel
'description' => $args['description'],
'sender' => $args['sender'],
'deadline' => $args['deadline'],
'metadata' => $args['metadata'],
'creator' => $args['creator']
'metadata' => $args['metadata']
]
]);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment