fixup

OCA · Oct 31, 2024 · 3fd0732 · 3fd0732
1 parent ef401f3
commit 3fd0732
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 22 deletions.
diff --git a/polars_db_process/data/files/customers.sql → polars_db_process/data/df/customers.sql b/polars_db_process/data/files/customers.sql → polars_db_process/data/df/customers.sql
diff --git a/polars_db_process/models/df_source.py b/polars_db_process/models/df_source.py
@@ -110,7 +110,6 @@ def _get_test_file_paths(self):
         res.update(
             {
                 "polars_db_process": {
-                    "relative_path": "data/files",
                     "xmlid": "polars_db_process.contact_chinook",
                 }
             }

diff --git a/polars_db_schema/models/db_source.py b/polars_db_schema/models/db_source.py
@@ -9,7 +9,6 @@ class DfSource(models.Model):
     #     res.update(
     #         {
     #             "polars_db_schema": {
-    #                 "relative_path": "tests/files",
     #                 "xmlid": "migr.contact",
     #             }
     #         }

diff --git a/polars_process/tests/files/4_fields.xlsx → polars_process/data/df/4_fields.xlsx b/polars_process/tests/files/4_fields.xlsx → polars_process/data/df/4_fields.xlsx
diff --git a/.../tests/files/missing_required_column.xlsx → ...cess/data/df/missing_required_column.xlsx b/.../tests/files/missing_required_column.xlsx → ...cess/data/df/missing_required_column.xlsx
diff --git a/polars_process/tests/files/wrong_date.xlsx → polars_process/data/df/wrong_date.xlsx b/polars_process/tests/files/wrong_date.xlsx → polars_process/data/df/wrong_date.xlsx
diff --git a/polars_process/models/df_source.py b/polars_process/models/df_source.py
@@ -4,6 +4,8 @@
 from odoo import fields, models
 from odoo.modules.module import get_module_path
 
+DF_SOURCE_DIR = "data/df"
+
 
 class DfSource(models.Model):
     _name = "df.source"
@@ -48,7 +50,7 @@ def _reset_process(self):
         self.state = "draft"
 
     def _populate(self):
-        def create_attach(myfile, addon, idstring, relative_path):
+        def create_attach(myfile, addon, idstring):
             with open(myfile, "rb") as f:
                 name = f.name[f.name.find(addon) :]
                 vals = {
@@ -63,12 +65,11 @@ def create_attach(myfile, addon, idstring, relative_path):
         self.env[self._name].search([("template", "=", False)]).unlink()
         paths = self._get_test_file_paths()
         for addon, data in paths.items():
-            relative_path = data["relative_path"]
             idstring = data["xmlid"]
             if self.env.ref(idstring):
-                mpath = Path(get_module_path(addon)) / relative_path
+                mpath = Path(get_module_path(addon)) / DF_SOURCE_DIR
                 for mfile in tuple(mpath.iterdir()):
-                    create_attach(mfile, addon, idstring, relative_path)
+                    create_attach(mfile, addon, idstring)
         action = self.env.ref("polars_process.df_source_action")._get_action_dict()
         return action
 
@@ -78,27 +79,22 @@ def _get_file(self, name=None):
             return self.template
         name = self.name or name
         module = name[: name.find("/")]
-        relative = self._get_test_file_paths().get(module)
-        relative = relative and relative.get("relative_path")
-        if relative:
-            path = Path(get_module_path(module))
-            path = path / relative / name[name.rfind("/") + 1 :]
-            with open(path, "rb") as f:
-                return f.read()
+        path = Path(get_module_path(module))
+        path = path / DF_SOURCE_DIR / name[name.rfind("/") + 1 :]
+        with open(path, "rb") as f:
+            return f.read()
 
     def _get_test_file_paths(self):
         """
         You may override if you want populate files in your module
         returns:
         {"module_name": {
-            "relative_path": "tests/files",
             "xmlid": "model_map_xml_id"}
             }
         }
         """
         return {
             "polars_process": {
-                "relative_path": "tests/files",
                 "xmlid": "polars_process.model_map_contact",
             }
         }

diff --git a/polars_process/views/df_source.xml b/polars_process/views/df_source.xml
@@ -35,12 +35,6 @@
                     type="object"
                     title="Start process"
                 />
-                <field
-                    name="template"
-                    filename="name"
-                    widget="binary"
-                    options="{'accepted_file_extensions': '.xlsx'}"
-                />
                 <field name="name" />
                 <field name="state" />
                 <button
@@ -50,7 +44,12 @@
                     invisible="state!='done'"
                     title="Not yet implemented in this module"
                 />
-                <!-- <field name="id" optional="hide" /> -->
+                <field
+                    name="template"
+                    filename="name"
+                    widget="binary"
+                    options="{'accepted_file_extensions': '.xlsx'}"
+                />
                 <field name="rename" optional="hide" />
             </list>
         </field>