Skip to content

Commit 2e0cebf

Browse files
emjay0921emjay0921
committed
merge: resolve conflicts with 19.0
- spp_area_hdx: keep 19.0 comment wording for constraint test - spp_cr_types_advanced/base: accept 19.0 removal of duplicate ACLs (models defined in spp_change_request_v2, ACLs belong there)
2 parents 55126ea + 140d95e commit 2e0cebf

908 files changed

Lines changed: 99891 additions & 3360 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.openspp-lint.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@ rules:
7676
- "entitlement_manager_ids" # Entitlement managers (typically <10 per program)
7777
- "payment_manager_ids" # Payment managers (typically <10 per program)
7878
- "farm_machinery_ids" # Farm machinery (typically <20 per farm)
79+
- "group_membership_ids" # Group members (editable from registrant form)
80+
- "individual_membership_ids" # Individual memberships (editable from registrant form)
81+
- "reg_ids" # Registrant IDs (editable from registrant form)
82+
- "related_1_ids" # Relationships (editable from registrant form)
83+
- "related_2_ids" # Relationships (editable from registrant form)
84+
- "beneficiary_ids" # Duplicate beneficiaries (editable from duplicate form)
7985

8086
# Severity overrides (change default severity for rules)
8187
# Valid values: error, warning, info

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ repos:
5656
- --branch=19.0
5757
- --org-name=OpenSPP
5858
- --repo-name=OpenSPP2
59+
- --template-filename=tools/readme_template.rst.jinja
5960
- --if-source-changed
6061
- --keep-source-digest
6162
- --convert-fragments-to-markdown
@@ -303,4 +304,4 @@ repos:
303304
# Only scan OpenSPP spp_* modules (not scripts, endpoint handlers, etc.)
304305
files: ^spp_
305306
# Exclude test files, migrations, and demo-only modules
306-
exclude: ^(tests/|scripts/tests/|.*/tests/.*|.*/migrations/.*|spp_4ps_demo/)
307+
exclude: ^(tests/|scripts/tests/|.*/tests/.*|.*/migrations/.*|spp_4ps_demo/|spp_case_demo/|spp_grm_demo/)

‎codecov.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Codecov configuration for OpenSPP
2+
# https://docs.codecov.io/docs/codecov-yaml
3+
4+
coverage:
5+
status:
6+
project:
7+
default:
8+
# Only check coverage on files changed in this PR, not the entire project.
9+
# CI only tests changed modules, so project-wide coverage would always drop
10+
# on PRs that don't re-test every module.
11+
only_pulls: true
12+
patch:
13+
default:
14+
target: 70%
15+
16+
# Each module uploads with its own flag (flags: ${{ matrix.module }} in CI).
17+
# Carry forward coverage from previous commits so modules not tested in this
18+
# PR still contribute to overall project coverage.
19+
flag_management:
20+
default_rules:
21+
carryforward: true
22+
23+
comment:
24+
layout: "reach,diff,flags,files"
25+
behavior: default
26+
require_changes: false
27+
28+
ignore:
29+
- "**/tests/**"
30+
- "**/migrations/**"
31+
- "scripts/**"

‎endpoint_route_handler/README.rst‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
.. image:: https://odoo-community.org/readme-banner-image
2-
:target: https://odoo-community.org/get-involved?utm_source=readme
3-
:alt: Odoo Community Association
4-
51
======================
62
Endpoint route handler
73
======================
84

9-
..
5+
..
106
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
117
!! This file is generated by oca-gen-addon-readme !!
128
!! changes will be overwritten. !!
@@ -34,7 +30,6 @@ Can be used as a mixin or as a tool.
3430
.. IMPORTANT::
3531
This is an alpha version, the data model and design can change at any time without warning.
3632
Only for development or testing purpose, do not use in production.
37-
`More details on development status <https://odoo-community.org/page/development-status>`_
3833

3934
**Table of contents**
4035

@@ -186,4 +181,4 @@ Current maintainer:
186181

187182
This module is part of the `OpenSPP/OpenSPP2 <https://github.com/OpenSPP/OpenSPP2/tree/19.0/endpoint_route_handler>`_ project on GitHub.
188183

189-
You are welcome to contribute.
184+
You are welcome to contribute.

‎endpoint_route_handler/static/description/index.html‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
55
<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
6-
<title>README.rst</title>
6+
<title>Endpoint route handler</title>
77
<style type="text/css">
88

99
/*
@@ -360,14 +360,9 @@
360360
</style>
361361
</head>
362362
<body>
363-
<div class="document">
363+
<div class="document" id="endpoint-route-handler">
364+
<h1 class="title">Endpoint route handler</h1>
364365

365-
366-
<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
367-
<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
368-
</a>
369-
<div class="section" id="endpoint-route-handler">
370-
<h1>Endpoint route handler</h1>
371366
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
372367
!! This file is generated by oca-gen-addon-readme !!
373368
!! changes will be overwritten. !!
@@ -381,8 +376,7 @@ <h1>Endpoint route handler</h1>
381376
<div class="admonition important">
382377
<p class="first admonition-title">Important</p>
383378
<p class="last">This is an alpha version, the data model and design can change at any time without warning.
384-
Only for development or testing purpose, do not use in production.
385-
<a class="reference external" href="https://odoo-community.org/page/development-status">More details on development status</a></p>
379+
Only for development or testing purpose, do not use in production.</p>
386380
</div>
387381
<p><strong>Table of contents</strong></p>
388382
<div class="contents local topic" id="contents">
@@ -403,9 +397,9 @@ <h1>Endpoint route handler</h1>
403397
</ul>
404398
</div>
405399
<div class="section" id="usage">
406-
<h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
400+
<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
407401
<div class="section" id="as-a-mixin">
408-
<h3><a class="toc-backref" href="#toc-entry-2">As a mixin</a></h3>
402+
<h2><a class="toc-backref" href="#toc-entry-2">As a mixin</a></h2>
409403
<p>Use standard Odoo inheritance:</p>
410404
<pre class="literal-block">
411405
class MyModel(models.Model):
@@ -430,7 +424,7 @@ <h3><a class="toc-backref" href="#toc-entry-2">As a mixin</a></h3>
430424
record.</p>
431425
</div>
432426
<div class="section" id="as-a-tool">
433-
<h3><a class="toc-backref" href="#toc-entry-3">As a tool</a></h3>
427+
<h2><a class="toc-backref" href="#toc-entry-3">As a tool</a></h2>
434428
<p>Initialize non stored route handlers and generate routes from them. For
435429
instance:</p>
436430
<pre class="literal-block">
@@ -465,7 +459,7 @@ <h3><a class="toc-backref" href="#toc-entry-3">As a tool</a></h3>
465459
</div>
466460
</div>
467461
<div class="section" id="known-issues-roadmap">
468-
<h2><a class="toc-backref" href="#toc-entry-4">Known issues / Roadmap</a></h2>
462+
<h1><a class="toc-backref" href="#toc-entry-4">Known issues / Roadmap</a></h1>
469463
<ul>
470464
<li><p class="first">add api docs helpers</p>
471465
</li>
@@ -495,37 +489,36 @@ <h2><a class="toc-backref" href="#toc-entry-4">Known issues / Roadmap</a></h2>
495489
routing info.</p>
496490
</div>
497491
<div class="section" id="bug-tracker">
498-
<h2><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h2>
492+
<h1><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h1>
499493
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OpenSPP/OpenSPP2/issues">GitHub Issues</a>.
500494
In case of trouble, please check there if your issue has already been reported.
501495
If you spotted it first, help us to smash it by providing a detailed and welcomed
502496
<a class="reference external" href="https://github.com/OpenSPP/OpenSPP2/issues/new?body=module:%20endpoint_route_handler%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
503497
<p>Do not contact contributors directly about support or help with technical issues.</p>
504498
</div>
505499
<div class="section" id="credits">
506-
<h2><a class="toc-backref" href="#toc-entry-6">Credits</a></h2>
500+
<h1><a class="toc-backref" href="#toc-entry-6">Credits</a></h1>
507501
<div class="section" id="authors">
508-
<h3><a class="toc-backref" href="#toc-entry-7">Authors</a></h3>
502+
<h2><a class="toc-backref" href="#toc-entry-7">Authors</a></h2>
509503
<ul class="simple">
510504
<li>Camptocamp</li>
511505
</ul>
512506
</div>
513507
<div class="section" id="contributors">
514-
<h3><a class="toc-backref" href="#toc-entry-8">Contributors</a></h3>
508+
<h2><a class="toc-backref" href="#toc-entry-8">Contributors</a></h2>
515509
<ul class="simple">
516510
<li>Simone Orsi &lt;<a class="reference external" href="mailto:simone.orsi&#64;camptocamp.com">simone.orsi&#64;camptocamp.com</a>&gt;</li>
517511
<li>Nguyen Minh Chien &lt;<a class="reference external" href="mailto:chien&#64;trobz.com">chien&#64;trobz.com</a>&gt;</li>
518512
</ul>
519513
</div>
520514
<div class="section" id="maintainers">
521-
<h3><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h3>
515+
<h2><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h2>
522516
<p>Current maintainer:</p>
523517
<p><a class="reference external image-reference" href="https://github.com/simahawk"><img alt="simahawk" src="https://github.com/simahawk.png?size=40px" /></a></p>
524518
<p>This module is part of the <a class="reference external" href="https://github.com/OpenSPP/OpenSPP2/tree/19.0/endpoint_route_handler">OpenSPP/OpenSPP2</a> project on GitHub.</p>
525519
<p>You are welcome to contribute.</p>
526520
</div>
527521
</div>
528522
</div>
529-
</div>
530523
</body>
531524
</html>

‎requirements.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ fastapi>=0.110.0
99
geojson
1010
httpx
1111
jwcrypto
12+
libhxl
1213
numpy>=1.22.2
1314
openpyxl
1415
parse-accept-language

‎scripts/audit-api-auth.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@
8080
("spp_encryption_rest_api", "well_known.py", "*"),
8181
# FastAPI demo router (development only)
8282
("fastapi", "demo_router.py", "*"),
83+
# OGC OPTIONS endpoint - CORS preflight, public by design
84+
("spp_api_v2_gis", "ogc_features.py", "options_collection_items"),
8385
}
8486

8587

‎spp_aggregation/__init__.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Part of OpenSPP. See LICENSE file for full copyright and licensing details.
2+
3+
from . import models

‎spp_aggregation/__manifest__.py‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Part of OpenSPP. See LICENSE file for full copyright and licensing details.
2+
{
3+
"name": "OpenSPP Aggregation Engine",
4+
"summary": "Unified aggregation service for statistics, simulations, and GIS queries",
5+
"category": "OpenSPP",
6+
"version": "19.0.2.0.0",
7+
"sequence": 1,
8+
"author": "OpenSPP.org",
9+
"website": "https://github.com/OpenSPP/OpenSPP2",
10+
"license": "LGPL-3",
11+
"development_status": "Alpha",
12+
"maintainers": ["jeremi"],
13+
"depends": [
14+
"base",
15+
"spp_cel_domain",
16+
"spp_area",
17+
"spp_registry",
18+
"spp_security",
19+
"spp_metrics_services",
20+
],
21+
"data": [
22+
# Security
23+
"security/aggregation_security.xml",
24+
"security/ir.model.access.csv",
25+
# Data
26+
"data/cron_cache_cleanup.xml",
27+
# Views
28+
"views/aggregation_scope_views.xml",
29+
"views/aggregation_access_views.xml",
30+
"views/menu.xml",
31+
],
32+
"assets": {},
33+
"demo": [],
34+
"images": [],
35+
"application": False,
36+
"installable": True,
37+
"auto_install": False,
38+
}

‎spp_aggregation/data/cron_cache_cleanup.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<odoo noupdate="1">
3+
<!-- Cron job to clean up expired cache entries -->
4+
<record id="ir_cron_cache_cleanup" model="ir.cron">
5+
<field name="name">Aggregation: Cache Cleanup</field>
6+
<field name="model_id" ref="model_spp_aggregation_cache_entry" />
7+
<field name="state">code</field>
8+
<field name="code">model.cron_cleanup_expired()</field>
9+
<field name="interval_number">1</field>
10+
<field name="interval_type">hours</field>
11+
<field name="active">True</field>
12+
</record>
13+
</odoo>

0 commit comments

Comments
 (0)