From a08da959dd03422ec682e5ec191ec4d817baff47 Mon Sep 17 00:00:00 2001 From: "florian.azizian" <florian.azizian@maarch.org> Date: Tue, 13 Mar 2018 16:40:39 +0100 Subject: [PATCH] FEAT #202 fusion M2M sql + rest --- composer.json | 1 + rest/index.php | 2 +- sql/structure.sql | 72 +++++++++++++++++++++++------------------------ 3 files changed, 38 insertions(+), 37 deletions(-) diff --git a/composer.json b/composer.json index c7f928398cf..6d50f84ac0e 100755 --- a/composer.json +++ b/composer.json @@ -25,6 +25,7 @@ "Core\\" : "core/", "Convert\\" : "modules/convert/", + "Sendmail\\" : "modules/sendmail/", "Visa\\" : "modules/visa/" } }, diff --git a/rest/index.php b/rest/index.php index c7ef7e21f57..05dd919e26d 100755 --- a/rest/index.php +++ b/rest/index.php @@ -298,7 +298,7 @@ $app->get('/listinstance/{id}', \Entity\controllers\ListInstanceController::clas //Contacts $app->post('/contacts', \Contact\controllers\ContactController::class . ':create'); -$app->get('/contact/checkCommunication', \Core\Controllers\ContactController::class . ':getCheckCommunication'); +$app->get('/contact/checkCommunication', \Contact\controllers\ContactController::class . ':getCheckCommunication'); //Templates $app->post('/templates/{id}/duplicate', \Template\controllers\TemplateController::class . ':duplicate'); diff --git a/sql/structure.sql b/sql/structure.sql index c4ab512a0b2..5a48169b30e 100755 --- a/sql/structure.sql +++ b/sql/structure.sql @@ -2616,46 +2616,46 @@ $$ LANGUAGE SQL; CREATE TABLE message_exchange ( - "message_id" text NOT NULL, - "schema" text, - "type" text NOT NULL, - "status" text NOT NULL, + message_id text NOT NULL, + schema text, + type text NOT NULL, + status text NOT NULL, - "date" timestamp NOT NULL, - "reference" text NOT NULL, + date timestamp NOT NULL, + reference text NOT NULL, - "account_id" text, - "sender_org_identifier" text NOT NULL, - "sender_org_name" text, - "recipient_org_identifier" text NOT NULL, - "recipient_org_name" text, - - "archival_agreement_reference" text, - "reply_code" text, - "operation_date" timestamp, - "reception_date" timestamp, + account_id text, + sender_org_identifier text NOT NULL, + sender_org_name text, + recipient_org_identifier text NOT NULL, + recipient_org_name text, + + archival_agreement_reference text, + reply_code text, + operation_date timestamp, + reception_date timestamp, - "related_reference" text, - "request_reference" text, - "reply_reference" text, - "derogation" boolean, + related_reference text, + request_reference text, + reply_reference text, + derogation boolean, - "data_object_count" integer, - "size" numeric, + data_object_count integer, + size numeric, - "data" text, + data text, - "active" boolean, - "archived" boolean, + active boolean, + archived boolean, - "res_id_master" numeric default NULL, + res_id_master numeric default NULL, - "docserver_id" character varying(32) NOT NULL, - "path" character varying(255) DEFAULT NULL, - "filename" character varying(255) DEFAULT NULL, - "fingerprint" character varying(255) DEFAULT NULL, - "filesize" bigint, - "file_path" text default NULL, + docserver_id character varying(32) NOT NULL, + path character varying(255) DEFAULT NULL, + filename character varying(255) DEFAULT NULL, + fingerprint character varying(255) DEFAULT NULL, + filesize bigint, + file_path text default NULL, PRIMARY KEY ("message_id") ) @@ -2665,10 +2665,10 @@ WITH ( CREATE TABLE unit_identifier ( - "message_id" text NOT NULL, - "tablename" text NOT NULL, - "res_id" text NOT NULL, - "disposition" text default NULL + message_id text NOT NULL, + tablename text NOT NULL, + res_id text NOT NULL, + disposition text default NULL ); DROP TABLE IF EXISTS users_baskets; -- GitLab