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

feat: initial orgs & teams support #443

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

feat: initial orgs & teams support #443

wants to merge 2 commits into from

Conversation

aymanbagabas
Copy link
Member

@aymanbagabas aymanbagabas commented Dec 11, 2023 •
edited
Loading

Fixes: #257

@aymanbagabas
feat: initial orgs & teams support
caca389 
Squashed commit of the following:

commit 26d3df790c79a0803033ba71b7c394a27c401f1e
Author: Ayman Bagabas <[email protected]>
Date:   Thu Nov 30 10:33:32 2023 -0800

    feat: add team collaborators (#19)

    Repository collaborators can be either individual users, or organization
    teams. When it's an org team, the repo must belong to the same
    organization that the team belongs to. This validation happens in the
    app logic.

commit 8a598a1898228432114d81d158eb25578b112353
Merge: 9399cd6a60f9 5ae66bc932bd
Author: Carlos Alexandro Becker <[email protected]>
Date:   Tue Nov 14 09:37:42 2023 -0300

    Merge pull request #15 from charmbracelet/orgs

    feat: initial organization support

commit 5ae66bc932bde406b994877c7c32def5115d9afc
Author: Carlos Alexandro Becker <[email protected]>
Date:   Tue Nov 14 10:06:20 2023 +0000

    fix: code review

    Signed-off-by: Carlos Alexandro Becker <[email protected]>

commit 4d16aecedec8b1a46ee1ea73c2d1cc4b51f0ebd1
Author: Carlos Alexandro Becker <[email protected]>
Date:   Mon Nov 13 18:55:04 2023 +0000

    wip team

commit 3374c8cd24f3c03188cf1f9e27b9242fd9df00a1
Author: Carlos Alexandro Becker <[email protected]>
Date:   Mon Nov 13 17:15:54 2023 +0000

    wip team

commit 890975daab842cab7207d68535c7ed5e2dec98c7
Author: Carlos Alexandro Becker <[email protected]>
Date:   Mon Nov 13 15:59:22 2023 +0000

    wip teams

commit d67773949c1ca93ca392d156241f9f166e471723
Author: Carlos Alexandro Becker <[email protected]>
Date:   Mon Nov 13 15:44:33 2023 +0000

    fix: team signatures

commit b3881958409bd98bc8861f4048826e9efaca7b6d
Author: Carlos Alexandro Becker <[email protected]>
Date:   Mon Nov 13 15:44:26 2023 +0000

    fix: rename method

commit 509585f7c6444e0a0106d1100204bee0ee65e70f
Author: Carlos Alexandro Becker <[email protected]>
Date:   Mon Nov 13 12:32:03 2023 +0000

    wip

commit ab0124e25c12cf2d6c8d75f793ac80a236bbbe82
Author: Carlos Alexandro Becker <[email protected]>
Date:   Thu Nov 9 20:47:15 2023 +0000

    fix: cr

commit 3e6de9b54dbb4d0cefe3891f424976c760c39ee3
Author: Carlos Alexandro Becker <[email protected]>
Date:   Thu Nov 9 20:44:46 2023 +0000

    fixes

commit 452815ea7231b3d362b95ea7ab2149492862974a
Author: Carlos Alexandro Becker <[email protected]>
Date:   Thu Nov 9 20:37:44 2023 +0000

    wip

commit aa25e4fc40104c9c390b2d69eb4fc33128938074
Author: Carlos Alexandro Becker <[email protected]>
Date:   Thu Nov 9 20:35:39 2023 +0000

    wip

commit 28241cc64e57b2b3a30ed6897b1156a88965e99b
Merge: 12a70b3e5e0c 9399cd6a60f9
Author: Carlos Alexandro Becker <[email protected]>
Date:   Thu Nov 9 20:33:30 2023 +0000

    Merge remote-tracking branch 'origin/orgs-teams' into orgs

commit 9399cd6a60f9d3a6e6bf95aa4bb454161944c540
Author: Ayman Bagabas <[email protected]>
Date:   Thu Nov 9 12:22:02 2023 -0500

    feat: add email user relations and models

commit a0715c42d628528292501591c6b5764a5ee80ff8
Author: Ayman Bagabas <[email protected]>
Date:   Thu Nov 9 10:08:23 2023 -0500

    fix: carlos comments

commit 12a70b3e5e0cc625dd48511d035e632b551fd05b
Author: Carlos Alexandro Becker <[email protected]>
Date:   Thu Nov 9 13:40:37 2023 +0000

    fix: admin

commit 637c8bccd6877e3447a9e1f6f13e1a1105a3616f
Author: Carlos Alexandro Becker <[email protected]>
Date:   Thu Nov 9 12:57:01 2023 +0000

    wip

commit 4ec7653f4ba6fed4faee21f8416d2dbbe46ef3d3
Author: Carlos Alexandro Becker <[email protected]>
Date:   Thu Nov 9 12:32:46 2023 +0000

    fix: merge issues

commit d8b8e22f98f5700d84d599e9a0483ab1d0572497
Merge: c2bf2721d2d0 777e451128b1
Author: Carlos Alexandro Becker <[email protected]>
Date:   Thu Nov 9 12:27:26 2023 +0000

    Merge remote-tracking branch 'origin/orgs-teams' into orgs

commit c2bf2721d2d0b17e4cfa2cc1a45d9a21cf4197fd
Author: Carlos Alexandro Becker <[email protected]>
Date:   Thu Nov 9 02:25:19 2023 +0000

    wip

commit 92b5f57ec09a013b051dd6828dd1beb4ed95d641
Author: Carlos Alexandro Becker <[email protected]>
Date:   Thu Nov 9 02:10:37 2023 +0000

    wip

commit 83f6cf906a5779168706277ec37e3bb84578b55b
Author: Carlos Alexandro Becker <[email protected]>
Date:   Wed Nov 8 19:42:02 2023 +0000

    wip

commit 777e451128b141304341e6497d6a96a6f4185f3a
Author: Ayman Bagabas <[email protected]>
Date:   Wed Nov 8 12:56:25 2023 -0500

    fix: lint

commit 50f2b054550489bf8df81a96f553764096734c89
Author: Ayman Bagabas <[email protected]>
Date:   Wed Nov 8 12:53:24 2023 -0500

    feat: add models and missing columns

commit 84cb588
Author: Ayman Bagabas <[email protected]>
Date:   Wed Nov 8 12:39:44 2023 -0500

    fix(backend): update backend to use handles table

commit af16adab439e5905704be986e32be48ef85d2846
Author: Carlos Alexandro Becker <[email protected]>
Date:   Wed Nov 8 17:34:18 2023 +0000

    wip: adding orgs

commit a222f24
Author: Ayman Bagabas <[email protected]>
Date:   Wed Nov 8 07:33:06 2023 -0800

    Add organizations and teams migration (#9)

    * feat(db): pre/post migration

    * feat(db): add create orgs/teams migration

commit f7f521e
Author: Ayman Bagabas <[email protected]>
Date:   Tue Nov 7 16:44:09 2023 -0500

    wip
@aymanbagabas aymanbagabas force-pushed the orgs-teams branch 2 times, most recently from 55d56d8 to ba597bc Compare December 11, 2023 18:55
@codecov Codecov
Copy link

codecov bot commented Dec 11, 2023

Codecov Report

Attention: 743 lines in your changes are missing coverage. Please review.

Comparison is base (c3915b2) 56.42% compared to head (8fbd41a) 54.70%.

Files Patch % Lines
pkg/store/database/org.go 0.00% 129 Missing ⚠️
pkg/store/database/team.go 0.00% 111 Missing ⚠️
pkg/ssh/cmd/team.go 0.00% 90 Missing ⚠️
pkg/backend/user.go 48.71% 43 Missing and 17 partials ⚠️
pkg/web/git_lfs.go 1.66% 59 Missing ⚠️
pkg/ssh/cmd/org.go 34.78% 41 Missing and 4 partials ⚠️
pkg/backend/team.go 0.00% 34 Missing ⚠️
pkg/backend/org.go 0.00% 31 Missing ⚠️
pkg/store/database/handle.go 41.66% 26 Missing and 2 partials ⚠️
pkg/store/database/user.go 67.90% 12 Missing and 14 partials ⚠️
... and 16 more
Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #443      +/-   ##
==========================================
- Coverage   56.42%   54.70%   -1.72%     
==========================================
  Files         157      166       +9     
  Lines       13454    14325     +871     
==========================================
+ Hits         7591     7837     +246     
- Misses       5256     5847     +591     
- Partials      607      641      +34

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@gedw99
Copy link

gedw99 commented Dec 21, 2023 •
edited
Loading

is the DB sqlite ?

sqlite abd postres: https://github.com/charmbracelet/soft-serve/blob/main/pkg/db/db.go

Nice !!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

feat: support group and teams
2 participants
@aymanbagabas @gedw99