From cf9e9e9d9276e600f89711c8fe827a5eb27cbde5 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Tue, 3 Dec 2019 11:39:00 +0100
Subject: [PATCH] FEAT #12331 TIME 0:05 confidential => confidentiality

---
 migration/19.12/1912.sql                             | 8 ++++----
 migration/19.12/migrateOldIndexingModels.php         | 8 ++++----
 sql/data_en.sql                                      | 8 ++++----
 sql/data_fr.sql                                      | 8 ++++----
 test/unitTests/app/doctype/DoctypeControllerTest.php | 2 +-
 test/unitTests/app/resource/ResControllerTest.php    | 4 ++--
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/migration/19.12/1912.sql b/migration/19.12/1912.sql
index c71f972e265..bf123f26380 100644
--- a/migration/19.12/1912.sql
+++ b/migration/19.12/1912.sql
@@ -664,7 +664,7 @@ TRUNCATE TABLE indexing_models_fields;
 /* Arrivée */
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'doctype', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'priority', TRUE, null, 'mail');
-INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'confidential', TRUE, null, 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'confidentiality', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'documentDate', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'arrivalDate', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'subject', TRUE, null, 'mail');
@@ -680,7 +680,7 @@ INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_val
 /* Départ */
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'doctype', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'priority', TRUE, null, 'mail');
-INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'confidential', TRUE, null, 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'confidentiality', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'documentDate', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'departureDate', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'subject', TRUE, null, 'mail');
@@ -696,7 +696,7 @@ INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_val
 /* Interne */
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'doctype', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'priority', TRUE, null, 'mail');
-INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'confidential', TRUE, null, 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'confidentiality', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'documentDate', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'subject', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'indexingCustomField_1', FALSE, '"Courrier simple"', 'mail');
@@ -710,7 +710,7 @@ INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_val
 
 /* GED */
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'doctype', TRUE, null, 'mail');
-INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'confidential', TRUE, null, 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'confidentiality', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'documentDate', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'subject', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'senders', FALSE, null, 'contact');
diff --git a/migration/19.12/migrateOldIndexingModels.php b/migration/19.12/migrateOldIndexingModels.php
index 1679dc08c33..16cb76128e5 100644
--- a/migration/19.12/migrateOldIndexingModels.php
+++ b/migration/19.12/migrateOldIndexingModels.php
@@ -3,7 +3,7 @@
 $aDataIncoming['incoming'] = [
     'doctype'               => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
     'priority'              => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
-    'confidential'          => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
+    'confidentiality'          => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
     'docDate'               => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
     'arrivalDate'           => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
     'subject'               => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
@@ -20,7 +20,7 @@ $aDataIncoming['incoming'] = [
 $aDataIncoming['outgoing'] = [
     'doctype'               => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
     'priority'              => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
-    'confidential'          => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
+    'confidentiality'          => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
     'docDate'               => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
     'subject'               => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
     'indexingCustomField_1' => ['mandatory' => 'false', 'default_value' => '""', 'unit' => 'mail'],
@@ -36,7 +36,7 @@ $aDataIncoming['outgoing'] = [
 $aDataIncoming['internal'] = [
     'doctype'               => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
     'priority'              => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
-    'confidential'          => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
+    'confidentiality'          => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
     'docDate'               => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
     'subject'               => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
     'indexingCustomField_1' => ['mandatory' => 'false', 'default_value' => '""', 'unit' => 'mail'],
@@ -51,7 +51,7 @@ $aDataIncoming['internal'] = [
 
 $aDataIncoming['ged_doc'] = [
     'doctype'               => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
-    'confidential'          => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
+    'confidentiality'          => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
     'docDate'               => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
     'subject'               => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'mail'],
     'senders'               => ['mandatory' => 'true', 'default_value' => '""', 'unit' => 'contact'],
diff --git a/sql/data_en.sql b/sql/data_en.sql
index eab4e9e7fd0..0b4d8c0fe79 100644
--- a/sql/data_en.sql
+++ b/sql/data_en.sql
@@ -1529,7 +1529,7 @@ TRUNCATE TABLE indexing_models_fields;
 /* Arrivée */
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'doctype', TRUE, '""', 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'priority', TRUE, '""', 'mail');
-INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'confidential', TRUE, '""', 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'confidentiality', TRUE, '""', 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'docDate', TRUE, '""', 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'arrivalDate', TRUE, '""', 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'subject', TRUE, '""', 'mail');
@@ -1544,7 +1544,7 @@ INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_val
 /* Départ */
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'doctype', TRUE, '""', 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'priority', TRUE, '""', 'mail');
-INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'confidential', TRUE, '""', 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'confidentiality', TRUE, '""', 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'docDate', TRUE, '""', 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'subject', TRUE, '""', 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'senders', FALSE, '""', 'contact');
@@ -1558,7 +1558,7 @@ INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_val
 /* Interne */
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'doctype', TRUE, '""', 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'priority', TRUE, '""', 'mail');
-INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'confidential', TRUE, '""', 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'confidentiality', TRUE, '""', 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'docDate', TRUE, '""', 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'subject', TRUE, '""', 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'senders', FALSE, '""', 'contact');
@@ -1571,7 +1571,7 @@ INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_val
 
 /* GED */
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'doctype', TRUE, '""', 'mail');
-INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'confidential', TRUE, '""', 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'confidentiality', TRUE, '""', 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'docDate', TRUE, '""', 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'subject', TRUE, '""', 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'senders', FALSE, '""', 'contact');
diff --git a/sql/data_fr.sql b/sql/data_fr.sql
index a043e53cd75..1cb59dc0a4e 100755
--- a/sql/data_fr.sql
+++ b/sql/data_fr.sql
@@ -1665,7 +1665,7 @@ TRUNCATE TABLE indexing_models_fields;
 /* Arrivée */
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'doctype', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'priority', TRUE, null, 'mail');
-INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'confidential', TRUE, null, 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'confidentiality', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'documentDate', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'arrivalDate', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (1, 'subject', TRUE, null, 'mail');
@@ -1680,7 +1680,7 @@ INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_val
 /* Départ */
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'doctype', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'priority', TRUE, null, 'mail');
-INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'confidential', TRUE, null, 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'confidentiality', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'documentDate', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'departureDate', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (2, 'subject', TRUE, null, 'mail');
@@ -1695,7 +1695,7 @@ INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_val
 /* Interne */
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'doctype', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'priority', TRUE, null, 'mail');
-INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'confidential', TRUE, null, 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'confidentiality', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'documentDate', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'subject', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (3, 'senders', FALSE, null, 'contact');
@@ -1708,7 +1708,7 @@ INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_val
 
 /* GED */
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'doctype', TRUE, null, 'mail');
-INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'confidential', TRUE, null, 'mail');
+INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'confidentiality', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'documentDate', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'subject', TRUE, null, 'mail');
 INSERT INTO indexing_models_fields (model_id, identifier, mandatory, default_value, unit) VALUES (4, 'senders', FALSE, null, 'contact');
diff --git a/test/unitTests/app/doctype/DoctypeControllerTest.php b/test/unitTests/app/doctype/DoctypeControllerTest.php
index d655f625d06..c9bfebcb294 100755
--- a/test/unitTests/app/doctype/DoctypeControllerTest.php
+++ b/test/unitTests/app/doctype/DoctypeControllerTest.php
@@ -553,7 +553,7 @@ class DoctypeControllerTest extends TestCase
             'status'        => 'NEW',
             'encodedFile'   => $encodedFile,
             'format'        => 'txt',
-            'confidential'  => false,
+            'confidentiality'   => false,
             'documentDate'  => '2019-01-01 17:18:47',
             'arrivalDate'   => '2019-01-01 17:18:47',
             'processLimitDate'  => '2029-01-01',
diff --git a/test/unitTests/app/resource/ResControllerTest.php b/test/unitTests/app/resource/ResControllerTest.php
index eefc9035561..356455e9095 100755
--- a/test/unitTests/app/resource/ResControllerTest.php
+++ b/test/unitTests/app/resource/ResControllerTest.php
@@ -33,7 +33,7 @@ class ResControllerTest extends TestCase
             'status'        => 'NEW',
             'encodedFile'   => $encodedFile,
             'format'        => 'txt',
-            'confidential'  => false,
+            'confidentiality'   => false,
             'documentDate'  => '2019-01-01 17:18:47',
             'arrivalDate'   => '2019-01-01 17:18:47',
             'processLimitDate'  => '2029-01-01',
@@ -369,7 +369,7 @@ class ResControllerTest extends TestCase
                 'status'        => $value[2],
                 'encodedFile'   => $encodedFile,
                 'format'        => 'txt',
-                'confidential'  => false,
+                'confidentiality'   => false,
                 'documentDate'  => '2019-01-01 17:18:47',
                 'arrivalDate'   => '2019-01-01 17:18:47',
                 'doctype'       => $value[0],
-- 
GitLab