Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lmb 557 | email for not bekrachtigd mandataris #218

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Lmb 557 | email for not bekrachtigd mandataris #218

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4a36e5e
LMB-339: add effectiefAt property to mandataris
JonasVanHoof Sep 18, 2024
0e82b69
LMB-339: add migration that will set the effectief at date to today
JonasVanHoof Sep 18, 2024
ff710b8
LMB-339: fix domain property effectief-at
JonasVanHoof Sep 19, 2024
4d0b512
LMB-339: update migration to set effectiefAt when the mandataris publ…
JonasVanHoof Sep 19, 2024
6581734
LMB:557: add mailboxes to the database
JonasVanHoof Sep 19, 2024
1f02712
LMB-557: add deliver-email service to the project
JonasVanHoof Sep 19, 2024
d945376
LMB-557: cleanup the environments for the dev compose file
JonasVanHoof Sep 20, 2024
bed91d7
LMB-557: add cron time to be every weekday at 8am
JonasVanHoof Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions config/migrations/2024/20240918151400-set-effectief-publication-status-at.sparql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
PREFIX lmb: <http://lblod.data.gift/vocabularies/lmb/>
PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>

INSERT {
GRAPH ?graph {
?mandataris lmb:effectiefAt "2024-09-18T13:13:00.007Z"^^xsd:dateTime.
}
}
WHERE {
GRAPH ?graph {
?mandataris a mandaat:Mandataris;
lmb:hasPublicationStatus <http://data.lblod.info/id/concept/MandatarisPublicationStatusCode/d3b12468-3720-4cb0-95b4-6aa2996ab188> . # Effectief mandataris-publication-status-code
}
FILTER NOT EXISTS {
?graph a <http://mu.semte.ch/vocabularies/ext/FormHistory>
}
FILTER NOT EXISTS {
?graph a <http://mu.semte.ch/graphs/public>
}
}
45 changes: 45 additions & 0 deletions config/migrations/2024/20240919104200-add-mailboxes.sparql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# FROM https://github.com/aatauil/app-deliver-email/blob/master/config/migrations/20190122110800-mailbox-folders.sparql
INSERT DATA {
GRAPH <http://mu.semte.ch/graphs/system/email> {
<http://data.lblod.info/id/mailboxes/1> a <http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#Mailbox>;
<http://mu.semte.ch/vocabularies/core/uuid> "cf9cb7e4-9a00-4855-9ee0-e8e3bbeba9e9";
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#hasPart> <http://data.lblod.info/id/mail-folders/1>;
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#hasPart> <http://data.lblod.info/id/mail-folders/2>;
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#hasPart> <http://data.lblod.info/id/mail-folders/3>;
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#hasPart> <http://data.lblod.info/id/mail-folders/4>;
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#hasPart> <http://data.lblod.info/id/mail-folders/5>;
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#hasPart> <http://data.lblod.info/id/mail-folders/6>.

<http://data.lblod.info/id/mail-folders/1> a <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Folder>;
<http://mu.semte.ch/vocabularies/core/uuid> "891c67e5-4719-47f8-aec2-d898ba2c09e8";
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#title> "inbox";
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#description> "Your incoming mail goes here.".

<http://data.lblod.info/id/mail-folders/2> a <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Folder>;
<http://mu.semte.ch/vocabularies/core/uuid> "786a8cb0-4452-40f5-b8d8-046dd2d63281";
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#title> "outbox";
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#description> "Your outgoing mail goes here.".

<http://data.lblod.info/id/mail-folders/3> a <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Folder>;
<http://mu.semte.ch/vocabularies/core/uuid> "a6fb03f9-11be-4401-9d8f-b4dc0e9df5ee";
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#title> "sentbox";
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#description> "Your sent mail goes here.".


<http://data.lblod.info/id/mail-folders/4> a <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Folder>;
<http://mu.semte.ch/vocabularies/core/uuid> "a430a848-e595-49fa-bc11-f5579605877f";
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#title> "sending";
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#description> "Your mail goes here while being sent.".

<http://data.lblod.info/id/mail-folders/5> a <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Folder>;
<http://mu.semte.ch/vocabularies/core/uuid> "0cb108a9-1c0d-4c0a-bf53-60e304116e47";
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#title> "drafts";
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#description> "Your draft goes here.".

<http://data.lblod.info/id/mail-folders/6> a <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Folder>;
<http://mu.semte.ch/vocabularies/core/uuid> "70c0baba-17a0-11eb-adc1-0242ac120002";
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#title> "failbox";
<http://www.semanticdesktop.org/ontologies/2007/01/19/nie#description> "Your email that failed while sending goes here.".

}
}
3 changes: 2 additions & 1 deletion config/resources/external-mandaat.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@
(:generated-from :uri-set ,(s-prefix "ext:generatedFrom")) ;;if it e.g. comes from gelinkt-notuleren
(:duplication-reason :string ,(s-prefix "skos:changeNote"))
(:link-to-besluit :string ,(s-prefix "lmb:linkToBesluit"))
(:modified :datetime ,(s-prefix "dct:modified")))
(:modified :datetime ,(s-prefix "dct:modified"))
(:effectief-at :datetime ,(s-prefix "lmb:effectiefAt")))
:has-many `((mandataris :via ,(s-prefix "mandaat:isTijdelijkVervangenDoor")
:as "tijdelijke-vervangingen")
(mandataris :via ,(s-prefix "mandaat:isTijdelijkVervangenDoor")
Expand Down
18 changes: 18 additions & 0 deletions docker-compose.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,21 @@ services:
restart: "no"
authorization-wrapper:
restart: "no"
deliver-email:
image: local-deliver-email-service:latest
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once the PR redpencilio/deliver-email-service#11 is merged and a new version is published the image here needs to be updated

restart: "no"
ports:
- 8888:80
- 9223:9229
environment:
NODE_ENV: "development"
WELL_KNOWN_SERVICE: "test"
EMAIL_CRON_PATTERN: "* * * * *"
CRON_FREQUENCY,: "* * * * *"
LOG_ERRORS: true
MAILBOX_URI: 'http://data.lblod.info/id/mailboxes/1'
SECURE_CONNECTION: "true"
EMAIL_ADDRESS: "[email protected]"
EMAIL_PASSWORD: "myemailpassword"
FROM_NAME: "Testmailer"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove these as not needed for test mode


18 changes: 18 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,3 +230,21 @@ services:
- ./config/sparql-authorization-wrapper:/config
restart: always
logging: *default-logging
deliver-email:
image: redpencil/deliver-email-service:0.3.3
profiles:
- send-emails
environment:
MAILBOX_URI: 'http://data.lblod.info/id/mailboxes/1'
SECURE_CONNECTION: "true"
EMAIL_PROTOCOL: "smtp"
EMAIL_ADDRESS: "[email protected]"
EMAIL_PASSWORD: "myemailpassword"
FROM_NAME: "Lokaal Mandatenbeheer"
Comment on lines +241 to +243
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Create ticket for Tim fore these values

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

None of these are set in this project (https://github.com/lblod/app-complaint-form/blob/6ec0880bac51e5b0a2aaa60af784d42de7f06aad/docker-compose.yml#L114) this is done in the pipeline?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checked with Achraf: "rechtstreeks op server. Worden gewoon in database opgeslagen. Geen injecties of pipelines of dergelijke"

NODE_ENV: "production"
labels:
- "logging=true"
restart: always
volumes:
- ./data/mail:/share
logging: *default-logging