From 76a77780bd22c77d8c90ec7b3b00a0f09a0101bb Mon Sep 17 00:00:00 2001
From: Mourad <mourad.elhadj.mimoune@akretion.com>
Date: Mon, 12 Oct 2020 14:07:41 +0200
Subject: [PATCH] [IMP] server_environment_data_encryption, data_encryption:
 black, isort, prettier

---
 data_encryption/models/encrypted_data.py      |  6 ++-
 .../models/server_env_mixin.py                |  9 ++--
 .../tests/fixtures/base.xml                   | 21 ++++++---
 .../tests/fixtures/res1.xml                   | 46 +++++++++++++-----
 .../tests/fixtures/res2.xml                   | 47 ++++++++++++++-----
 .../odoo/addons/data_encryption               |  1 +
 setup/data_encryption/setup.py                |  6 +++
 .../addons/server_environment_data_encryption |  1 +
 .../setup.py                                  |  6 +++
 9 files changed, 107 insertions(+), 36 deletions(-)
 create mode 120000 setup/data_encryption/odoo/addons/data_encryption
 create mode 100644 setup/data_encryption/setup.py
 create mode 120000 setup/server_environment_data_encryption/odoo/addons/server_environment_data_encryption
 create mode 100644 setup/server_environment_data_encryption/setup.py

diff --git a/data_encryption/models/encrypted_data.py b/data_encryption/models/encrypted_data.py
index f49b9b7..d9dbc67 100644
--- a/data_encryption/models/encrypted_data.py
+++ b/data_encryption/models/encrypted_data.py
@@ -24,7 +24,9 @@ class EncryptedData(models.Model):
 
     name = fields.Char(required=True, readonly=True, index=True, help="Technical name")
     environment = fields.Char(
-        required=True, index=True, help="Concerned Odoo environment (prod, preprod...)",
+        required=True,
+        index=True,
+        help="Concerned Odoo environment (prod, preprod...)",
     )
     encrypted_data = fields.Binary(attachment=False)
 
@@ -83,7 +85,7 @@ class EncryptedData(models.Model):
     @staticmethod
     def _retrieve_env():
         """Return the current environment
-           Raise if none is found
+        Raise if none is found
         """
         current = config.get("running_env", False)
         if not current:
diff --git a/server_environment_data_encryption/models/server_env_mixin.py b/server_environment_data_encryption/models/server_env_mixin.py
index 5a3c5b9..c008577 100644
--- a/server_environment_data_encryption/models/server_env_mixin.py
+++ b/server_environment_data_encryption/models/server_env_mixin.py
@@ -32,8 +32,8 @@ class ServerEnvMixin(models.AbstractModel):
 
     def _inverse_server_env(self, field_name):
         """
-            When this module is installed, we store values into encrypted data
-            env instead of a default field in database (not env dependent).
+        When this module is installed, we store values into encrypted data
+        env instead of a default field in database (not env dependent).
         """
         is_editable_field = self._server_env_is_editable_fieldname(field_name)
         encrypted_data_obj = self.env["encrypted.data"].sudo()
@@ -150,7 +150,10 @@ class ServerEnvMixin(models.AbstractModel):
         self, view_id=None, view_type="form", toolbar=False, submenu=False
     ):
         res = super().fields_view_get(
-            view_id=view_id, view_type=view_type, toolbar=toolbar, submenu=submenu,
+            view_id=view_id,
+            view_type=view_type,
+            toolbar=toolbar,
+            submenu=submenu,
         )
         res["arch"] = self._update_form_view_from_env(res["arch"], view_type)
         return res
diff --git a/server_environment_data_encryption/tests/fixtures/base.xml b/server_environment_data_encryption/tests/fixtures/base.xml
index 524c959..11f2eb7 100644
--- a/server_environment_data_encryption/tests/fixtures/base.xml
+++ b/server_environment_data_encryption/tests/fixtures/base.xml
@@ -1,15 +1,22 @@
 <form string="Test">
     <header>
-        <button string="Reset Confirmation"
-                type="object" name="set_draft"
-                states="done"/>
+        <button
+            string="Reset Confirmation"
+            type="object"
+            name="set_draft"
+            states="done"
+        />
     </header>
     <sheet>
         <group col="4">
-            <field name="test" modifiers="{&quot;required&quot;: true}"/>
-            <field name="test2" attrs="{'readonly': [('type_env_is_editable', '=', False)]}"
-                   on_change="1" modifiers="{&quot;readonly&quot;: [[&quot;type_env_is_editable&quot;, &quot;=&quot;, false]]}"/>
-            <field name="date" modifiers="{&quot;readonly&quot;: true}"/>
+            <field name="test" modifiers="{&quot;required&quot;: true}" />
+            <field
+                name="test2"
+                attrs="{'readonly': [('type_env_is_editable', '=', False)]}"
+                on_change="1"
+                modifiers="{&quot;readonly&quot;: [[&quot;type_env_is_editable&quot;, &quot;=&quot;, false]]}"
+            />
+            <field name="date" modifiers="{&quot;readonly&quot;: true}" />
         </group>
     </sheet>
 </form>
diff --git a/server_environment_data_encryption/tests/fixtures/res1.xml b/server_environment_data_encryption/tests/fixtures/res1.xml
index 7ca515a..60966da 100644
--- a/server_environment_data_encryption/tests/fixtures/res1.xml
+++ b/server_environment_data_encryption/tests/fixtures/res1.xml
@@ -1,21 +1,43 @@
 <form string="Test">
     <header>
-        <button string="Reset Confirmation" type="object" name="set_draft" states="done"/>
+        <button
+            string="Reset Confirmation"
+            type="object"
+            name="set_draft"
+            states="done"
+        />
     </header>
     <sheet>
         <div class="d-flex justify-content-between">
-              <div class="alert lead alert-info text-center d-inline">
-                  <strong>Modify values for test environment</strong>
-                </div>
-                <div>
-            <button name="action_change_env_data_encrypted_fields" type="object" string="Define values for preprod" class="btn btn-lg btn-primary ml-2" context="{'environment': 'preprod'}"/>
-            
-            <button name="action_change_env_data_encrypted_fields" type="object" string="Define values for prod" class="btn btn-lg btn-primary ml-2" context="{'environment': 'prod'}"/>
+            <div class="alert lead alert-info text-center d-inline">
+                <strong>Modify values for test environment</strong>
             </div>
-              </div><group col="4">
-            <field name="test" modifiers="{&quot;required&quot;: true}"/>
-            <field name="test2" attrs="{'readonly': [('type_env_is_editable', '=', False)]}" on_change="1" modifiers="{&quot;readonly&quot;: [[&quot;type_env_is_editable&quot;, &quot;=&quot;, false]]}"/>
-            <field name="date" modifiers="{&quot;readonly&quot;: true}"/>
+            <div>
+                <button
+                    name="action_change_env_data_encrypted_fields"
+                    type="object"
+                    string="Define values for preprod"
+                    class="btn btn-lg btn-primary ml-2"
+                    context="{'environment': 'preprod'}"
+                />
+                <button
+                    name="action_change_env_data_encrypted_fields"
+                    type="object"
+                    string="Define values for prod"
+                    class="btn btn-lg btn-primary ml-2"
+                    context="{'environment': 'prod'}"
+                />
+            </div>
+        </div>
+        <group col="4">
+            <field name="test" modifiers="{&quot;required&quot;: true}" />
+            <field
+                name="test2"
+                attrs="{'readonly': [('type_env_is_editable', '=', False)]}"
+                on_change="1"
+                modifiers="{&quot;readonly&quot;: [[&quot;type_env_is_editable&quot;, &quot;=&quot;, false]]}"
+            />
+            <field name="date" modifiers="{&quot;readonly&quot;: true}" />
         </group>
     </sheet>
 </form>
diff --git a/server_environment_data_encryption/tests/fixtures/res2.xml b/server_environment_data_encryption/tests/fixtures/res2.xml
index 032e108..d788320 100644
--- a/server_environment_data_encryption/tests/fixtures/res2.xml
+++ b/server_environment_data_encryption/tests/fixtures/res2.xml
@@ -1,21 +1,44 @@
 <form string="Test">
     <header>
-        <button string="Reset Confirmation" type="object" name="set_draft" states="done"/>
+        <button
+            string="Reset Confirmation"
+            type="object"
+            name="set_draft"
+            states="done"
+        />
     </header>
     <sheet>
         <div class="d-flex justify-content-between">
-              <div class="alert lead alert-warning text-center d-inline">
-                  <strong>Modify values for prod environment</strong>
-                </div>
-                <div>
-            <button name="action_change_env_data_encrypted_fields" type="object" string="Define values for preprod" class="btn btn-lg btn-primary ml-2" context="{'environment': 'preprod'}"/>
-            
-            <button name="action_change_env_data_encrypted_fields" type="object" string="Define values for test" class="btn btn-lg btn-primary ml-2" context="{'environment': 'test'}"/>
+            <div class="alert lead alert-warning text-center d-inline">
+                <strong>Modify values for prod environment</strong>
             </div>
-              </div><group col="4">
-            <field name="test" modifiers="{&quot;readonly&quot;: true}" readonly="1"/>
-            <field name="test2" attrs="{'readonly': [('type_env_is_editable', '=', False)]}" on_change="1" modifiers="{&quot;readonly&quot;: true}" readonly="1"/>
-            <field name="date" modifiers="{&quot;readonly&quot;: true}" readonly="1"/>
+            <div>
+                <button
+                    name="action_change_env_data_encrypted_fields"
+                    type="object"
+                    string="Define values for preprod"
+                    class="btn btn-lg btn-primary ml-2"
+                    context="{'environment': 'preprod'}"
+                />
+                <button
+                    name="action_change_env_data_encrypted_fields"
+                    type="object"
+                    string="Define values for test"
+                    class="btn btn-lg btn-primary ml-2"
+                    context="{'environment': 'test'}"
+                />
+            </div>
+        </div>
+        <group col="4">
+            <field name="test" modifiers="{&quot;readonly&quot;: true}" readonly="1" />
+            <field
+                name="test2"
+                attrs="{'readonly': [('type_env_is_editable', '=', False)]}"
+                on_change="1"
+                modifiers="{&quot;readonly&quot;: true}"
+                readonly="1"
+            />
+            <field name="date" modifiers="{&quot;readonly&quot;: true}" readonly="1" />
         </group>
     </sheet>
 </form>
diff --git a/setup/data_encryption/odoo/addons/data_encryption b/setup/data_encryption/odoo/addons/data_encryption
new file mode 120000
index 0000000..2aee058
--- /dev/null
+++ b/setup/data_encryption/odoo/addons/data_encryption
@@ -0,0 +1 @@
+../../../../data_encryption
\ No newline at end of file
diff --git a/setup/data_encryption/setup.py b/setup/data_encryption/setup.py
new file mode 100644
index 0000000..28c57bb
--- /dev/null
+++ b/setup/data_encryption/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/server_environment_data_encryption/odoo/addons/server_environment_data_encryption b/setup/server_environment_data_encryption/odoo/addons/server_environment_data_encryption
new file mode 120000
index 0000000..8052eed
--- /dev/null
+++ b/setup/server_environment_data_encryption/odoo/addons/server_environment_data_encryption
@@ -0,0 +1 @@
+../../../../server_environment_data_encryption
\ No newline at end of file
diff --git a/setup/server_environment_data_encryption/setup.py b/setup/server_environment_data_encryption/setup.py
new file mode 100644
index 0000000..28c57bb
--- /dev/null
+++ b/setup/server_environment_data_encryption/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)