MVP for agenda api #879

AlexandreJunod · 2023-10-05T11:50:16Z

Required points before merging embed-agenda in develop

…res for agenda and add pagination

geocity/apps/agenda/views.py

AlexandreJunod · 2023-10-31T08:45:04Z

geocity/apps/api/serializers.py

+            "width": "1365",
+            "height": "2048",


Define how we can have width and height ? Is it the actual image width and height ?

This will be depend on thumbor specs that will resize depending on what the web component asks for

This is not how it's working. I've been doing some tests, and this value is required to show an image. We can still resize the image through Thumblor. Seems like to be the original file dimensions.
@monodo

geocity/apps/api/serializers.py

geocity/apps/api/views.py

geocity/apps/submissions/management/commands/fixturize.py

monodo · 2023-10-31T10:14:02Z

geocity/apps/agenda/views.py

+
+
+# TODO: Place this view in the form or submission, so we have direct access to the image settings, public or not ? From API
+def image_display(request, form_id, image_name):


If we want once to display image in the the "geo-calendar", we'll have to duplicate this code in current api ?

Technically no, but if it's the case, we should not put this in an app called "agenda".
We should use another name, so we can group data providers in a specific app for this usage.
The reason to put this in another app is to make it easier to find all the code that has the same purpose, and to have a complete URL that doesn't start with /submissions/

monodo · 2023-10-31T10:23:58Z

geocity/apps/agenda/views.py

+        image_dir, f"permit_requests_uploads/{form_id}/{image_name}"
+    )
+
+    # TODO: Ajouter de la sécurité afin de savoir si l'image peut-être affichée ou non


Some help to ensure only public images are returned (not tested):

field_value = get_object_or_404( models.FieldValue.objects.filter(field__input_type=Field.INPUT_TYPE_FILE,is_public_when_permitrequest_is_public=True), pk=property_value_id, field_values__field__public_info=True, )

geocity/apps/api/serializers.py

geocity/apps/forms/models.py

monodo · 2023-10-31T10:54:42Z

geocity/apps/forms/models.py

+        _("Visible dans l'agenda"),
+        default=False,
+        help_text=_(
+            """Lorsque cette case est cochée, les données de ce formulaire sont accessibles dans l'API <b>/rest/agenda/</b>"""


"""Lorsque cette case est cochée, les données de ce formulaire sont accessibles dans l'API /rest/agenda/ si l'annonce est rendue publique par le pilote"""

⚠️ Check that all filters ensure only pulic fields for public submissions are visible

1 : Done
2: TODO Added on the right place on the code

monodo · 2023-10-31T10:57:04Z

geocity/apps/submissions/models.py

+        _("Visible dans l'API light"),
+        default=False,
+        help_text=_(
+            """Lorsque cette case est cochée, ce champ est affichée dans la version light de l'api (/rest/RESSOURCE).<br>


⚠️ uniquement si la demande, l'annonce, est publique
affichée => affiché

"si la demande est rendue publique par le pilote" added on the help text, like the comment above

geocity/tests/factories.py

geocity/tests/submissions/functional/test_submission_api.py

Agenda embed from npm

… robust

monodo

think about updating the wiki

monodo · 2023-11-16T15:06:43Z

geocity/apps/api/views.py

+    INTERNAL_WEB_ROOT_URL = "http://web:9000"
+    image_url = f"{INTERNAL_WEB_ROOT_URL}/rest/image/{submission_id}/{image_name}"
+
+    # TODO: understand (adaptive-)(full-)fit-in between unsafe and size


optional => v2

monodo · 2023-11-16T15:10:18Z

geocity/apps/forms/models.py

@@ -870,7 +877,7 @@ class Field(models.Model):
        max_length=255,
        blank=True,
        help_text=_(
-            'Ex: "Yverdon-les-Bains" afin de limiter les recherches à Yverdon, <a href="https://api3.geo.admin.ch/services/sdiservices.html#search" target="_blank">Plus d\'informations</a>'
+            'Ex: "Yverdon-les-Bains" afin de limiter les recherches à Yverdon, <a href="https://api3.Sgeo.admin.ch/services/sdiservices.html#search" target="_blank">Plus d\'informations</a>'


monodo · 2023-11-16T15:18:11Z

geocity/apps/agenda/templates/agenda/agenda.html

+  <agenda-embed api-base-url="http://localhost:9095/rest"></agenda-embed>
+
+  <!-- Initialize the component -->
+  <script type="module" src="{% static 'js/agenda-embed/agenda-embed.js' %}"></script>


Remove js code from static and use code that is made available throught build process in statics

monodo · 2023-11-29T14:23:27Z

Add to the comment: "Le pilote peut alors contrôler la publication dans l'agenda dans l'onglet traitement

monodo · 2023-11-29T14:35:39Z

Looks like the ordering of items is mixed up:

add env variable for THUMBOR and allow to set network name in .env

Thumbor variables

geocity/apps/django_wfs3/pagination.py

monodo · 2023-11-29T15:18:16Z

geocity/settings.py

@@ -138,6 +140,7 @@
    "geocity.apps.reports",
    "geocity.apps.forms",
    "geocity.apps.submissions",
+    "geocity.apps.agenda",


remove before merge

geocity/tests/api/test_agenda_api.py

geocity/apps/django_wfs3/pagination.py

AlexandreJunod added 9 commits October 5, 2023 11:13

MVP for agenda api

da8a5ab

wip

7db05ad

fix amend properties value

961904f

add filters and categories

3cce5d1

replace slug by id

d087bf3

complete v1 for detailed api agenda

cd4e82d

agenda working under /submissions/agenda

82bddd3

make filters work, except start and end date

aff9632

restructure code, fix some errors, create an app agenda, create fixtu…

d69ec97

…res for agenda and add pagination

AlexandreJunod commented Oct 31, 2023

View reviewed changes

AlexandreJunod added 2 commits October 31, 2023 10:12

replicate code that has been pushed in main and not in develop

34d641d

small fixes according to review

1d01777

monodo suggested changes Oct 31, 2023

View reviewed changes

AlexandreJunod and others added 12 commits November 2, 2023 14:33

fix according to review, on everything based on models

87616b8

optimise algorithm

09e7b33

get agenda embed from npm

819e07d

Merge pull request #886 from yverdon/agenda-embed-from-npm

a3fcb49

Agenda embed from npm

restructure image api to be used by all apps

c90ff8f

tag code to reverse

097adfa

wip, thumbor on one route, with params interpreted as thumbor

7144a75

make it work with thumbor

b098f8a

fix according to review and improve some parts of the code to be more…

11e908a

… robust

change todo, to be more explicit

088965a

Merge branch 'develop' into feature/ylba-24

e964352

squash migrations

0da66f7

AlexandreJunod marked this pull request as ready for review November 16, 2023 14:02

add text to help_text

b1b9392

monodo suggested changes Nov 16, 2023

View reviewed changes

AlexandreJunod added 2 commits November 16, 2023 16:23

remove agenda-embed to use built one

284b474

mvp for agenda, ready for tests

9ddbe6b

AlexandreJunod added 3 commits November 27, 2023 12:03

fix multiple times same api_name for filters

22279e3

mvp v1 of agenda, ready to review

cc313d3

fix detailed api, to hide categories

b0fb974

AlexandreJunod and others added 17 commits December 4, 2023 11:39

filter by featured_agenda and improve order_by

38b190a

hide filter for api in fields with js when it is not permited to use

832ed0b

make poster mandatory in agenda fixturizes, remove console.log from js

b9034f6

add env variable for THUMBOR and allow to set network name in .env

95e0479

don't use thumbor by default

985e261

Merge pull request #899 from yverdon/thumbor_variables

a35ca88

add env variable for THUMBOR and allow to set network name in .env

add env variable to docker

de5e886

improve docker-compose configuration with thumbor

1229d8c

lint

b065fd2

remove prints

c168c18

Merge pull request #900 from yverdon/thumbor_variables

096c2e5

Thumbor variables

wip

6304d3f

WIP...

920fa45

tests

61ad211

rebase on develop

d5fffd3

fix migrations conflicts

50dfbcf

fix tests and remove agenda app

cbe1d63

monodo reviewed Dec 12, 2023

View reviewed changes

monodo suggested changes Dec 12, 2023

View reviewed changes

geocity/apps/django_wfs3/pagination.py Outdated Show resolved Hide resolved

AlexandreJunod added 3 commits December 12, 2023 10:36

move pagination

a30e1ce

fix case where field is duplicated

cfec92a

remove unused code

c9b89ec

monodo approved these changes Dec 12, 2023

View reviewed changes

monodo merged commit 6f86aa7 into develop Dec 12, 2023
2 checks passed

AlexandreJunod deleted the feature/ylba-24 branch December 13, 2023 11:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MVP for agenda api #879

MVP for agenda api #879

AlexandreJunod commented Oct 5, 2023 •

edited by monodo

Loading

AlexandreJunod Oct 31, 2023

monodo Oct 31, 2023

AlexandreJunod Nov 16, 2023 •

edited

Loading

monodo Oct 31, 2023

AlexandreJunod Nov 1, 2023

monodo Oct 31, 2023

AlexandreJunod Nov 21, 2023

monodo Oct 31, 2023

monodo Oct 31, 2023

AlexandreJunod Nov 1, 2023 •

edited

Loading

monodo Oct 31, 2023

AlexandreJunod Nov 1, 2023 •

edited

Loading

monodo left a comment

monodo Nov 16, 2023

monodo Nov 16, 2023

AlexandreJunod Nov 21, 2023

monodo Nov 16, 2023

AlexandreJunod Nov 21, 2023

monodo commented Nov 29, 2023

monodo commented Nov 29, 2023

monodo Nov 29, 2023



		# TODO: Place this view in the form or submission, so we have direct access to the image settings, public or not ? From API
		def image_display(request, form_id, image_name):

MVP for agenda api #879

MVP for agenda api #879

Conversation

AlexandreJunod commented Oct 5, 2023 • edited by monodo Loading

Required points before merging embed-agenda in develop

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AlexandreJunod Nov 16, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AlexandreJunod Nov 1, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AlexandreJunod Nov 1, 2023 • edited Loading

Choose a reason for hiding this comment

monodo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

monodo commented Nov 29, 2023

monodo commented Nov 29, 2023

Choose a reason for hiding this comment

AlexandreJunod commented Oct 5, 2023 •

edited by monodo

Loading

AlexandreJunod Nov 16, 2023 •

edited

Loading

AlexandreJunod Nov 1, 2023 •

edited

Loading

AlexandreJunod Nov 1, 2023 •

edited

Loading