data.coop/membersystem
7
2
Fork 4
Code Issues 14 Pull requests Releases Wiki Activity

Services #25

Merged
valberg merged 7 commits from services into main 2024-12-22 23:46:15 +00:00
Conversation 2 Commits 7 Files changed 22 +418 -80
valberg commented 2024-01-13 20:19:36 +00:00
Owner
Copy link

Dette PR handler om at få en måde hvorpå medlemmer kan få adgang til de forskellige services vi udbyder.

Dette PR handler om at få en måde hvorpå medlemmer kan få adgang til de forskellige services vi udbyder.
valberg added 1 commit 2024-01-13 20:19:37 +00:00
Initial stuff for services.
Some checks failed
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is failing
Details
2d4562944f
valberg added 1 commit 2024-01-13 20:38:13 +00:00
Display the services.
Some checks failed
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is failing
Details
aed28a8a53
valberg added 4 commits 2024-01-14 11:51:37 +00:00 
Reviewed-on: #26
Co-authored-by: Halfdan Mouritzen <halfdan@robothangarskib.dk>
Co-committed-by: Halfdan Mouritzen <halfdan@robothangarskib.dk>
WIP.
Some checks failed
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is failing
Details
69cfc38771
valberg added 1 commit 2024-01-14 11:53:05 +00:00
Merge branch 'main' into services
Some checks failed
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is failing
Details
c48cc3b347
valberg added 1 commit 2024-02-29 20:53:27 +00:00
Merge branch 'main' into services
Some checks failed
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is failing
Details
535543f82f
valberg added 3 commits 2024-04-20 08:33:05 +00:00
valberg force-pushed services from ad6564b510 to 6e2ed21f67 2024-07-14 22:28:23 +00:00 Compare
valberg added 1 commit 2024-07-15 08:06:02 +00:00
WIP.
Some checks failed
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is failing
Details
ce8d4bd228
benjaoming reviewed 2024-07-29 20:58:57 +00:00
src/membership/models.py Outdated
@ -142,0 +165,4 @@
)
def __str__(self) -> str:
return f"{self.user} - {self.service}"
benjaoming commented 2024-07-29 20:58:57 +00:00
Owner
Copy link

Just wanna say that I've seen this WRT the Membership and MembershipType definitions. I think this will work fine in combination. I have some ideas etc.. but fundamentally, this doesn't need to change 👍

Just wanna say that I've seen this WRT the Membership and MembershipType definitions. I think this will work fine in combination. I have some ideas etc.. but fundamentally, this doesn't need to change 👍
benjaoming commented 2024-07-29 21:00:19 +00:00
Owner
Copy link

There will be a new model Product and Order that are relevant for charging services, but we can probably figure out how they are associated with services... I like the idea of matching a service with some well-known string.

There will be a new model Product and Order that are relevant for charging services, but we can probably figure out how they are associated with services... I like the idea of matching a service with some well-known string.
benjaoming reviewed 2024-08-04 17:24:55 +00:00
src/membership/models.py Outdated
@ -142,0 +154,4 @@
),
)
user = models.ForeignKey("auth.User", on_delete=models.PROTECT)
benjaoming commented 2024-08-04 17:24:55 +00:00
Owner
Copy link

This is correct! 💯

Notable because there is also a Membership model.. however, memberships are renewed every year, and a user should be able to use the same services across different memberships.

How we handle "eligibility to a service" can happen later..

This is correct! 💯 Notable because there is also a Membership model.. however, memberships are renewed every year, and a user should be able to use the same services across different memberships. How we handle "eligibility to a service" can happen later..
valberg force-pushed services from ce8d4bd228 to d82a91d710 2024-12-22 23:27:15 +00:00 Compare
valberg added 1 commit 2024-12-22 23:29:10 +00:00
valberg changed title from WIP: Services to Services 2024-12-22 23:29:45 +00:00
valberg requested review from benjaoming 2024-12-22 23:31:10 +00:00
benjaoming approved these changes 2024-12-22 23:38:21 +00:00
benjaoming left a comment
Owner
Copy link

VERY NICE! Having this will make it possible to start adding ServiceRequests, then we can figure out what that means to UI.

(but I would only add a ServiceRequest model in order to auto-create the Matrix+Forgejo service request for new members)

VERY NICE! Having this will make it possible to start adding ServiceRequests, then we can figure out what that means to UI. (but I would only add a ServiceRequest model in order to auto-create the Matrix+Forgejo service request for new members)
src/project/settings.py
@ -163,0 +172,4 @@
},
"PKCE_REQUIRED": False, # this can be a callable - https://github.com/jazzband/django-oauth-toolkit/issues/711#issuecomment-497073038
}
benjaoming commented 2024-12-22 23:34:56 +00:00
Owner
Copy link

I don't know what this is :)

I don't know what this is :)
valberg commented 2024-12-22 23:42:22 +00:00
Author
Owner
Copy link

Yeah not sure yet either. It is a part of making the membersystem the SSO to login to services using OpenID Connect.

Yeah not sure yet either. It is a part of making the membersystem the SSO to login to services using OpenID Connect.
valberg marked this conversation as resolved
src/project/templates/base.html
@ -81,3 +81,3 @@
{% comment %}
<li>
<a href="/services" class="{% active_path "services" "current" %}">
<a href="{% url "services:list" %}" class="{% active_path "services:list" "current" %}">
benjaoming commented 2024-12-22 23:37:03 +00:00
Owner
Copy link

Instead of commenting it out, you could also do some if user.is_superuser ?

Instead of commenting it out, you could also do some `if user.is_superuser` ?
👍 1
valberg marked this conversation as resolved
benjaoming reviewed 2024-12-22 23:38:48 +00:00
benjaoming left a comment
Owner
Copy link

OH! Can you add Forgejo / Git?

OH! Can you add Forgejo / Git?
benjaoming reviewed 2024-12-22 23:39:45 +00:00
benjaoming left a comment
Owner
Copy link

One more thing: Services have a kind of "slug" that's used here: https://git.data.coop/data.coop/website/src/branch/main/content/services

Is the intention that it's the same slug we use in the public website? That'd be great, because then we can easily link content.

One more thing: Services have a kind of "slug" that's used here: https://git.data.coop/data.coop/website/src/branch/main/content/services Is the intention that it's the same slug we use in the public website? That'd be great, because then we can easily link content.
valberg commented 2024-12-22 23:43:54 +00:00
Author
Owner
Copy link

One more thing: Services have a kind of "slug" that's used here: https://git.data.coop/data.coop/website/src/branch/main/content/services

Yes - services also have slugs in the services/services.py module ;)

> One more thing: Services have a kind of "slug" that's used here: https://git.data.coop/data.coop/website/src/branch/main/content/services Yes - services also have slugs in the `services/services.py` module ;)
valberg added 1 commit 2024-12-22 23:44:29 +00:00
valberg commented 2024-12-22 23:44:38 +00:00
Author
Owner
Copy link

OH! Can you add Forgejo / Git?

Done!

> OH! Can you add Forgejo / Git? Done!
valberg merged commit 3dd7352d90 into main 2024-12-22 23:46:15 +00:00
valberg referenced this pull request from a commit 2024-12-22 23:46:16 +00:00
Services (#25)
Sign in to join this conversation.
Reviewers
No reviewers
benjaoming
Labels
Clear labels   
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: data.coop/membersystem#25
No description provided.
Delete branch "services"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?