wip

AlexTugarev · AlexTugarev · commit 048e2796d6ce · 2023-03-30T08:22:55.000Z
diff --git a/components/gitpod-db/src/periodic-deleter.ts b/components/gitpod-db/src/periodic-deleter.ts
@@ -65,7 +65,7 @@ export class PeriodicDbDeleter {
         for (const i in rows) {
             const row = rows[i];
             const whereClause = whereClauseFn(row);
-            deletions.push(`DELETE FROM ${table.name} WHERE ${whereClause};`);
+            deletions.push(`DELETE FROM ${table.name} WHERE ${whereClause} AND ${deletionColumn} = true;`);
         }
 
         return result;
diff --git a/components/server/src/user/user-service.ts b/components/server/src/user/user-service.ts
@@ -137,7 +137,7 @@ export class UserService {
         if (userUpdate) {
             userUpdate(newUser);
         }
-        newUser.identities.push(identity);
+        newUser.identities.push({ ...identity, deleted: false });
         this.handleNewUser(newUser, isFirstUser);
         newUser = await this.userDb.storeUser(newUser);
         if (token) {

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ export class PeriodicDbDeleter {`
`65`	`65`	`for (const i in rows) {`
`66`	`66`	`const row = rows[i];`
`67`	`67`	`const whereClause = whereClauseFn(row);`
`68`		- deletions.push(`DELETE FROM ${table.name} WHERE ${whereClause};`);
	`68`	+ deletions.push(`DELETE FROM ${table.name} WHERE ${whereClause} AND ${deletionColumn} = true;`);
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ export class UserService {`
`137`	`137`	`if (userUpdate) {`
`138`	`138`	`userUpdate(newUser);`
`139`	`139`	`}`
`140`		`- newUser.identities.push(identity);`
	`140`	`+ newUser.identities.push({ ...identity, deleted: false });`
`141`	`141`	`this.handleNewUser(newUser, isFirstUser);`
`142`	`142`	`newUser = await this.userDb.storeUser(newUser);`
`143`	`143`	`if (token) {`