Skip to content

Commit 3a284fa

Browse files
authored
[db] Remove all Chargebee-related DB models (#17287)
* [yarn] Fix dirty yarn.lock * [db] Remove models for Subscription, AccountEntry, TeamSubscription/2 and PendingGithubEvent * [db] Adjust DB model for TeamMembership
1 parent f85d4e4 commit 3a284fa

23 files changed

+8
-1365
lines changed

components/gitpod-db/go/team_membership.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ import (
1616
type TeamMembership struct {
1717
ID uuid.UUID `gorm:"primary_key;column:id;type:char;size:36;" json:"id"`
1818

19-
TeamID uuid.UUID `gorm:"column:teamId;type:char;size:36;" json:"teamId"`
20-
UserID uuid.UUID `gorm:"column:userId;type:char;size:36;" json:"userId"`
21-
Role TeamMembershipRole `gorm:"column:role;type:varchar;size:255;" json:"role"`
22-
SubscriptionID uuid.UUID `gorm:"column:subscriptionId;type:char;size:36;" json:"subscriptionId"`
19+
TeamID uuid.UUID `gorm:"column:teamId;type:char;size:36;" json:"teamId"`
20+
UserID uuid.UUID `gorm:"column:userId;type:char;size:36;" json:"userId"`
21+
Role TeamMembershipRole `gorm:"column:role;type:varchar;size:255;" json:"role"`
2322

2423
CreationTime VarcharTime `gorm:"column:creationTime;type:varchar;size:255;" json:"creationTime"`
2524
// Read-only (-> property).

components/gitpod-db/go/team_membership_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ func TestTeamMembership_WriteRead(t *testing.T) {
1818
conn := dbtest.ConnectForTests(t)
1919

2020
membership := &db.TeamMembership{
21-
ID: uuid.New(),
22-
TeamID: uuid.New(),
23-
UserID: uuid.New(),
24-
Role: db.TeamMembershipRole_Member,
25-
SubscriptionID: uuid.New(),
21+
ID: uuid.New(),
22+
TeamID: uuid.New(),
23+
UserID: uuid.New(),
24+
Role: db.TeamMembershipRole_Member,
2625
}
2726

2827
tx := conn.Create(membership)

components/gitpod-db/src/accounting-db.spec.db.ts

Lines changed: 0 additions & 151 deletions
This file was deleted.

components/gitpod-db/src/accounting-db.ts

Lines changed: 0 additions & 57 deletions
This file was deleted.

components/gitpod-db/src/container-module.ts

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ import { OneTimeSecretDB } from "./one-time-secret-db";
2121
import { TypeORMAppInstallationDBImpl } from "./typeorm/app-installation-db-impl";
2222
import { AppInstallationDB } from "./app-installation-db";
2323
import { TypeORMOneTimeSecretDBImpl } from "./typeorm/one-time-secret-db-impl";
24-
import { PendingGithubEventDB, TransactionalPendingGithubEventDBFactory } from "./pending-github-event-db";
25-
import {
26-
TransactionalPendingGithubEventDBImpl,
27-
TypeORMPendingGithubEventDBImpl,
28-
} from "./typeorm/pending-github-event-db-impl";
2924
import { GitpodTableDescriptionProvider, TableDescriptionProvider } from "./tables";
3025
import { PeriodicDbDeleter } from "./periodic-deleter";
3126
import { CodeSyncResourceDB } from "./typeorm/code-sync-resource-db";
@@ -35,22 +30,15 @@ import { WorkspaceClusterDB } from "./workspace-cluster-db";
3530
import { AuthCodeRepositoryDB } from "./typeorm/auth-code-repository-db";
3631
import { AuthProviderEntryDB } from "./auth-provider-entry-db";
3732
import { AuthProviderEntryDBImpl } from "./typeorm/auth-provider-entry-db-impl";
38-
import { TeamSubscriptionDB } from "./team-subscription-db";
39-
import { AccountingDB, TransactionalAccountingDBFactory } from "./accounting-db";
4033
import { EmailDomainFilterDB } from "./email-domain-filter-db";
4134
import { EmailDomainFilterDBImpl } from "./typeorm/email-domain-filter-db-impl";
42-
import { TeamSubscriptionDBImpl } from "./typeorm/team-subscription-db-impl";
43-
import { TransactionalAccountingDBImpl, TypeORMAccountingDBImpl } from "./typeorm/accounting-db-impl";
4435
import { TeamDB } from "./team-db";
4536
import { TeamDBImpl } from "./typeorm/team-db-impl";
4637
import { ProjectDB } from "./project-db";
4738
import { ProjectDBImpl } from "./typeorm/project-db-impl";
4839
import { PersonalAccessTokenDB } from "./personal-access-token-db";
49-
import { EntityManager } from "typeorm";
5040
import { TypeORMInstallationAdminImpl } from "./typeorm/installation-admin-db-impl";
5141
import { InstallationAdminDB } from "./installation-admin-db";
52-
import { TeamSubscription2DB } from "./team-subscription-2-db";
53-
import { TeamSubscription2DBImpl } from "./typeorm/team-subscription-2-db-impl";
5442
import { TypeORMBlockedRepositoryDBImpl } from "./typeorm/blocked-repository-db-impl";
5543
import { BlockedRepositoryDB } from "./blocked-repository-db";
5644
import { WebhookEventDB } from "./webhook-event-db";
@@ -96,14 +84,6 @@ export const dbContainerModule = new ContainerModule((bind, unbind, isBound, reb
9684
bind(OneTimeSecretDB).toService(TypeORMOneTimeSecretDBImpl);
9785
bindDbWithTracing(TracedOneTimeSecretDB, bind, OneTimeSecretDB).inSingletonScope();
9886

99-
bind(TypeORMPendingGithubEventDBImpl).toSelf().inSingletonScope();
100-
bind(PendingGithubEventDB).toService(TypeORMPendingGithubEventDBImpl);
101-
bind(TransactionalPendingGithubEventDBFactory).toFactory((ctx) => {
102-
return (manager: EntityManager) => {
103-
return new TransactionalPendingGithubEventDBImpl(manager);
104-
};
105-
});
106-
10787
encryptionModule(bind, unbind, isBound, rebind);
10888
bind(KeyProviderConfig)
10989
.toDynamicValue((ctx) => {
@@ -135,14 +115,6 @@ export const dbContainerModule = new ContainerModule((bind, unbind, isBound, reb
135115
bind(PersonalAccessTokenDB).toService(PersonalAccessTokenDBImpl);
136116

137117
// com concerns
138-
bind(AccountingDB).to(TypeORMAccountingDBImpl).inSingletonScope();
139-
bind(TransactionalAccountingDBFactory).toFactory((ctx) => {
140-
return (manager: EntityManager) => {
141-
return new TransactionalAccountingDBImpl(manager);
142-
};
143-
});
144-
bind(TeamSubscriptionDB).to(TeamSubscriptionDBImpl).inSingletonScope();
145-
bind(TeamSubscription2DB).to(TeamSubscription2DBImpl).inSingletonScope();
146118
bind(EmailDomainFilterDB).to(EmailDomainFilterDBImpl).inSingletonScope();
147119
bind(UserToTeamMigrationService).toSelf().inSingletonScope();
148120
bind(WorkspaceOrganizationIdMigration).toSelf().inSingletonScope();

components/gitpod-db/src/index.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,8 @@ export * from "./app-installation-db";
2323
export * from "./user-storage-resources-db";
2424
export * from "./one-time-secret-db";
2525
export * from "./auth-provider-entry-db";
26-
export * from "./pending-github-event-db";
2726
export * from "./typeorm/typeorm";
28-
export * from "./accounting-db";
29-
export * from "./team-subscription-db";
30-
export * from "./team-subscription-2-db";
3127
export * from "./email-domain-filter-db";
32-
export * from "./typeorm/entity/db-account-entry";
3328
export * from "./project-db";
3429
export * from "./team-db";
3530
export * from "./installation-admin-db";

components/gitpod-db/src/pending-github-event-db.ts

Lines changed: 0 additions & 30 deletions
This file was deleted.

components/gitpod-db/src/team-db.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export interface TeamDB {
3232
updateTeam(teamId: string, team: Pick<Team, "name">): Promise<Team>;
3333
addMemberToTeam(userId: string, teamId: string): Promise<"added" | "already_member">;
3434
setTeamMemberRole(userId: string, teamId: string, role: TeamMemberRole): Promise<void>;
35-
setTeamMemberSubscription(userId: string, teamId: string, subscriptionId: string): Promise<void>;
3635
removeMemberFromTeam(userId: string, teamId: string): Promise<void>;
3736
findTeamMembershipInviteById(inviteId: string): Promise<TeamMembershipInvite>;
3837
findGenericInviteByTeamId(teamId: string): Promise<TeamMembershipInvite | undefined>;

components/gitpod-db/src/team-subscription-2-db.ts

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)