INFRA-295: Odoo Iniz to work with Odoo 14 (#46)

Author: chinzou

README.md

@@ -150,19 +150,21 @@ By default the repo URL will be Mekom Nexus repository, but you can provide your
 ```
 
 ### Additional info
-- The `test` Gradle task will in fact run 2 substasks: **runTests** and **processCSVs**.
-You can run those 2 tasks independently if you which.
+- To run Odoo tests and process the CSV files:
 ```
-./gradlew clean runTests
+./gradlew clean test
 ```
+
+- To process CSV files and keep Odoo server running:
 ```
-./gradlew clean processCSVs
+./gradlew clean run
 ```
 
-- If you are willing to leave the Odoo server running after running the tests, use:
+Note: You can always run both tasks by using 
 ```
 ./gradlew clean test run
 ```
+
 The Odoo server will be accessible at http://localhost:8069
 
 - If you want to force remove all the containers created in the tests, run the following:

build.gradle

@@ -46,29 +46,8 @@ task removeOdooWithCompose(type: Exec) {
 	'-v'
 }
 
-task runDbDetached(type: Exec) {
-	dependsOn copyTestResources
-	workingDir testResourcesDir
-	commandLine 'docker-compose',
-	'-f',
-	'dockerfiles/run-db.yml',
-	'up',
-	'-d'
-}
-
-task initializeDb(type: Exec) {
-	dependsOn copyTestResources,
-	runDbDetached
-	workingDir testResourcesDir
-	commandLine 'docker-compose',
-	'-f',
-	'dockerfiles/initialize-db.yml',
-	'up',
-	'--abort-on-container-exit'
-}
-
 task runTests(type: Exec) {
-	dependsOn initializeDb
+	dependsOn copyTestResources
 	workingDir testResourcesDir
 	commandLine 'docker-compose',
 	'-f',
@@ -77,43 +56,12 @@ task runTests(type: Exec) {
 	'--abort-on-container-exit'
 }
 
-task setVolumePermissions(type: Exec) {
-	dependsOn runDbDetached
-	workingDir testResourcesDir
-	commandLine 'docker-compose',
-	'-f',
-	'dockerfiles/set-volume-permissions.yml',
-	'up',
-	'--abort-on-container-exit'
-}
-
-task installBaseAddons(type: Exec) {
-	dependsOn setVolumePermissions
-	workingDir testResourcesDir
-	commandLine 'docker-compose',
-	'-f',
-	'dockerfiles/install-base-addons.yml',
-	'up',
-	'--abort-on-container-exit'
-}
-
-task processCSVs(type: Exec) {
-	dependsOn copyTestResources,
-	installBaseAddons
-	workingDir testResourcesDir
-	commandLine 'docker-compose',
-	'-f',
-	'dockerfiles/process-csvs.yml',
-	'up',
-	'--abort-on-container-exit'
-}
-
 task runOdoo(type: Exec) {
-	dependsOn installBaseAddons
+	dependsOn copyTestResources
 	workingDir testResourcesDir
 	commandLine 'docker-compose',
 	'-f',
-	'dockerfiles/run-with-csvs.yml',
+	'dockerfiles/process-csvs.yml',
 	'up',
 	'--abort-on-container-exit'
 }
@@ -190,7 +138,7 @@ task createPom {
 }
 
 test {
-	dependsOn runTests, processCSVs
+	dependsOn runTests
 }
 
 task cleanDocker {

odoo_initializer/__init__.py

@@ -1 +1,2 @@
 from . import activator
+from .activator import start_init

odoo_initializer/__manifest__.py

@@ -22,5 +22,6 @@
 
     "application": True,
     "installable": True,
-    "auto_install": True
+    "auto_install": True,
+    "post_startup_hook": 'start_init'
 }

odoo_initializer/activator.py

@@ -1,6 +1,7 @@
 import logging
 
 from .utils import config
+from .utils.registry import registry
 from .utils.models_import import ModelsImport
 
 from .models.country_loader import CountryLoader
@@ -30,50 +31,53 @@
 
 _logger = logging.getLogger(__name__)
 
-_logger.info("start initialization process")
 
-# loaders are ordered based on dependency to each others
+def start_init(cr):
+    _logger.info("start initialization process")
 
-registered_loaders = [
-    CurrencyLoader,
-    CountryLoader,
-    FiscalPositionLoader,
-    PartnerLoader,
-    CompanyLoader,
-    AccountLoader,
-    JournalLoader,
-    PaymentTermLoader,
-    UOMLoader,
-    StockLocationLoader,
-    ProductCategoryLoader,
-    DrugLoader,
-    OrdersLoader,
-    ProductVariantLoader,
-    ProductLoader,
-    PriceListLoader,
-    SaleShopLoader,
-    OrderTypeLoader,
-    ShopMappingLoader,
-    DefaultValueLoader,
-    CompanyPropertyLoader,
-    SystemParameterLoader,
-    DecimalPrecisionLoader,
-    LanguageLoader,
-]
+    # loaders are ordered based on dependency to each others
 
-for registered_loader in registered_loaders:
-    loader = registered_loader()
-    loader.load_()
+    registered_loaders = [
+        CurrencyLoader,
+        CountryLoader,
+        FiscalPositionLoader,
+        PartnerLoader,
+        CompanyLoader,
+        AccountLoader,
+        JournalLoader,
+        PaymentTermLoader,
+        UOMLoader,
+        StockLocationLoader,
+        ProductCategoryLoader,
+        DrugLoader,
+        OrdersLoader,
+        ProductVariantLoader,
+        ProductLoader,
+        PriceListLoader,
+        SaleShopLoader,
+        OrderTypeLoader,
+        ShopMappingLoader,
+        DefaultValueLoader,
+        CompanyPropertyLoader,
+        SystemParameterLoader,
+        DecimalPrecisionLoader,
+        LanguageLoader,
+    ]
 
-    config.init = False
+    registry.initialize(cr)
+    for registered_loader in registered_loaders:
+        loader = registered_loader()
+        loader.load_()
 
+        config.init = False
 
-_logger.info("load Initializer configurable loaders file")
+    _logger.info("load Initializer configurable loaders file")
 
-configurable_loaders = ModelsImport().get_iniz_config_file_models()
+    configurable_loaders = ModelsImport().get_iniz_config_file_models()
 
-for config_loader in configurable_loaders:
-    loader = config_loader
-    loader.load_()
+    for config_loader in configurable_loaders:
+        loader = config_loader
+        loader.load_()
 
-_logger.info("initialization done")
+    registry.clear()
+    _logger.info("initialization done")

odoo_initializer/models/base_loader.py

@@ -1,11 +1,10 @@
 import logging
 from os.path import basename
 
-import odoo
-from odoo import api
-
-from ..utils.config import config
+from ..utils.registry import registry
 from ..utils.data_files_utils import data_files
+from ..utils.config import config
+from odoo import modules as modules
 
 _logger = logging.getLogger(__name__)
 
@@ -23,7 +22,12 @@ def __init__(self):
     filters = {}
     field_rules = {}
 
-    def apply_rules(self, record={}, rules={}):
+    def apply_rules(self, record=None, rules=None):
+
+        if rules is None:
+            rules = {}
+        if record is None:
+            record = {}
 
         # all rules should be registered here
         _rules_register = {
@@ -43,42 +47,24 @@ def load_files(self, relevant_folder, model_name):
     def load_file(self, file_):
         if not file_:
             return []
-        with api.Environment.manage():
-            registry = odoo.registry(config.db_name)
-            with registry.cursor() as cr:
-                uid = odoo.SUPERUSER_ID
-                cr.execute('SELECT model FROM ir_model ')
-                models = cr.dictfetchall()
-
-                # Checking if the model is available in database
-                found = False
-                for model in models:
-                    if model['model'] == self.model_name:
-                        found = True
-
-                if (not config.init) and found and (self.model_name not in odoo.api.Environment(cr, uid, {})):
-                    _logger.info("Updating registry once")
-                    registry.delete(config.db_name)
-                    config.init = True
-
-                if self.model_name not in odoo.api.Environment(cr, uid, {}):
-                    _logger.warn("Model '" + self.model_name + "' not found.")
-                    return False
-
-                ctx = odoo.api.Environment(cr, uid, {})['res.users'].context_get()
-                env = odoo.api.Environment(cr, uid, ctx)
-
-                model = env["base_import.import"]
-                import_wizard = model.create(
-                    {
-                        "res_model": self.model_name,
-                        "file": file_,
-                        "file_type": "text/csv",
-                    }
-                )
-                result = import_wizard.do(
-                    self.fields, {"quoting": '"', "separator": ",", "headers": True}
-                )
+
+        env = registry.env
+        if self.model_name not in env:
+            _logger.warning("Model '" + self.model_name + "' not found.")
+            return False
+
+        model = env["base_import.import"]
+        import_wizard = model.create(
+            {
+                "res_model": self.model_name,
+                "file": file_,
+                "file_type": "text/csv",
+            }
+        )
+        result = import_wizard.do(
+            self.fields, [], {"quoting": '"', "separator": ",", "headers": True}
+        )
+
         return True
 
     def _validate_mapping(self, mapping, file_header):
@@ -92,7 +78,7 @@ def _validate_mapping(self, mapping, file_header):
                     validated_mapping[field[0]] = field[1]
                 else:
                     validated_mapping = {}
-                    _logger.warn("Skipping file import, Field '" + field[1] + "' is missing")
+                    _logger.warning("Skipping file import, Field '" + field[1] + "' is missing")
                     break
         return validated_mapping
 
@@ -144,11 +130,9 @@ def _pre_process(self, file_, mapping, filters_):
         return data_files.build_csv(mapped_dict) if mapped_dict else []
 
     def _record_exist(self, record_id):
-        with api.Environment.manage():
-            registry = odoo.registry(config.db_name)
-            with registry.cursor() as cr:
-                cr.execute("SELECT res_id FROM ir_model_data WHERE name='" + record_id + "';")
-                return cr.dictfetchall() or False
+        cr = registry.cursor
+        cr.execute("SELECT res_id FROM ir_model_data WHERE name='" + record_id + "';")
+        return cr.dictfetchall() or False
 
     # Rule to delete a field that shouldn't be updated if found, from the record
     def _no_update_rule(self, record=None, field=None):
@@ -188,4 +172,4 @@ def load_(self):
                     data_files.get_checksum_path(file_, self.model_name), data_files.md5(file_)
                 )
             else:
-                _logger.warn("File cannot be loaded: " + basename(file_))
+                _logger.warning("File cannot be loaded: " + basename(file_))

odoo_initializer/models/language_loader.py

@@ -1,10 +1,11 @@
-import odoo
-from odoo import api
-from odoo.api import Environment
-from ..utils.config import config
+import logging
+
+from ..utils.registry import registry
 
 from .base_loader import BaseLoader
 
+_logger = logging.getLogger(__name__)
+
 
 class LanguageLoader(BaseLoader):
     folder = "language"
@@ -15,13 +16,8 @@ class LanguageLoader(BaseLoader):
     def load_file(self, file_):
         if not file_:
             return []
-        with api.Environment.manage():
-            registry = odoo.registry(config.db_name)
-            with registry.cursor() as cr:
-                uid = odoo.SUPERUSER_ID
-                env = Environment(cr, uid, {})
-                model = env[self.model_name]
-                for lang in file_:
-                    installer = model.create({'lang': lang.text})
-                    installer.lang_install()
+        env = registry.env
+        model = env[self.model_name]
+        for lang in file_:
+            model.create({'lang': lang.text}).lang_install()
         return

odoo_initializer/models/product_loader.py

@@ -5,7 +5,3 @@ class ProductLoader(BaseLoader):
     model_name = "product.template"
     folder = "product"
     filters = {}
-    field_rules = {
-            "lst_price": "NO_UPDATE",
-            "standard_price": "NO_UPDATE"
-        }

odoo_initializer/models/product_variant_loader.py

@@ -6,6 +6,5 @@ class ProductVariantLoader(BaseLoader):
     folder = "product_variant"
     filters = {}
     field_rules = {
-        "lst_price": "NO_UPDATE",
-        "standard_price": "NO_UPDATE"
+        "lst_price": "NO_UPDATE"
     }