Regen

Author: easyCZ

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

@@ -7,9 +7,7 @@
 import { PendingGithubEvent, User, Identity } from '@gitpod/gitpod-protocol';
 import { EntityManager } from 'typeorm';
 
-export type PendingGithubEventWithUser = PendingGithubEvent & {
-    identity: Identity & { user: User };
-};
+export type PendingGithubEventWithUser = PendingGithubEvent & { identity: Identity & { user: User } };
 
 export const TransactionalPendingGithubEventDBFactory = Symbol('TransactionalPendingGithubEventDBFactory');
 export interface TransactionalPendingGithubEventDBFactory {

components/gitpod-db/src/periodic-deleter.ts

@@ -13,8 +13,7 @@ import { repeat } from '@gitpod/gitpod-protocol/lib/util/repeat';
 
 @injectable()
 export class PeriodicDbDeleter {
-    @inject(GitpodTableDescriptionProvider)
-    protected readonly tableProvider: GitpodTableDescriptionProvider;
+    @inject(GitpodTableDescriptionProvider) protected readonly tableProvider: GitpodTableDescriptionProvider;
     @inject(TypeORM) protected readonly typeORM: TypeORM;
 
     start() {

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

@@ -23,8 +23,7 @@ import { TypeORM } from './typeorm';
 @injectable()
 export class TypeORMAccountingDBImpl implements AccountingDB {
     @inject(TypeORM) typeORM: TypeORM;
-    @inject(TransactionalAccountingDBFactory)
-    protected readonly transactionalFactory: TransactionalAccountingDBFactory;
+    @inject(TransactionalAccountingDBFactory) protected readonly transactionalFactory: TransactionalAccountingDBFactory;
 
     async transaction<T>(
         closure: (db: AccountingDB) => Promise<T>,
@@ -220,9 +219,7 @@ export class TypeORMAccountingDBImpl implements AccountingDB {
         return (await this.getSubscriptionRepo())
             .createQueryBuilder('subscription')
             .where('subscription.userId  = :userId ', { userId: userId })
-            .andWhere('subscription.paymentReference = :paymentReference', {
-                paymentReference,
-            })
+            .andWhere('subscription.paymentReference = :paymentReference', { paymentReference })
             .andWhere('subscription.deleted != true')
             .andWhere('subscription.planId != "free"') // TODO DEL FREE-SUBS
             .orderBy('subscription.startDate', 'DESC')

components/gitpod-db/src/typeorm/app-installation-db-impl.ts

@@ -51,9 +51,7 @@ export class TypeORMAppInstallationDBImpl implements AppInstallationDB {
         const repo = await this.getRepo();
         const qb = repo
             .createQueryBuilder('installation')
-            .where('installation.installationID = :installationID', {
-                installationID,
-            })
+            .where('installation.installationID = :installationID', { installationID })
             .andWhere('installation.state != "uninstalled"')
             .orderBy('installation.lastUpdateTime', 'DESC')
             .limit(1);
@@ -68,10 +66,7 @@ export class TypeORMAppInstallationDBImpl implements AppInstallationDB {
     ) {
         const installation = await this.findInstallation(platform, installationID);
         if (!installation) {
-            log.warn('Cannot record uninstallation of non-existent installation', {
-                platform,
-                installationID,
-            });
+            log.warn('Cannot record uninstallation of non-existent installation', { platform, installationID });
             return;
         }
 

components/gitpod-db/src/typeorm/code-sync-resource-db.ts

@@ -32,9 +32,7 @@ export class CodeSyncResourceDB {
                     .addSelect('resource2.kind')
                     .addSelect('max(resource2.created)')
                     .from(DBCodeSyncResource, 'resource2')
-                    .where('resource2.userId = :userId AND resource2.deleted = 0', {
-                        userId,
-                    })
+                    .where('resource2.userId = :userId AND resource2.deleted = 0', { userId })
                     .groupBy('resource2.kind')
                     .orderBy('resource2.created', 'DESC')
                     .getQuery();
@@ -102,11 +100,7 @@ export class CodeSyncResourceDB {
                     .createQueryBuilder()
                     .update(DBCodeSyncResource)
                     .set({ rev })
-                    .where('userId = :userId AND kind = :kind AND rev = :rev', {
-                        userId,
-                        kind,
-                        rev: toUpdated.rev,
-                    })
+                    .where('userId = :userId AND kind = :kind AND rev = :rev', { userId, kind, rev: toUpdated.rev })
                     .execute();
             } else {
                 await manager

components/gitpod-db/src/typeorm/entity/db-prebuilt-workspace-updatable.ts

@@ -30,27 +30,17 @@ export class DBPrebuiltWorkspaceUpdatable implements PrebuiltWorkspaceUpdatable
     @Column()
     repo: string;
 
-    @Column()
-    isResolved: boolean;
-
-<<<<<<< HEAD
-<<<<<<< HEAD
     @Column({
         default: '',
-        transformer: Transformer.MAP_EMPTY_STR_TO_UNDEFINED
+        transformer: Transformer.MAP_EMPTY_STR_TO_UNDEFINED,
     })
     commitSHA?: string;
 
     @Column()
     isResolved: boolean;
-=======
-  @Column()
-  installationId: string;
->>>>>>> 083c5c5e (Reformat gitpod-db with prettier)
-=======
+
     @Column()
     installationId: string;
->>>>>>> 3e7b850b (regen)
 
     @Column({
         default: '',

components/gitpod-db/src/typeorm/entity/db-prebuilt-workspace.ts

@@ -6,26 +6,17 @@
 
 import { PrimaryColumn, Column, Entity, Index } from 'typeorm';
 
-<<<<<<< HEAD
-import {
-  PrebuiltWorkspace,
-  PrebuiltWorkspaceState,
-} from "@gitpod/gitpod-protocol";
-import { TypeORM } from "../typeorm";
-import { Transformer } from "../transformer";
-import { PrebuildWorkspaceRateLimiterMigration1646739309660 } from "../migration/1646739309660-PrebuildWorskace-rate-limiter-migration";
-
-@Entity()
-@Index("ind_ac4a9aece1a455da0dc653888f", ["cloneURL", "commit"])
-@Index(PrebuildWorkspaceRateLimiterMigration1646739309660.INDEX_NAME, PrebuildWorkspaceRateLimiterMigration1646739309660.FIELDS)
-=======
 import { PrebuiltWorkspace, PrebuiltWorkspaceState } from '@gitpod/gitpod-protocol';
 import { TypeORM } from '../typeorm';
 import { Transformer } from '../transformer';
+import { PrebuildWorkspaceRateLimiterMigration1646739309660 } from '../migration/1646739309660-PrebuildWorskace-rate-limiter-migration';
 
 @Entity()
 @Index('ind_ac4a9aece1a455da0dc653888f', ['cloneURL', 'commit'])
->>>>>>> 3e7b850b (regen)
+@Index(
+    PrebuildWorkspaceRateLimiterMigration1646739309660.INDEX_NAME,
+    PrebuildWorkspaceRateLimiterMigration1646739309660.FIELDS,
+)
 // on DB but not Typeorm: @Index("ind_lastModified", ["_lastModified"])   // DBSync
 export class DBPrebuiltWorkspace implements PrebuiltWorkspace {
     @PrimaryColumn(TypeORM.UUID_COLUMN_TYPE)
@@ -72,31 +63,9 @@ export class DBPrebuiltWorkspace implements PrebuiltWorkspace {
     })
     snapshot?: string;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-    @Column({
-        default: '',
-        transformer: Transformer.MAP_EMPTY_STR_TO_UNDEFINED
-    })
-    snapshot?: string;
-
-    @Column({
-        default: '',
-        transformer: Transformer.MAP_EMPTY_STR_TO_UNDEFINED
-    })
-    error?: string;
-=======
-  @Column({
-    default: "",
-    transformer: Transformer.MAP_EMPTY_STR_TO_UNDEFINED,
-  })
-  error?: string;
->>>>>>> 083c5c5e (Reformat gitpod-db with prettier)
-=======
     @Column({
         default: '',
         transformer: Transformer.MAP_EMPTY_STR_TO_UNDEFINED,
     })
     error?: string;
->>>>>>> 3e7b850b (regen)
 }

components/gitpod-db/src/typeorm/migration/1616920059049-UpdateExamples.ts

@@ -34,11 +34,7 @@ export class UpdateExamples1616920059049 implements MigrationInterface {
                 description: 'A simple .NET Core application example',
                 priority: 20,
             },
-            {
-                url: 'https://github.com/symfony/demo',
-                description: 'A Symfony demo application',
-                priority: 10,
-            },
+            { url: 'https://github.com/symfony/demo', description: 'A Symfony demo application', priority: 10 },
         ];
         // delete old entries
         await queryRunner.query('DELETE FROM d_b_repository_white_list');

components/gitpod-db/src/typeorm/migration/1646739309660-PrebuildWorskace-rate-limiter-migration.ts

@@ -4,21 +4,29 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-import {MigrationInterface, QueryRunner} from "typeorm";
-import { indexExists } from "./helper/helper";
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { indexExists } from './helper/helper';
 
 export class PrebuildWorkspaceRateLimiterMigration1646739309660 implements MigrationInterface {
-
-    public static readonly TABLE_NAME = "d_b_prebuilt_workspace";
-    public static readonly INDEX_NAME = "ind_prebuiltWorkspace_cloneURL_creationTime_state";
-    public static readonly FIELDS = ["cloneURL", "creationTime", "state"];
+    public static readonly TABLE_NAME = 'd_b_prebuilt_workspace';
+    public static readonly INDEX_NAME = 'ind_prebuiltWorkspace_cloneURL_creationTime_state';
+    public static readonly FIELDS = ['cloneURL', 'creationTime', 'state'];
 
     public async up(queryRunner: QueryRunner): Promise<void> {
-        if(!(await indexExists(queryRunner, PrebuildWorkspaceRateLimiterMigration1646739309660.TABLE_NAME, PrebuildWorkspaceRateLimiterMigration1646739309660.INDEX_NAME))) {
-            await queryRunner.query(`CREATE INDEX ${PrebuildWorkspaceRateLimiterMigration1646739309660.INDEX_NAME} ON ${PrebuildWorkspaceRateLimiterMigration1646739309660.TABLE_NAME} (${PrebuildWorkspaceRateLimiterMigration1646739309660.FIELDS.join(', ')})`);
+        if (
+            !(await indexExists(
+                queryRunner,
+                PrebuildWorkspaceRateLimiterMigration1646739309660.TABLE_NAME,
+                PrebuildWorkspaceRateLimiterMigration1646739309660.INDEX_NAME,
+            ))
+        ) {
+            await queryRunner.query(
+                `CREATE INDEX ${PrebuildWorkspaceRateLimiterMigration1646739309660.INDEX_NAME} ON ${
+                    PrebuildWorkspaceRateLimiterMigration1646739309660.TABLE_NAME
+                } (${PrebuildWorkspaceRateLimiterMigration1646739309660.FIELDS.join(', ')})`,
+            );
         }
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {}
-
 }

components/gitpod-db/src/typeorm/migration/1646803519382-PrebuildUpdatableSHA.ts

@@ -4,18 +4,17 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-import {MigrationInterface, QueryRunner} from "typeorm";
-import { columnExists } from "./helper/helper";
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { columnExists } from './helper/helper';
 
 export class PrebuildUpdatableSHA1646803519382 implements MigrationInterface {
-
     public async up(queryRunner: QueryRunner): Promise<void> {
-        if (!(await columnExists(queryRunner, "d_b_prebuilt_workspace_updatable", "commitSHA"))) {
-            await queryRunner.query("ALTER TABLE d_b_prebuilt_workspace_updatable ADD COLUMN commitSHA varchar(255) NOT NULL DEFAULT ''");
+        if (!(await columnExists(queryRunner, 'd_b_prebuilt_workspace_updatable', 'commitSHA'))) {
+            await queryRunner.query(
+                "ALTER TABLE d_b_prebuilt_workspace_updatable ADD COLUMN commitSHA varchar(255) NOT NULL DEFAULT ''",
+            );
         }
     }
 
-    public async down(queryRunner: QueryRunner): Promise<void> {
-    }
-
+    public async down(queryRunner: QueryRunner): Promise<void> {}
 }