[db, payment] Remove DBPaymentSource

Author: geropl

components/ee/payment-endpoint/src/chargebee/payment-source-handler.ts

@@ -22,7 +22,6 @@ import { AccountServiceImpl } from "./accounting/account-service-impl";
 import { GithubEndpointController } from "./github/endpoint-controller";
 import { GithubSubscriptionMapper } from "./github/subscription-mapper";
 import { GithubSubscriptionReconciler } from "./github/subscription-reconciler";
-import { PaymentSourceHandler } from "./chargebee/payment-source-handler";
 
 
 export const productionContainerModule = new ContainerModule((bind, unbind, isBound, rebind) => {
@@ -44,7 +43,6 @@ export const productionContainerModule = new ContainerModule((bind, unbind, isBo
     bind(CompositeEventHandler).toSelf().inSingletonScope();
     bind(EventHandler).to(SubscriptionHandler).inSingletonScope();
     bind(EventHandler).to(TeamSubscriptionHandler).inSingletonScope();
-    bind(EventHandler).to(PaymentSourceHandler).inSingletonScope();
 
     bind(SubscriptionService).toSelf().inSingletonScope();
     bind(TeamSubscriptionService).toSelf().inSingletonScope();

components/ee/payment-endpoint/src/container-module.ts

@@ -14,7 +14,7 @@ import { DBAccountEntry } from './typeorm/entity/db-account-entry';
 import { TransactionalAccountingDBImpl } from './typeorm/accounting-db-impl';
 import { DBWorkspace } from './typeorm/entity/db-workspace';
 import { DBWorkspaceInstance } from './typeorm/entity/db-workspace-instance';
-import { DBPaymentSourceInfo, DBSubscription } from './typeorm/entity/db-subscription';
+import { DBSubscription } from './typeorm/entity/db-subscription';
 import { testContainer } from './test-container';
 import { TypeORM } from './typeorm/typeorm';
 const expect = chai.expect;
@@ -136,28 +136,6 @@ export class AccountingDBSpec {
         expectExactlyOne(await this.db.findActiveSubscriptionsForUser(subscription.userId, rightBefore(later)), dbSubscription);
         expect(await this.db.findActiveSubscriptionsForUser(subscription.userId, later)).to.be.an('array').and.empty;
     }
-
-    // see https://github.com/gitpod-io/gitpod/issues/7171
-    @test public async bug7171() {
-        const paymentSourceInfo : DBPaymentSourceInfo = {
-            id: "bar",
-            resourceVersion: 1,
-            userId: "foo",
-            status: "valid",
-            cardExpiryMonth: 12,
-            cardExpiryYear: 2021
-        };
-        await this.db.storePaymentSourceInfo(paymentSourceInfo);
-        const paymentSourceInfo2 : DBPaymentSourceInfo = {
-            id: "bar",
-            resourceVersion: 1,
-            userId: "foo",
-            status: "expiring",
-            cardExpiryMonth: 12,
-            cardExpiryYear: 2021
-        };
-        await this.db.storePaymentSourceInfo(paymentSourceInfo2);
-    }
 }
 
 const expectExactlyOne = <T>(result: T[], expectation: T) => {

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

@@ -5,8 +5,8 @@
  */
 
 import { AccountEntry, Subscription, SubscriptionAndUser, Credit } from "@gitpod/gitpod-protocol/lib/accounting-protocol";
-import { DBSubscriptionAdditionalData, DBPaymentSourceInfo } from "./typeorm/entity/db-subscription";
-import { DeepPartial, EntityManager } from "typeorm";
+import { DBSubscriptionAdditionalData } from "./typeorm/entity/db-subscription";
+import { EntityManager } from "typeorm";
 
 export const TransactionalAccountingDBFactory = Symbol('TransactionalAccountingDBFactory');
 export interface TransactionalAccountingDBFactory {
@@ -41,7 +41,4 @@ export interface AccountingDB {
     transaction<T>(closure: (db: AccountingDB)=>Promise<T>, closures?: ((manager: EntityManager) => Promise<any>)[]): Promise<T>;
 
     storeSubscriptionAdditionalData(subscriptionData: DBSubscriptionAdditionalData): Promise<DBSubscriptionAdditionalData>;
-    storePaymentSourceInfo(cardInfo: DBPaymentSourceInfo): Promise<DBPaymentSourceInfo>;
 }
-
-export type DBPaymentSourceInfoPartial = DeepPartial<DBPaymentSourceInfo> & Pick<DBPaymentSourceInfo, "id">;

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

@@ -9,7 +9,7 @@ import { DBAccountEntry } from "./entity/db-account-entry";
 import { User } from "@gitpod/gitpod-protocol";
 import { AccountEntry, Subscription, Credit, SubscriptionAndUser } from "@gitpod/gitpod-protocol/lib/accounting-protocol";
 import { EntityManager, Repository } from "typeorm";
-import { DBSubscription, DBSubscriptionAdditionalData, DBPaymentSourceInfo } from "./entity/db-subscription";
+import { DBSubscription, DBSubscriptionAdditionalData } from "./entity/db-subscription";
 import { injectable, inject } from "inversify";
 import { v4 as uuidv4 } from 'uuid';
 import { DBUser } from "../typeorm/entity/db-user";
@@ -101,10 +101,6 @@ export class TypeORMAccountingDBImpl implements AccountingDB {
         return (await this.getEntityManager()).getRepository(DBSubscriptionAdditionalData);
     }
 
-    protected async getPaymentSourceRepo(): Promise<Repository<DBPaymentSourceInfo>> {
-        return (await this.getEntityManager()).getRepository(DBPaymentSourceInfo);
-    }
-
     async newSubscription(subscription: Omit<Subscription, 'uid'>): Promise<Subscription> {
         const newSubscription = new DBSubscription();
         Subscription.create(newSubscription);
@@ -257,23 +253,6 @@ export class TypeORMAccountingDBImpl implements AccountingDB {
         const repo = await this.getSubscriptionAdditionalDataRepo();
         return repo.save(subscriptionData);
     }
-
-    async storePaymentSourceInfo(info: DBPaymentSourceInfo): Promise<DBPaymentSourceInfo> {
-        const repo = await this.getPaymentSourceRepo();
-        // see https://github.com/gitpod-io/gitpod/issues/7171
-        // TypeORM seems to have problems with number type primary columns
-        const existing = await repo.findOne({ id: info.id, resourceVersion: info.resourceVersion });
-        if (existing) {
-            for (const prop in info) {
-                if (prop != "resourceVersion") {
-                    (existing as any)[prop] = (info as any)[prop];
-                }
-            }
-            return repo.save(existing);
-        } else {
-            return repo.save(info);
-        }
-    }
 }
 
 export class TransactionalAccountingDBImpl extends TypeORMAccountingDBImpl {

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

@@ -129,38 +129,3 @@ export interface CouponData {
      */
     coupon_code?: string;
 }
-
-@Entity()
-// on DB but not Typeorm: @Index("ind_lastModified", ["_lastModified"])   // DBSync
-@Index("ind_userId_softDeletedTime", ["userId", "softDeletedTime"])
-export class DBPaymentSourceInfo {
-    @PrimaryColumn()
-    id: string;
-
-    @PrimaryColumn({
-        type: "bigint"
-    })
-    @Index("ind_resourceVersion")   // Necessary for certain operations: https://dev.mysql.com/doc/refman/8.0/en/order-by-optimization.html
-    resourceVersion: number;
-
-    @Column(TypeORM.UUID_COLUMN_TYPE)
-    userId: string;
-
-    @Column()
-    status: PaymentSourceStatus;
-
-    @Column()
-    cardExpiryMonth: number;
-
-    @Column()
-    cardExpiryYear: number;
-
-    @Column({
-        type: "varchar",
-        length: 30,
-        default: '',
-        transformer: Transformer.MAP_EMPTY_STR_TO_UNDEFINED
-    })
-    softDeletedTime?: string;
-}
-export type PaymentSourceStatus = "valid" | "expiring" | "expired" | "invalid" | "pending_verification";