[gitpod-db] Don't consider garbage-collected prebuilds as potential bases for incremental prebuilds

Author: jankeromnes

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

@@ -751,9 +751,11 @@ export abstract class AbstractTypeORMWorkspaceDBImpl implements WorkspaceDB {
 
         let query = repo.createQueryBuilder("pws");
         query = query.where("pws.cloneURL = :cloneURL", { cloneURL });
+        query = query.andWhere("pws.softDeleted IS NULL");
         query = query.orderBy("pws.creationTime", "DESC");
         query = query.innerJoinAndMapOne("pws.workspace", DBWorkspace, "ws", "pws.buildWorkspaceId = ws.id");
         query = query.andWhere("ws.deleted = false");
+        query = query.andWhere("ws.contentDeletedTime = ''");
 
         const res = await query.getMany();
         return res.map((r) => {