Merge pull request #846 from OpenSPP/base-module-restructure

[NEW] Base Module Restructure

Author: pithtech

.github/workflows/test.yml

@@ -164,7 +164,7 @@ jobs:
       - name: Run SP-MIS tests
         env:
           COVERAGE_FILE: ".coverage-mis"
-          EXCLUDE: "fastapi,g2p_auth_id_oidc,g2p_auth_oidc,g2p_bank,g2p_bank_rest_api,g2p_change_log,g2p_disable_password_login,g2p_encryption,g2p_encryption_keymanager,g2p_encryption_rest_api,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_enumerator,g2p_formio,g2p_mis_importer,g2p_mts,g2p_notifications_base,g2p_notifications_fast2sms,g2p_notifications_voucher,g2p_notifications_wiserv,g2p_odk_importer,g2p_odk_importer_program,g2p_odk_user_mapping,g2p_openid_vci,g2p_openid_vci_programs,g2p_openid_vci_rest_api,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_portal_auth,g2p_profile_image,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_encryption,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,g2p_registry_rest_api,g2p_service_provider_beneficiary_management,g2p_service_provider_portal_base,g2p_social_registry_importer,g2p_superset_dashboard,g2p_theme,mts_connector,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme,spp_user_roles,spp_change_request_add_farmer,spp_farmer_registry_base,spp_farmer_registry_dashboard,spp_farmer_registry_default_ui,spp_farmer_registry_demo,spp_custom_filter_farmer_registry,spp_registrant_import,spp_manual_entitlement,spp_change_request_create_farm,spp_change_request_edit_farmer,spp_change_request_edit_farm"
+          EXCLUDE: "fastapi,g2p_auth_id_oidc,g2p_auth_oidc,g2p_bank,g2p_bank_rest_api,g2p_change_log,g2p_disable_password_login,g2p_encryption,g2p_encryption_keymanager,g2p_encryption_rest_api,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_enumerator,g2p_formio,g2p_mis_importer,g2p_mts,g2p_notifications_base,g2p_notifications_fast2sms,g2p_notifications_voucher,g2p_notifications_wiserv,g2p_odk_importer,g2p_odk_importer_program,g2p_odk_user_mapping,g2p_openid_vci,g2p_openid_vci_programs,g2p_openid_vci_rest_api,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_portal_auth,g2p_profile_image,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_encryption,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,g2p_registry_rest_api,g2p_service_provider_beneficiary_management,g2p_service_provider_portal_base,g2p_social_registry_importer,g2p_superset_dashboard,g2p_theme,mts_connector,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme,spp_user_roles,spp_change_request_add_farmer,spp_base_farmer_registry,spp_base_social_registry,spp_farmer_registry_dashboard,spp_farmer_registry_default_ui,spp_farmer_registry_demo,spp_custom_filter_farmer_registry,spp_registrant_import,spp_manual_entitlement,spp_change_request_create_farm,spp_change_request_edit_farmer,spp_change_request_edit_farm"
         run: oca_run_tests
       - name: Initialize farmer_registry db
         env:
@@ -178,10 +178,24 @@ jobs:
         env:
           PGDATABASE: farmer_registry
           COVERAGE_FILE: ".coverage-farmer"
-          EXCLUDE: "fastapi,g2p_auth_id_oidc,g2p_auth_oidc,g2p_bank,g2p_bank_rest_api,g2p_change_log,g2p_disable_password_login,g2p_encryption,g2p_encryption_keymanager,g2p_encryption_rest_api,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_enumerator,g2p_formio,g2p_mis_importer,g2p_mts,g2p_notifications_base,g2p_notifications_fast2sms,g2p_notifications_voucher,g2p_notifications_wiserv,g2p_odk_importer,g2p_odk_importer_program,g2p_odk_user_mapping,g2p_openid_vci,g2p_openid_vci_programs,g2p_openid_vci_rest_api,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_portal_auth,g2p_profile_image,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_encryption,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,g2p_registry_rest_api,g2p_service_provider_beneficiary_management,g2p_service_provider_portal_base,g2p_social_registry_importer,g2p_superset_dashboard,g2p_theme,mts_connector,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme,spp_user_roles,spp_base,spp_mis_demo,spp_registrant_import,spp_change_request_add_children_demo,spp_manual_entitlement,spp_change_request_create_group"
+          EXCLUDE: "fastapi,g2p_auth_id_oidc,g2p_auth_oidc,g2p_bank,g2p_bank_rest_api,g2p_change_log,g2p_disable_password_login,g2p_encryption,g2p_encryption_keymanager,g2p_encryption_rest_api,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_enumerator,g2p_formio,g2p_mis_importer,g2p_mts,g2p_notifications_base,g2p_notifications_fast2sms,g2p_notifications_voucher,g2p_notifications_wiserv,g2p_odk_importer,g2p_odk_importer_program,g2p_odk_user_mapping,g2p_openid_vci,g2p_openid_vci_programs,g2p_openid_vci_rest_api,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_portal_auth,g2p_profile_image,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_encryption,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,g2p_registry_rest_api,g2p_service_provider_beneficiary_management,g2p_service_provider_portal_base,g2p_social_registry_importer,g2p_superset_dashboard,g2p_theme,mts_connector,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme,spp_user_roles,spp_base_spmis,spp_base_social_registry,spp_mis_demo,spp_registrant_import,spp_change_request_add_children_demo,spp_manual_entitlement,spp_change_request_create_group"
+        run: oca_run_tests
+      - name: Initialize social_registry db
+        env:
+          PGDATABASE: social_registry
+        run: oca_init_test_database
+      - name: Remove test files from pip-installed addons
+        run: |
+          rm -rf /opt/odoo-venv/lib/python3.10/site-packages/odoo/addons/g2p_programs/tests
+          rm -rf /opt/odoo-venv/lib/python3.10/site-packages/odoo/addons/g2p_registry_individual/tests
+      - name: Run Social Registry tests
+        env:
+          PGDATABASE: social_registry
+          COVERAGE_FILE: ".coverage-social"
+          EXCLUDE: "fastapi,g2p_auth_id_oidc,g2p_auth_oidc,g2p_bank,g2p_bank_rest_api,g2p_change_log,g2p_disable_password_login,g2p_encryption,g2p_encryption_keymanager,g2p_encryption_rest_api,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_enumerator,g2p_formio,g2p_mis_importer,g2p_mts,g2p_notifications_base,g2p_notifications_fast2sms,g2p_notifications_voucher,g2p_notifications_wiserv,g2p_odk_importer,g2p_odk_importer_program,g2p_odk_user_mapping,g2p_openid_vci,g2p_openid_vci_programs,g2p_openid_vci_rest_api,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_portal_auth,g2p_profile_image,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_encryption,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,g2p_registry_rest_api,g2p_service_provider_beneficiary_management,g2p_service_provider_portal_base,g2p_social_registry_importer,g2p_superset_dashboard,g2p_theme,mts_connector,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme,spp_user_roles,spp_change_request_add_farmer,spp_base_farmer_registry,spp_base_spmis,spp_farmer_registry_dashboard,spp_farmer_registry_default_ui,spp_farmer_registry_demo,spp_custom_filter_farmer_registry,spp_registrant_import,spp_manual_entitlement,spp_change_request_create_farm,spp_change_request_edit_farmer,spp_change_request_edit_farm,spp_mis_demo,spp_registrant_import,spp_change_request_add_children_demo,spp_manual_entitlement,spp_change_request_create_group"
         run: oca_run_tests
       - name: Combine coverage data
-        run: coverage combine .coverage-mis .coverage-farmer
+        run: coverage combine .coverage-mis .coverage-farmer .coverage-social
       - uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

README.md

@@ -31,7 +31,7 @@ addon | summary
 [spp_audit_log](spp_audit_log/) | Provides audit logging functionality to track data changes and user actions within OpenSPP, enhancing transparency and accountability.
 [spp_audit_post](spp_audit_post/) | Enables posting of audit log messages to related parent records, providing a centralized view of changes across interconnected data in social protection programs.
 [spp_auto_update_entitlements](spp_auto_update_entitlements/) | Automatically updates entitlement states based on their redemption status at the end of program cycles in OpenSPP.
-[spp_base](spp_base/) | Provides essential configurations, UI customizations, and base functionalities for the OpenSPP system, including top-up card management and integration with other OpenSPP modules for areas, service points, programs, and custom fields.
+[spp_base_spmis](spp_base_spmis/) | Provides essential configurations, UI customizations, and base functionalities for the OpenSPP system, including top-up card management and integration with other OpenSPP modules for areas, service points, programs, and custom fields.
 [spp_base_api](spp_base_api/) | Provides foundational API functions and methods for seamless interaction with the OpenSPP system, enabling data exchange via APIs or XML-RPC.
 [spp_base_demo](spp_base_demo/) | Provides demonstration data for the OpenSPP system, including sample registrants, programs, and products to facilitate user exploration and training.
 [spp_base_gis](spp_base_gis/) | Provides Geographical Information System (GIS) capabilities to OpenSPP, enabling visualization and interaction with geospatial data on maps, integrating with modules like Registries and Targeting & Eligibility for enhanced program management.
@@ -66,7 +66,7 @@ addon | summary
 [spp_event_data_program_membership](spp_event_data_program_membership/) | This module allows users to record and track program membership-related events, such as enrollment, suspension, or exit, and link them to specific program membership records within OpenSPP.
 [spp_event_demo](spp_event_demo/) | Provides demonstration data and functionalities for the OpenSPP event tracking system, showcasing practical applications through predefined event types, data models, views, and wizards.
 [spp_exclusion_filter](spp_exclusion_filter/) | This module enhances the OpenSPP program creation process by enabling the configuration and application of exclusion filters, ensuring that only eligible registrants are considered for enrollment in new programs.
-[spp_farmer_registry_base](spp_farmer_registry_base/) | Base module for managing farmer registries, linking farmers to farms, land, and agricultural activities.
+[spp_base_farmer_registry](spp_base_farmer_registry/) | Base module for managing farmer registries, linking farmers to farms, land, and agricultural activities.
 [spp_farmer_registry_dashboard](spp_farmer_registry_dashboard/) | Provides interactive dashboards and reports for visualizing data from the OpenSPP Farmer Registry, offering insights into key metrics and trends related to registered farmers.
 [spp_farmer_registry_demo](spp_farmer_registry_demo/) | Provides pre-populated demo data for the OpenSPP Farmer Registry, showcasing its features with realistic sample data.
 [spp_idpass](spp_idpass/) | ID PASS

openspp-requirements.txt

@@ -90,3 +90,4 @@ shapely
 simplejson
 swagger_spec_validator
 xlrd
+openpyxl

requirements.txt

@@ -9,6 +9,7 @@ geojson
 jsonschema
 jwcrypto>=1.5.6
 numpy>=1.22.2
+openpyxl
 pyjwt>=2.4.0
 pyproj
 python-magic
@@ -18,6 +19,7 @@ requests>=2.25.1
 shapely
 simplejson
 swagger_spec_validator
+ujson>=5.4.0
 urllib3>=1.26.5
 xlrd
 zipp>=3.19.1

setup/_metapackage/pyproject.toml

@@ -11,7 +11,8 @@ dependencies = [
     "odoo-addon-spp_audit_log>=17.0dev,<17.1dev",
     "odoo-addon-spp_audit_post>=17.0dev,<17.1dev",
     "odoo-addon-spp_auto_update_entitlements>=17.0dev,<17.1dev",
-    "odoo-addon-spp_base>=17.0dev,<17.1dev",
+    "odoo-addon-spp_base_common>=17.0dev,<17.1dev",
+    "odoo-addon-spp_base_spmis>=17.0dev,<17.1dev",
     "odoo-addon-spp_base_api>=17.0dev,<17.1dev",
     "odoo-addon-spp_base_demo>=17.0dev,<17.1dev",
     "odoo-addon-spp_base_gis>=17.0dev,<17.1dev",
@@ -46,7 +47,7 @@ dependencies = [
     "odoo-addon-spp_event_data_program_membership>=17.0dev,<17.1dev",
     "odoo-addon-spp_event_demo>=17.0dev,<17.1dev",
     "odoo-addon-spp_exclusion_filter>=17.0dev,<17.1dev",
-    "odoo-addon-spp_farmer_registry_base>=17.0dev,<17.1dev",
+    "odoo-addon-spp_base_farmer_registry>=17.0dev,<17.1dev",
     "odoo-addon-spp_farmer_registry_dashboard>=17.0dev,<17.1dev",
     "odoo-addon-spp_farmer_registry_demo>=17.0dev,<17.1dev",
     "odoo-addon-spp_idpass>=17.0dev,<17.1dev",

spp_area/__manifest__.py

@@ -14,12 +14,13 @@
     "maintainers": ["jeremi", "gonzalesedwin1123", "reichie020212"],
     "depends": [
         "base",
+        "spp_base_common",
+        "spp_user_roles",
         "spp_area_base",
         "g2p_registry_base",
         "g2p_registry_individual",
         "g2p_registry_group",
         "queue_job",
-        "spp_registry_base",
     ],
     "external_dependencies": {},
     "data": [
@@ -29,6 +30,8 @@
         "views/area.xml",
         "views/area_import.xml",
         "views/area_kind.xml",
+        "views/role.xml",
+        "views/user.xml",
     ],
     "assets": {},
     "demo": [],

spp_area/models/__init__.py

@@ -1,4 +1,6 @@
 # Part of OpenSPP. See LICENSE file for full copyright and licensing details.
 
-
 from . import registrant
+from . import area
+from . import user
+from . import role

spp_user_roles/models/area.py spp_area/models/area.pyspp_user_roles/models/area.py renamed to spp_area/models/area.py

@@ -3,7 +3,7 @@
 from odoo import api, models
 
 
-class AreaCustomSPPRole(models.Model):
+class SPPAreaCustom(models.Model):
     _inherit = "spp.area"
 
     @api.model

spp_area/models/registrant.py

@@ -19,3 +19,19 @@ def _get_area_domain(self):
         "Area",
         domain=_get_area_domain,
     )
+
+    @api.model
+    def _prepare_domain(self, domain):
+        domain = domain or []
+        domain += [("area_id", "child_of", self.env.user.center_area_ids.ids)] if self.env.user.center_area_ids else []
+        return domain
+
+    @api.model
+    def search_read(self, domain=None, fields=None, offset=0, limit=None, order=None):
+        domain = self._prepare_domain(domain)
+        return super().search_read(domain, fields, offset, limit, order)
+
+    @api.model
+    def web_search_read(self, domain, specification, offset=0, limit=None, order=None, count_limit=None):
+        domain = self._prepare_domain(domain)
+        return super().web_search_read(domain, specification, offset, limit, order, count_limit)

spp_area/models/role.py

@@ -0,0 +1,25 @@
+# Part of OpenSPP. See LICENSE file for full copyright and licensing details.
+
+import logging
+
+from odoo import api, fields, models
+
+_logger = logging.getLogger(__name__)
+
+
+class ResUsersRoleCustomSPP(models.Model):
+    _inherit = "res.users.role"
+
+    @api.onchange("role_type")
+    def _onchange_role_type(self):
+        for rec in self:
+            if rec.role_type == "global":
+                rl = rec.line_ids.filtered(lambda a: not a.local_area_id)
+                if rl:
+                    rl.update({"local_area_id": None})
+
+
+class ResUsersRoleLineCustomSPP(models.Model):
+    _inherit = "res.users.role.line"
+
+    local_area_id = fields.Many2one("spp.area", string="Center Area")