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

✨(models/api) add models and API endpoints for contract #358

Merged
merged 3 commits into from
Sep 26, 2023
Merged

✨(models/api) add models and API endpoints for contract #358

merged 3 commits into from
Sep 26, 2023

Conversation

sampaccoud
Copy link

@sampaccoud sampaccoud commented Jul 26, 2023 •
edited
Loading

Purpose

We want a student and an organization to be able to sign a contract on courses that are subject to it.

Proposal

  • Add a ContractDefinition model for the course managers to declare a contract template on a product.
  • Add a Contract model attached to an order to record the student and organization signatures of a contract for an order on which it is required.
  • Add an endpoint for staff users to edit contract definitions via the admin API (in a later evolution we might want to let teachers edit contract definitions themselves)
  • Add an endpoint for the client to handle contracts linked to orders

@sampaccoud sampaccoud force-pushed the add-contract branch 3 times, most recently from 9cf4677 to eb87439 Compare July 27, 2023 06:41
@jonathanreveille jonathanreveille force-pushed the add-contract branch 8 times, most recently from c8db4ee to 462344c Compare August 14, 2023 14:07
jbpenrath
jbpenrath reviewed Aug 16, 2023
View reviewed changes
src/backend/locale/fr_FR/LC_MESSAGES/django.po Outdated Show resolved Hide resolved
src/backend/locale/fr_FR/LC_MESSAGES/django.po Outdated Show resolved Hide resolved
src/backend/locale/fr_FR/LC_MESSAGES/django.po Outdated Show resolved Hide resolved
src/backend/locale/fr_FR/LC_MESSAGES/django.po Outdated Show resolved Hide resolved
src/backend/locale/fr_FR/LC_MESSAGES/django.po Outdated Show resolved Hide resolved
src/backend/joanie/core/templates/issuers/contract_definition.css Outdated Show resolved Hide resolved
src/backend/joanie/core/templates/issuers/contract_definition.html Outdated Show resolved Hide resolved
src/backend/joanie/core/templates/issuers/contract_definition.css Outdated Show resolved Hide resolved
src/backend/joanie/core/templates/issuers/contract_definition.css Outdated Show resolved Hide resolved
src/backend/joanie/core/templates/issuers/contract_definition.css Outdated Show resolved Hide resolved
@jonathanreveille jonathanreveille force-pushed the add-contract branch 4 times, most recently from c514337 to b2d976a Compare August 21, 2023 14:58
jbpenrath
jbpenrath reviewed Aug 22, 2023
View reviewed changes
src/backend/joanie/core/templates/issuers/contract_definition.css Outdated Show resolved Hide resolved
src/backend/joanie/core/templates/issuers/contract_definition.css Outdated Show resolved Hide resolved
src/backend/joanie/core/templates/issuers/contract_definition.css Outdated Show resolved Hide resolved
src/backend/joanie/core/templates/issuers/contract_definition.css Outdated Show resolved Hide resolved
src/backend/joanie/core/utils/issuers.py Outdated Show resolved Hide resolved
src/backend/joanie/core/serializers/client.py Outdated Show resolved Hide resolved
src/backend/joanie/core/templates/issuers/contract_definition.html Outdated Show resolved Hide resolved
src/backend/locale/fr_FR/LC_MESSAGES/django.po Outdated Show resolved Hide resolved
src/backend/joanie/core/models/contracts.py Outdated Show resolved Hide resolved
src/backend/joanie/core/factories.py Outdated Show resolved Hide resolved
@jonathanreveille jonathanreveille force-pushed the add-contract branch 4 times, most recently from fe4c314 to a25b60e Compare August 28, 2023 09:30
@samy-aitouakli samy-aitouakli mentioned this pull request Sep 12, 2023
Closed
sampaccoud
sampaccoud commented Sep 20, 2023
View reviewed changes
src/backend/joanie/core/api/admin.py Outdated Show resolved Hide resolved
src/backend/locale/es_ES/LC_MESSAGES/django.po Outdated Show resolved Hide resolved
src/backend/setup.cfg Outdated Show resolved Hide resolved
src/backend/joanie/tests/core/test_utils_issuers.py Outdated Show resolved Hide resolved
src/backend/joanie/core/models/contracts.py Outdated Show resolved Hide resolved
src/backend/joanie/core/models/contracts.py Outdated Show resolved Hide resolved
src/backend/joanie/core/models/contracts.py Outdated Show resolved Hide resolved
src/backend/joanie/core/utils/issuers.py Outdated Show resolved Hide resolved
src/backend/joanie/settings.py Outdated Show resolved Hide resolved
src/backend/joanie/core/models/contracts.py Outdated Show resolved Hide resolved
@jonathanreveille jonathanreveille force-pushed the add-contract branch 2 times, most recently from e0a800a to 19b85fd Compare September 21, 2023 16:51
jonathanreveille
jonathanreveille reviewed Sep 25, 2023
View reviewed changes
src/backend/joanie/core/templates/issuers/contract_definition.html Outdated Show resolved Hide resolved
src/backend/joanie/core/templates/issuers/contract_definition.css Outdated Show resolved Hide resolved
src/backend/joanie/core/factories.py Outdated Show resolved Hide resolved
src/backend/joanie/core/serializers/client.py Outdated Show resolved Hide resolved
src/backend/joanie/core/models/contracts.py Outdated Show resolved Hide resolved
src/backend/joanie/core/serializers/admin.py Outdated Show resolved Hide resolved
jbpenrath
jbpenrath reviewed Sep 26, 2023
View reviewed changes
src/backend/joanie/core/api/client.py Show resolved Hide resolved
src/backend/joanie/core/factories.py
body = factory.Faker("paragraphs", nb=3)
description = factory.Faker("paragraph", nb_sentences=5)
language = factory.fuzzy.FuzzyChoice([lang[0] for lang in settings.LANGUAGES])
name = factory.fuzzy.FuzzyChoice([name[0] for name in enums.CONTRACT_NAME_CHOICES])
Copy link
Member

Choose a reason for hiding this comment

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

Reminder : I should do the same for certificate_definition

src/backend/joanie/core/models/products.py Outdated Show resolved Hide resolved
src/backend/joanie/core/templates/issuers/contract_definition.css Outdated Show resolved Hide resolved
src/backend/joanie/core/templates/issuers/contract_definition.css Outdated Show resolved Hide resolved
src/backend/joanie/core/templates/issuers/contract_definition.html Outdated Show resolved Hide resolved
@sampaccoud sampaccoud force-pushed the add-contract branch 3 times, most recently from 25e304b to a6efc6f Compare September 26, 2023 09:55
jbpenrath
jbpenrath approved these changes Sep 26, 2023
View reviewed changes
Copy link
Member

@jbpenrath jbpenrath left a comment

Choose a reason for hiding this comment

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

LGTM ✅

Samuel Paccoud - France Université Numérique added 2 commits September 26, 2023 14:33
✅(factories) fix course run factory when forcing state
f31f7f1 
We have recently introduced a "Params" field that holds a "ref_date".
This date is computed when the Python code first loads. When the full
test suite is run, the gap between the ref_date and "now" computed in
tests can be significant and lead to random test failures because a
course run created with a state ONGOING_OPEN can in fact be closed...
✅(api) fix randomly failing test on order groups
157cae9 
This test required that the number of seats on the order group be
at least 3. It was randomly failing when the random number of seats
was chosen to be less than 3...
✨(models/api) add contract models and API endpoints
7d42bf7 
We want to be able to sign learning conventions with students.
On the model of what was done for certificates, we add a
"ContractDefinition" model for universities to define the content
of the contract they want students to sign and a "Contract" model
to record actual contracts for each student on an order.
@sampaccoud sampaccoud enabled auto-merge (rebase) September 26, 2023 12:54
@sampaccoud sampaccoud merged commit dead809 into main Sep 26, 2023
13 of 14 checks passed
@sampaccoud sampaccoud deleted the add-contract branch September 26, 2023 13:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonathanreveille jonathanreveille jonathanreveille left review comments

@lunika lunika lunika approved these changes

@jbpenrath jbpenrath jbpenrath approved these changes

@samy-aitouakli samy-aitouakli Awaiting requested review from samy-aitouakli

Assignees

@jonathanreveille jonathanreveille

Labels
feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@sampaccoud @lunika @jbpenrath @jonathanreveille