Model organisations #4653
Merged
Model organisations #4653
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
leenagupte
force-pushed
the
model-organisations
branch
from
08c3443 to
592435e
Compare
leenagupte
force-pushed
the
model-organisations
branch
from
592435e to
e34f949
Compare
leenagupte
force-pushed
the
model-organisations
branch
from
e34f949 to
4f8c194
Compare
leenagupte
force-pushed
the
model-organisations
branch
from
4f8c194 to
31a09e6
Compare
leenagupte
force-pushed
the
model-organisations
branch
from
31a09e6 to
5bb2af4
Compare
leenagupte
force-pushed
the
model-organisations
branch
from
5bb2af4 to
d39219a
Compare
leenagupte
force-pushed
the
model-organisations
branch
from
d39219a to
7d2a464
Compare
leenagupte
force-pushed
the
model-organisations
branch
from
7d2a464 to
88ee8d1
Compare
leenagupte
force-pushed
the
model-organisations
branch
from
88ee8d1 to
5f4a27c
Compare
leenagupte
force-pushed
the
model-organisations
branch
from
5f4a27c to
6698cf5
Compare
leenagupte
force-pushed
the
model-organisations
branch
from
6698cf5 to
522a4c0
Compare
leenagupte
force-pushed
the
model-organisations
branch
from
522a4c0 to
f154dca
Compare
leenagupte
force-pushed
the
model-organisations
branch
from
f154dca to
d5d1565
Compare
leenagupte
force-pushed
the
model-organisations
branch
from
d5d1565 to
b30bc1c
Compare
sairamya93
force-pushed
the
model-organisations
branch
from
b81043c to
311e733
Compare
sairamya93
force-pushed
the
model-organisations
branch
from
311e733 to
2ff585a
Compare
sairamya93
force-pushed
the
model-organisations
branch
from
2ff585a to
24381a3
Compare
sairamya93
force-pushed
the
model-organisations
branch
from
24381a3 to
bf746ba
Compare
leenagupte
commented
Feb 28, 2025
There was a problem hiding this comment.
This looks great. Thanks for organising the commits.
One minor thing. I think the commit to add "content_id" to ContentItem should come before "Rename Organisations concern -> EmphasisedOrganisations" as that's where it's being used.
- Added image,crest and formatted title to the logo model - This model will be used in the organisation model
The Organisation model will be used to model the organisation links in a ContentItem as well as eventually be used to render the organisation page itself when it is moved from collections. Added logo and brand to organisation model in preparation for moving corporate information pages from government-frontend Co-authored-by: Deborah Chua <deborah.chua@digital.cabinet-office.gov.uk> Co-authored-by: Leena Gupte <leena.gupte@digital.cabinet-office.gov.uk> Co-authored-by: Keith Lawrence <keith.lawrence@digital.cabinet-office.gov.uk> Co-authored-by: Ramya Vidapanakal<ramya.vidapanakal@digital.cabinet-office.gov.uk>
sairamya93
force-pushed
the
model-organisations
branch
from
bf746ba to
1acd947
Compare
Organisations method relies on a private method that gets and models links. Almost all content items have organisations, so we are safe to add that utility method. Co-authored-by: Deborah Chua <deborah.chua@digital.cabinet-office.gov.uk> Co-authored-by: Leena Gupte <leena.gupte@digital.cabinet-office.gov.uk> Co-authored-by: Keith Lawrence <keith.lawrence@digital.cabinet-office.gov.uk> Co-authored-by: Ramya Vidapanakal<ramya.vidapanakal@digital.cabinet-office.gov.uk>
This allows us to simplify how the contributors list is built. We should only need to create the contributors once by passing it a list of link models rather than duplicating the mapping code in all of the content item models. The idea is that each contributors method in the child class will pass the contributors method in the parent ContentItem class as list of objects. For example for CaseStudy, that would be a list of modelled Organisation and Worldwide Organisation objects. This is the list that is passed in. It still defaults to organisations as that is the bare minimum that appears in the From field on documents that this contributors method is used to populate. Even though the list of content items can be different, as they all inherit from ContentItem, we know that they will have a title and base_path, so can be processed in the same way. Co-authored-by: Deborah Chua <deborah.chua@digital.cabinet-office.gov.uk> Co-authored-by: Leena Gupte <leena.gupte@digital.cabinet-office.gov.uk> Co-authored-by: Keith Lawrence <keith.lawrence@digital.cabinet-office.gov.uk> Co-authored-by: Ramya Vidapanakal<ramya.vidapanakal@digital.cabinet-office.gov.uk>
The contributors method now passes a list of emphasised organisations objects and worldwide organisations object to the parent class contributors method. Since worldwide organisations are not always present, add a test for them, which also adds coverage to the private linked method in content_item. Co-authored-by: Deborah Chua <deborah.chua@digital.cabinet-office.gov.uk> Co-authored-by: Leena Gupte <leena.gupte@digital.cabinet-office.gov.uk> Co-authored-by: Keith Lawrence <keith.lawrence@digital.cabinet-office.gov.uk> Co-authored-by: Ramya Vidapanakal<ramya.vidapanakal@digital.cabinet-office.gov.uk>
Co-authored-by: Deborah Chua <deborah.chua@digital.cabinet-office.gov.uk> Co-authored-by: Leena Gupte <leena.gupte@digital.cabinet-office.gov.uk> Co-authored-by: Keith Lawrence <keith.lawrence@digital.cabinet-office.gov.uk> Co-authored-by: Ramya Vidapanakal<ramya.vidapanakal@digital.cabinet-office.gov.uk>
We now model organisations separately, so this concern can be updated to deal with emphasised organisations. Updated the emphasised organisations test to check that the first organisation is an emphasised organisation in a list of organisation models. Co-authored-by: Deborah Chua <deborah.chua@digital.cabinet-office.gov.uk> Co-authored-by: Leena Gupte <leena.gupte@digital.cabinet-office.gov.uk> Co-authored-by: Keith Lawrence <keith.lawrence@digital.cabinet-office.gov.uk> Co-authored-by: Ramya Vidapanakal<ramya.vidapanakal@digital.cabinet-office.gov.uk>
…lude in CaseStudy explicitly Co-authored-by: Deborah Chua <deborah.chua@digital.cabinet-office.gov.uk> Co-authored-by: Leena Gupte <leena.gupte@digital.cabinet-office.gov.uk> Co-authored-by: Keith Lawrence <keith.lawrence@digital.cabinet-office.gov.uk> Co-authored-by: Ramya Vidapanakal<ramya.vidapanakal@digital.cabinet-office.gov.uk>
We call the linked method in the content_item model which returns the title and base path Co-authored-by: Deborah Chua <deborah.chua@digital.cabinet-office.gov.uk> Co-authored-by: Leena Gupte <leena.gupte@digital.cabinet-office.gov.uk> Co-authored-by: Keith Lawrence <keith.lawrence@digital.cabinet-office.gov.uk> Co-authored-by: Ramya Vidapanakal<ramya.vidapanakal@digital.cabinet-office.gov.uk>
KludgeKML
force-pushed
the
model-organisations
branch
from
1acd947 to
4bc7fa8
Compare
|
LGTM 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
Many of the document types like Case studies, Speeches, Corporate Information pages that need to be moved from government-frontend to frontend as part of app consolidation render Organisations.The idea is to create an organisation model that inherits from content item. but could then be reused when organisation pages are consolidated.
Why
By modelling organisations separately this will make consolidation easier, and also in preparation for consolidating organisations from the Collections app.
Trello card
Collaborators
Deborah Chua deborah.chua@digital.cabinet-office.gov.uk
Leena Gupte leena.gupte@digital.cabinet-office.gov.uk
Keith Lawrence keith.lawrence@digital.cabinet-office.gov.uk
Ramya Vidapanakalramya.vidapanakal@digital.cabinet-office.gov.uk