Products.urban 2.5.0.dev5__tar.gz → 2.5.0.dev7__tar.gz

{Products.urban-2.5.0.dev5 → Products.urban-2.5.0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Products.urban
-Version: 2.5.0.dev5
+Version: 2.5.0.dev7
 Summary: Urban Certificate Management
 Home-page: http://www.communesplone.org/les-outils/applications-metier/gestion-des-permis-durbanisme
 Author: Simon Delcourt

{Products.urban-2.5.0.dev5 → Products.urban-2.5.0.dev7}/docs/CHANGES.rst

@@ -8,6 +8,36 @@ Changelog
 
 .. towncrier release notes start
 
+2.5.0.dev7 (2024-04-07)
+-----------------------
+
+Bug fixes:
+
+
+- Avoid an error if an advice was not defined
+  [mpeeters] (SUP-36385)
+
+
+2.5.0.dev6 (2024-04-01)
+-----------------------
+
+Bug fixes:
+
+
+- Move method methods to be available for every events.
+  Change `is_CODT2024` to be true if there is no deposit but current date is greater than 2024-03-31.
+  [mpeeters] (URB-3008)
+
+
+Internal:
+
+
+- Update setup for tests
+  [mpeeters]
+  Test checking completion task
+  [daggelpop] (URB-3005)
+
+
 2.5.0.dev5 (2024-03-20)
 -----------------------
 

{Products.urban-2.5.0.dev5 → Products.urban-2.5.0.dev7}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '2.5.0.dev5'
+version = '2.5.0.dev7'
 
 setup(
     name="Products.urban",

{Products.urban-2.5.0.dev5 → Products.urban-2.5.0.dev7}/src/Products/urban/UrbanEvent.py

@@ -901,6 +901,8 @@ class UrbanEvent(BaseFolder, BrowserDefaultMixin):
         Returns the external decision value or the UrbanVocabularyTerm if theObject=True
         """
         res = self.getField("externalDecision").get(self)
+        if res == [""]:
+            res = ""
         if res and theObject:
             tool = getToolByName(self, "portal_urban")
             res = getattr(tool.externaldecisions, res)

{Products.urban-2.5.0.dev5 → Products.urban-2.5.0.dev7}/src/Products/urban/configure.zcml

@@ -42,6 +42,7 @@
   <include package="urban.vocabulary"/>
   <include package="urban.schedule"/>
   <include package="urban.events"/>
+  <include package="urban.restapi"/>
 
   <include file="grok.zcml" />
   <include file="permissions.zcml" />

{Products.urban-2.5.0.dev5 → Products.urban-2.5.0.dev7}/src/Products/urban/content/licence/GenericLicence.py

@@ -28,6 +28,7 @@ from Products.Archetypes.atapi import *
 from zope.interface import implements
 from Products.urban import interfaces
 from Products.urban.utils import is_attachment
+from Products.urban import utils
 
 from Products.CMFDynamicViewFTI.browserdefault import BrowserDefaultMixin
 
@@ -1585,7 +1586,10 @@ class GenericLicence(BaseFolder, UrbanBase, BrowserDefaultMixin):
 
     def is_CODT2024(self):
         """Return if we are in the new reform of CODT"""
+        now = utils.now()
         deposit = self.getFirstDeposit()
+        if not deposit and now >= datetime(2024, 4, 1):
+            return True
         if not deposit:
             return False
         if not deposit.eventDate:

{Products.urban-2.5.0.dev5 → Products.urban-2.5.0.dev7}/src/Products/urban/profiles/extra/metadata.xml

@@ -2,5 +2,7 @@
 <metadata>
   <dependencies>
      <dependency>profile-Products.urban:prod</dependency>
+     <dependency>profile-urban.events:default</dependency>
+     <dependency>profile-urban.schedule:default</dependency>
   </dependencies>
 </metadata>

{Products.urban-2.5.0.dev5 → Products.urban-2.5.0.dev7}/src/Products/urban/profiles/testsWithConfig/metadata.xml

@@ -3,5 +3,7 @@
   <version>1</version>
     <dependencies>
       <dependency>profile-Products.urban:tests</dependency>
+      <dependency>profile-urban.events:default</dependency>
+      <dependency>profile-urban.schedule:default</dependency>
    </dependencies>
 </metadata>

Products.urban-2.5.0.dev7/src/Products/urban/schedule/tests/test_modified_blueprint.py

@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+
+from Products.urban.testing import URBAN_TESTS_CONFIG_FUNCTIONAL
+from datetime import datetime
+from plone import api
+from plone.app.testing import login
+from plone.app.testing import logout
+from zope.lifecycleevent import ObjectModifiedEvent
+from zope.event import notify
+
+import unittest
+
+
+class TestScheduleModifiedBluePrint(unittest.TestCase):
+
+    layer = URBAN_TESTS_CONFIG_FUNCTIONAL
+
+    def _get_due_date(self, task):
+        """"Return the due date for a given task"""
+        container = task.get_container()
+        config = task.get_task_config()
+        return config.compute_due_date(container, task)
+
+    def setUp(self):
+        portal = self.layer["portal"]
+        self.portal = portal
+        login(self.portal, self.layer.default_user)
+        self.portal_urban = portal.portal_urban
+        event_config = self.portal_urban.codt_buildlicence.urbaneventtypes["depot-de-la-demande"]
+
+        self.licence_1 = api.content.create(
+            type="CODT_BuildLicence",
+            container=self.portal.urban.codt_buildlicences,
+            title="Licence 1",
+        )
+        self.licence_1.setProcedureChoice("simple")
+        event = self.licence_1.createUrbanEvent(event_config)
+        event.setEventDate(datetime(2024, 3, 31))
+        notify(ObjectModifiedEvent(self.licence_1))
+
+        self.licence_2 = api.content.create(
+            type="CODT_BuildLicence",
+            container=self.portal.urban.codt_buildlicences,
+            title="Licence 2",
+        )
+        self.licence_2.setProcedureChoice("simple")
+        event = self.licence_2.createUrbanEvent(event_config)
+        event.setEventDate(datetime(2024, 4, 1))
+        notify(ObjectModifiedEvent(self.licence_2))
+
+        logout()
+        login(portal, "urbaneditor")
+
+    def tearDown(self):
+        login(self.portal, self.layer.default_user)
+        api.content.delete(self.licence_1)
+        api.content.delete(self.licence_2)
+
+    def test_no_modified_blueprint_completion(self):
+        """
+        Warning: Liege deviates from standard (task namings, additional delay = -6)
+        """
+
+        # 20 days (minus 6)
+        self.assertTrue("TASK_verif_complet" in self.licence_1)
+        task = self.licence_1.TASK_verif_complet
+
+        self.assertEqual(datetime(2024, 4, 14).date(), self._get_due_date(task))
+
+        # 30 days (minus 6)
+        self.assertTrue("TASK_verif_complet" in self.licence_2)
+        task = self.licence_2.TASK_verif_complet
+
+        self.assertEqual(datetime(2024, 4, 25).date(), self._get_due_date(task))

{Products.urban-2.5.0.dev5 → Products.urban-2.5.0.dev7}/src/Products/urban/setuphandlers.py

@@ -281,6 +281,9 @@ def testExtraPostInstall(context):
     logger.info("addEventTypesAndTemplates : starting...")
     addEventTypesAndTemplates(context)
     logger.info("addEventTypesAndTemplates : Done")
+    logger.info("Setup default schedule configuration: starting...")
+    addScheduleConfigs(context, profile_name="extra")
+    logger.info("Setup default schedule configuration : Done")
 
 
 def updateVocabularyConfig(context):
@@ -405,11 +408,12 @@ def createScheduleConfig(container, portal_type, id="schedule", title=""):
     return schedule_config
 
 
-def addScheduleConfigs(context):
+def addScheduleConfigs(context, profile_name=None):
     if context.readDataFile("urban_extra_marker.txt") is None:
         return
 
-    profile_name = context._profile_path.split("/")[-1]
+    if profile_name is None:
+        profile_name = context._profile_path.split("/")[-1]
     module_name = "Products.urban.profiles.%s.schedule_config" % profile_name
     attribute = "schedule_config"
     module = __import__(module_name, fromlist=[attribute])

{Products.urban-2.5.0.dev5 → Products.urban-2.5.0.dev7}/src/Products/urban/testing.py

@@ -88,6 +88,7 @@ class UrbanConfigLayer(UrbanWithUsersLayer):
         super(UrbanConfigLayer, self).setUp()
         with helpers.ploneSite() as portal:
             portal.setupCurrentSkin(portal.REQUEST)
+            setLocal("request", portal.REQUEST)
             helpers.applyProfile(portal, "Products.urban:testsWithConfig")
 
 
@@ -108,6 +109,7 @@ class UrbanLicencesLayer(UrbanConfigLayer):
         super(UrbanLicencesLayer, self).setUp()
         with helpers.ploneSite() as portal:
             portal.setupCurrentSkin(portal.REQUEST)
+            setLocal("request", portal.REQUEST)
             helpers.applyProfile(portal, "Products.urban:testsWithLicences")
 
 
@@ -126,6 +128,7 @@ class UrbanImportsLayer(IntegrationTesting):
         super(UrbanImportsLayer, self).setUp()
         with helpers.ploneSite() as portal:
             portal.setupCurrentSkin(portal.REQUEST)
+            setLocal("request", portal.REQUEST)
             helpers.applyProfile(portal, "Products.urban:tests-imports")
 
 
@@ -179,6 +182,7 @@ class UrbanConfigFunctionalLayer(UrbanWithUsersFunctionalLayer):
         super(UrbanConfigFunctionalLayer, self).setUp()
         with helpers.ploneSite() as portal:
             portal.setupCurrentSkin(portal.REQUEST)
+            setLocal("request", portal.REQUEST)
             helpers.applyProfile(portal, "Products.urban:testsWithConfig")
 
 
@@ -199,6 +203,7 @@ class UrbanLicencesFunctionalLayer(UrbanConfigFunctionalLayer):
         super(UrbanLicencesFunctionalLayer, self).setUp()
         with helpers.ploneSite() as portal:
             portal.setupCurrentSkin(portal.REQUEST)
+            setLocal("request", portal.REQUEST)
             helpers.applyProfile(portal, "Products.urban:testsWithLicences")
 
 

{Products.urban-2.5.0.dev5 → Products.urban-2.5.0.dev7}/src/Products/urban/utils.py

@@ -1,18 +1,14 @@
 # -*- coding: utf-8 -*-
 
 from Acquisition import aq_inner
-
-from imio.schedule.utils import tuple_to_interface
-
 from HTMLParser import HTMLParser
-
 from Products.ATContentTypes.interfaces.file import IATFile
-from Products.urban.config import URBAN_TYPES
 from Products.urban.config import URBAN_ENVIRONMENT_TYPES
+from Products.urban.config import URBAN_TYPES
 from Products.urban.interfaces import IUrbanDoc
-
+from datetime import datetime
+from imio.schedule.utils import tuple_to_interface
 from plone import api
-
 from zope.annotation import IAnnotations
 from zope.component import getMultiAdapter
 
@@ -244,3 +240,14 @@ def run_entry_points(group, name, *args, **kwargs):
     for entrypoint in pkg_resources.iter_entry_points(group=group, name=name):
         plugin = entrypoint.load()
         return plugin(*args, **kwargs)
+
+
+def convert_to_utf8(string):
+    try:
+        return string.encode("utf-8")
+    except UnicodeDecodeError:
+        return string
+
+
+def now():
+    return datetime.now()

{Products.urban-2.5.0.dev5 → Products.urban-2.5.0.dev7}/src/Products.urban.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Products.urban
-Version: 2.5.0.dev5
+Version: 2.5.0.dev7
 Summary: Urban Certificate Management
 Home-page: http://www.communesplone.org/les-outils/applications-metier/gestion-des-permis-durbanisme
 Author: Simon Delcourt

{Products.urban-2.5.0.dev5 → Products.urban-2.5.0.dev7}/src/Products.urban.egg-info/SOURCES.txt

@@ -1259,6 +1259,8 @@ src/Products/urban/schedule/config/urbancertificatetwo.xml
 src/Products/urban/schedule/crons/__init__.py
 src/Products/urban/schedule/crons/configure.zcml
 src/Products/urban/schedule/crons/tasks_daily_check.py
+src/Products/urban/schedule/tests/__init__.py
+src/Products/urban/schedule/tests/test_modified_blueprint.py
 src/Products/urban/scripts/__init__.py
 src/Products/urban/scripts/before_install.py
 src/Products/urban/scripts/bestaddress.sql