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

Calculate PublicOnly for org membership only once #32234

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open

Calculate PublicOnly for org membership only once #32234

wants to merge 27 commits into from
+72 −53

Conversation

6543
Copy link
Member

@6543 6543 commented Oct 10, 2024 •
edited
Loading

Refactoring of #32211

this move the PublicOnly() filter calcuation next to the DB querys and let it be decided by the Doer

Sponsored by Kithara Software GmbH

@6543 6543 added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label Oct 10, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 10, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 10, 2024
@github-actions github-actions bot added modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code labels Oct 10, 2024
@delvh delvh changed the title Make calculation of PublicOnly filter for OrgMembership in single place Calculate PublicOnly for org membership only once Oct 10, 2024
delvh
delvh reviewed Oct 10, 2024
View reviewed changes
routers/web/org/members.go Outdated Show resolved Hide resolved
@pull-request-size pull-request-size bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 11, 2024
@6543 6543 marked this pull request as ready for review October 11, 2024 17:31
@6543 6543 requested a review from delvh October 11, 2024 17:31
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Oct 12, 2024
lunny
lunny reviewed Oct 13, 2024
View reviewed changes
models/organization/org.go Outdated Show resolved Hide resolved
@lunny
Copy link
Member

lunny commented Oct 13, 2024

As a habit, we almost check permission in service layer but not in models layer. What's the problem with the previous code?

@6543
Copy link
Member Author

6543 commented Oct 13, 2024

I can create a new func in the service witch checks permissions ... but we would have to alter the existing code a lot and i want to only touch it here for a explizite context ... : the refactoring that makes the #32211 diff smal

@6543
Copy link
Member Author

6543 commented Oct 13, 2024

What's the problem with the previous code?

the determination if a user can see public or private org membership is determined in different places ... I want to have that check in a single place ...

6543 and others added 3 commits October 14, 2024 17:53
@6543
Copy link
Member Author

6543 commented Oct 14, 2024

@lunny to #32234 (comment) i tryed: 3af5ae7

see https://github.com/go-gitea/gitea/actions/runs/11331009974/job/31510076461?pr=32234

it does not work, it errors with: Unsupported condition type

@6543
Copy link
Member Author

6543 commented Oct 14, 2024

(I tried to have a single source of truth for the query ... but if preferred i will just use duplicated code by have a builder version and classic xorm version)

@6543 6543 mentioned this pull request Oct 15, 2024
Draft
@6543
Copy link
Member Author

6543 commented Oct 20, 2024

#32234 (comment)

this needs an answer to move forward from @lunny ...

@6543
Copy link
Member Author

6543 commented Oct 22, 2024

@lunny made 7bb645e here and 8780d12 ...

lunny
lunny reviewed Oct 26, 2024
View reviewed changes
models/organization/org.go Outdated Show resolved Hide resolved
@6543 6543 requested a review from lunny October 28, 2024 17:05
@6543
Copy link
Member Author

6543 commented Oct 31, 2024

@lunny anything else?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@delvh delvh delvh approved these changes

@lunny lunny Awaiting requested review from lunny

Assignees
No one assigned
Labels
lgtm/need 1 This PR needs approval from one additional maintainer to be merged. modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@6543 @lunny @delvh @GiteaBot