Skip to content

db: migrate org.go to organizations.go with GORM #7538

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

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

db: migrate org.go to organizations.go with GORM #7538

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
10fd9e9
db: migrate `org.go` to `orgs.go` with GORM
unknwon Aug 24, 2023
9cc3cc7
style: format code with Go fmt and Gofumpt
deepsource-autofix[bot] Nov 2, 2023
371c56e
fixup
unknwon Nov 3, 2023
e0a14a5
Use `OrganizationsStore.Create` replace tests hack
unknwon Nov 3, 2023
a449284
Fix `Orgs.Join`
unknwon Nov 4, 2023
ac636b5
`DeleteByID`
unknwon Nov 4, 2023
bd31c3f
Delete `GetOrgsByUserID`
unknwon Nov 4, 2023
b332af5
Fix damn test
unknwon Nov 4, 2023
a18290d
fix race
unknwon Nov 4, 2023
849d281
GetOwnedOrgsByUserIDDesc
unknwon Nov 5, 2023
2971cab
getOrgUsersByOrgID
unknwon Nov 5, 2023
9797508
GetUserMirrorRepositories
unknwon Nov 5, 2023
b49e4a4
fixup
unknwon Nov 5, 2023
ed260cb
orgsCreate
unknwon Nov 5, 2023
26f8ddf
orgsGetByName
unknwon Nov 5, 2023
0ca926e
fixup
unknwon Nov 13, 2023
cbd3c7a
orgsList
unknwon Nov 13, 2023
6345c50
orgsCount
unknwon Nov 13, 2023
bf92bcd
orgsDeleteByID
unknwon Nov 13, 2023
fce3e65
orgsAddMember
unknwon Nov 14, 2023
5ab8262
orgsRemoveMember
unknwon Nov 14, 2023
7d4c5b4
Check access before watch repo
unknwon Nov 16, 2023
b2a0ce6
orgsHasMember
unknwon Nov 16, 2023
54d5e4c
style: format code with Go fmt and Gofumpt
deepsource-autofix[bot] Nov 16, 2023
c5fa4cf
orgsListMembers
unknwon Nov 17, 2023
22526be
orgsIsOwnedBy
unknwon Nov 17, 2023
34e59c2
orgsSetMemberVisibility
unknwon Nov 17, 2023
f0fed90
Add tests
unknwon Nov 26, 2023
403e1fb
Fix test
unknwon Dec 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix test
  • Loading branch information
@unknwon
unknwon committed Dec 17, 2023
commit 403e1fb21925779eb71313006556e99618947ef8
40 changes: 11 additions & 29 deletions internal/db/organizations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,9 +324,7 @@ func orgsCountByUser(t *testing.T, ctx context.Context, db *organizations) {
assert.Equal(t, int64(0), got)
}

func orgsCount(t *testing.T, db *organizations) {
ctx := context.Background()

func orgsCount(t *testing.T, ctx context.Context, db *organizations) {
// Has no organization initially
got := db.Count(ctx)
assert.Equal(t, int64(0), got)
Expand All @@ -344,9 +342,7 @@ func orgsCount(t *testing.T, db *organizations) {
assert.Equal(t, int64(1), got)
}

func orgsDeleteByID(t *testing.T, db *organizations) {
ctx := context.Background()

func orgsDeleteByID(t *testing.T, ctx context.Context, db *organizations) {
tempPictureAvatarUploadPath := filepath.Join(os.TempDir(), "orgsDeleteByID-tempPictureAvatarUploadPath")
conf.SetMockPicture(t, conf.PictureOpts{AvatarUploadPath: tempPictureAvatarUploadPath})

Expand Down Expand Up @@ -407,9 +403,7 @@ func orgsDeleteByID(t *testing.T, db *organizations) {
assert.Equal(t, wantErr, err)
}

func orgsAddMember(t *testing.T, db *organizations) {
ctx := context.Background()

func orgsAddMember(t *testing.T, ctx context.Context, db *organizations) {
usersStore := NewUsersStore(db.DB)
alice, err := usersStore.Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
require.NoError(t, err)
Expand Down Expand Up @@ -446,9 +440,7 @@ func orgsAddMember(t *testing.T, db *organizations) {
assert.Equal(t, 2, gotOrg.NumMembers)
}

func orgsRemoveMember(t *testing.T, db *organizations) {
ctx := context.Background()

func orgsRemoveMember(t *testing.T, ctx context.Context, db *organizations) {
usersStore := NewUsersStore(db.DB)
alice, err := usersStore.Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
require.NoError(t, err)
Expand Down Expand Up @@ -560,9 +552,7 @@ func orgsRemoveMember(t *testing.T, db *organizations) {
assert.Equal(t, 1, gotOrg.NumMembers)
}

func orgsHasMember(t *testing.T, db *organizations) {
ctx := context.Background()

func orgsHasMember(t *testing.T, ctx context.Context, db *organizations) {
got, _ := db.HasMember(ctx, 1, 1)
assert.False(t, got)

Expand All @@ -573,9 +563,7 @@ func orgsHasMember(t *testing.T, db *organizations) {
assert.True(t, got)
}

func orgsListMembers(t *testing.T, db *organizations) {
ctx := context.Background()

func orgsListMembers(t *testing.T, ctx context.Context, db *organizations) {
usersStore := NewUsersStore(db.DB)
alice, err := usersStore.Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
require.NoError(t, err)
Expand All @@ -602,9 +590,7 @@ func orgsListMembers(t *testing.T, db *organizations) {
assert.Equal(t, bob.ID, got[1].ID)
}

func orgsIsOwnedBy(t *testing.T, db *organizations) {
ctx := context.Background()

func orgsIsOwnedBy(t *testing.T, ctx context.Context, db *organizations) {
usersStore := NewUsersStore(db.DB)
alice, err := usersStore.Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
require.NoError(t, err)
Expand All @@ -629,9 +615,7 @@ func orgsIsOwnedBy(t *testing.T, db *organizations) {
assert.False(t, got)
}

func orgsSetMemberVisibility(t *testing.T, db *organizations) {
ctx := context.Background()

func orgsSetMemberVisibility(t *testing.T, ctx context.Context, db *organizations) {
usersStore := NewUsersStore(db.DB)
alice, err := usersStore.Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
require.NoError(t, err)
Expand All @@ -653,9 +637,7 @@ func orgsSetMemberVisibility(t *testing.T, db *organizations) {
assert.Len(t, got, 1)
}

func orgsGetTeamByName(t *testing.T, db *organizations) {
ctx := context.Background()

func orgsGetTeamByName(t *testing.T, ctx context.Context, db *organizations) {
usersStore := NewUsersStore(db.DB)
alice, err := usersStore.Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
require.NoError(t, err)
Expand Down Expand Up @@ -695,10 +677,10 @@ func orgsGetTeamByName(t *testing.T, db *organizations) {
require.NoError(t, err)
}

func orgsAccessibleRepositoriesByUser(t *testing.T, db *organizations) {
func orgsAccessibleRepositoriesByUser(t *testing.T, ctx context.Context, db *organizations) {
// todo
}

func orgsMirrorRepositoriesByUser(t *testing.T, db *organizations) {
func orgsMirrorRepositoriesByUser(t *testing.T, ctx context.Context, db *organizations) {
// todo
}
3 changes: 0 additions & 3 deletions internal/db/repositories_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,6 @@ func reposListWatches(t *testing.T, ctx context.Context, db *repositories) {
}

func reposWatch(t *testing.T, ctx context.Context, db *repositories) {
repo1, err := db.Create(ctx, 1, CreateRepoOptions{Name: "repo1"})
require.NoError(t, err)

t.Run("user does not have access to the repository", func(t *testing.T) {
repo1, err := db.Create(ctx, 1, CreateRepoOptions{Name: "repo1", Private: true})
require.NoError(t, err)
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy