Update UI to take environment variables from user (#6)

Part of [Service provider auctions for web deployments](https://www.notion.so/Service-provider-auctions-for-web-deployments-104a6b22d47280dbad51d28aa3a91d75)

- Take environment variables from the user in the `Configure` deployment step

Co-authored-by: Isha Venikar <ishavenikar@Ishas-MacBook-Air.local>
Co-authored-by: IshaVenikar <ishavenikar7@gmail.com>
Reviewed-on: cerc-io/snowballtools-base#6

packages/backend/src/database.ts

@@ -33,7 +33,7 @@ export class Database {
   private dataSource: DataSource;
   private projectDomain: string;
 
-  constructor ({ dbPath } : DatabaseConfig, { projectDomain } : MiscConfig) {
+  constructor({ dbPath }: DatabaseConfig, { projectDomain }: MiscConfig) {
     this.dataSource = new DataSource({
       type: 'better-sqlite3',
       database: dbPath,
@@ -45,7 +45,7 @@ export class Database {
     this.projectDomain = projectDomain;
   }
 
-  async init (): Promise<void> {
+  async init(): Promise<void> {
     await this.dataSource.initialize();
     log('database initialized');
 
@@ -58,21 +58,21 @@ export class Database {
     }
   }
 
-  async getUser (options: FindOneOptions<User>): Promise<User | null> {
+  async getUser(options: FindOneOptions<User>): Promise<User | null> {
     const userRepository = this.dataSource.getRepository(User);
     const user = await userRepository.findOne(options);
 
     return user;
   }
 
-  async addUser (data: DeepPartial<User>): Promise<User> {
+  async addUser(data: DeepPartial<User>): Promise<User> {
     const userRepository = this.dataSource.getRepository(User);
     const user = await userRepository.save(data);
 
     return user;
   }
 
-  async updateUser (user: User, data: DeepPartial<User>): Promise<boolean> {
+  async updateUser(user: User, data: DeepPartial<User>): Promise<boolean> {
     const userRepository = this.dataSource.getRepository(User);
     const updateResult = await userRepository.update({ id: user.id }, data);
     assert(updateResult.affected);
@@ -80,7 +80,7 @@ export class Database {
     return updateResult.affected > 0;
   }
 
-  async getOrganizations (
+  async getOrganizations(
     options: FindManyOptions<Organization>
   ): Promise<Organization[]> {
     const organizationRepository = this.dataSource.getRepository(Organization);
@@ -89,7 +89,7 @@ export class Database {
     return organizations;
   }
 
-  async getOrganization (
+  async getOrganization(
     options: FindOneOptions<Organization>
   ): Promise<Organization | null> {
     const organizationRepository = this.dataSource.getRepository(Organization);
@@ -98,7 +98,7 @@ export class Database {
     return organization;
   }
 
-  async getOrganizationsByUserId (userId: string): Promise<Organization[]> {
+  async getOrganizationsByUserId(userId: string): Promise<Organization[]> {
     const organizationRepository = this.dataSource.getRepository(Organization);
 
     const userOrgs = await organizationRepository.find({
@@ -114,21 +114,21 @@ export class Database {
     return userOrgs;
   }
 
-  async addUserOrganization (data: DeepPartial<UserOrganization>): Promise<UserOrganization> {
+  async addUserOrganization(data: DeepPartial<UserOrganization>): Promise<UserOrganization> {
     const userOrganizationRepository = this.dataSource.getRepository(UserOrganization);
     const newUserOrganization = await userOrganizationRepository.save(data);
 
     return newUserOrganization;
   }
 
-  async getProjects (options: FindManyOptions<Project>): Promise<Project[]> {
+  async getProjects(options: FindManyOptions<Project>): Promise<Project[]> {
     const projectRepository = this.dataSource.getRepository(Project);
     const projects = await projectRepository.find(options);
 
     return projects;
   }
 
-  async getProjectById (projectId: string): Promise<Project | null> {
+  async getProjectById(projectId: string): Promise<Project | null> {
     const projectRepository = this.dataSource.getRepository(Project);
 
     const project = await projectRepository
@@ -150,7 +150,20 @@ export class Database {
     return project;
   }
 
-  async getProjectsInOrganization (
+  async allProjectsWithoutDeployments(): Promise<Project[]> {
+    const projectRepository = this.dataSource.getRepository(Project);
+
+    const projects = await projectRepository
+      .createQueryBuilder('project')
+      .leftJoinAndSelect('project.deployments', 'deployment', 'deployment.deletedAt IS NULL') // Join only non-soft-deleted deployments
+      .where('deployment.id IS NULL') // Get projects where no deployments are present
+      .andWhere('project.auctionId IS NOT NULL') // Ensure auctionId is not null
+      .getMany();
+
+    return projects;
+  }
+
+  async getProjectsInOrganization(
     userId: string,
     organizationSlug: string
   ): Promise<Project[]> {
@@ -181,7 +194,7 @@ export class Database {
   /**
    * Get deployments with specified filter
    */
-  async getDeployments (
+  async getDeployments(
     options: FindManyOptions<Deployment>
   ): Promise<Deployment[]> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
@@ -190,7 +203,7 @@ export class Database {
     return deployments;
   }
 
-  async getDeploymentsByProjectId (projectId: string): Promise<Deployment[]> {
+  async getDeploymentsByProjectId(projectId: string): Promise<Deployment[]> {
     return this.getDeployments({
       relations: {
         project: true,
@@ -208,7 +221,7 @@ export class Database {
     });
   }
 
-  async getDeployment (
+  async getDeployment(
     options: FindOneOptions<Deployment>
   ): Promise<Deployment | null> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
@@ -217,14 +230,14 @@ export class Database {
     return deployment;
   }
 
-  async getDomains (options: FindManyOptions<Domain>): Promise<Domain[]> {
+  async getDomains(options: FindManyOptions<Domain>): Promise<Domain[]> {
     const domainRepository = this.dataSource.getRepository(Domain);
     const domains = await domainRepository.find(options);
 
     return domains;
   }
 
-  async addDeployment (data: DeepPartial<Deployment>): Promise<Deployment> {
+  async addDeployment(data: DeepPartial<Deployment>): Promise<Deployment> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
 
     const id = nanoid();
@@ -238,7 +251,7 @@ export class Database {
     return deployment;
   }
 
-  async getProjectMembersByProjectId (
+  async getProjectMembersByProjectId(
     projectId: string
   ): Promise<ProjectMember[]> {
     const projectMemberRepository =
@@ -259,7 +272,7 @@ export class Database {
     return projectMembers;
   }
 
-  async getEnvironmentVariablesByProjectId (
+  async getEnvironmentVariablesByProjectId(
     projectId: string,
     filter?: FindOptionsWhere<EnvironmentVariable>
   ): Promise<EnvironmentVariable[]> {
@@ -278,7 +291,7 @@ export class Database {
     return environmentVariables;
   }
 
-  async removeProjectMemberById (projectMemberId: string): Promise<boolean> {
+  async removeProjectMemberById(projectMemberId: string): Promise<boolean> {
     const projectMemberRepository =
       this.dataSource.getRepository(ProjectMember);
 
@@ -293,7 +306,7 @@ export class Database {
     }
   }
 
-  async updateProjectMemberById (
+  async updateProjectMemberById(
     projectMemberId: string,
     data: DeepPartial<ProjectMember>
   ): Promise<boolean> {
@@ -307,7 +320,7 @@ export class Database {
     return Boolean(updateResult.affected);
   }
 
-  async addProjectMember (
+  async addProjectMember(
     data: DeepPartial<ProjectMember>
   ): Promise<ProjectMember> {
     const projectMemberRepository =
@@ -317,7 +330,7 @@ export class Database {
     return newProjectMember;
   }
 
-  async addEnvironmentVariables (
+  async addEnvironmentVariables(
     data: DeepPartial<EnvironmentVariable>[]
   ): Promise<EnvironmentVariable[]> {
     const environmentVariableRepository =
@@ -328,7 +341,7 @@ export class Database {
     return savedEnvironmentVariables;
   }
 
-  async updateEnvironmentVariable (
+  async updateEnvironmentVariable(
     environmentVariableId: string,
     data: DeepPartial<EnvironmentVariable>
   ): Promise<boolean> {
@@ -342,7 +355,7 @@ export class Database {
     return Boolean(updateResult.affected);
   }
 
-  async deleteEnvironmentVariable (
+  async deleteEnvironmentVariable(
     environmentVariableId: string
   ): Promise<boolean> {
     const environmentVariableRepository =
@@ -358,7 +371,7 @@ export class Database {
     }
   }
 
-  async getProjectMemberById (projectMemberId: string): Promise<ProjectMember> {
+  async getProjectMemberById(projectMemberId: string): Promise<ProjectMember> {
     const projectMemberRepository =
       this.dataSource.getRepository(ProjectMember);
 
@@ -381,7 +394,7 @@ export class Database {
     return projectMemberWithProject[0];
   }
 
-  async getProjectsBySearchText (
+  async getProjectsBySearchText(
     userId: string,
     searchText: string
   ): Promise<Project[]> {
@@ -403,14 +416,14 @@ export class Database {
     return projects;
   }
 
-  async updateDeploymentById (
+  async updateDeploymentById(
     deploymentId: string,
     data: DeepPartial<Deployment>
   ): Promise<boolean> {
     return this.updateDeployment({ id: deploymentId }, data);
   }
 
-  async updateDeployment (
+  async updateDeployment(
     criteria: FindOptionsWhere<Deployment>,
     data: DeepPartial<Deployment>
   ): Promise<boolean> {
@@ -420,7 +433,7 @@ export class Database {
     return Boolean(updateResult.affected);
   }
 
-  async updateDeploymentsByProjectIds (
+  async updateDeploymentsByProjectIds(
     projectIds: string[],
     data: DeepPartial<Deployment>
   ): Promise<boolean> {
@@ -436,7 +449,7 @@ export class Database {
     return Boolean(updateResult.affected);
   }
 
-  async deleteDeploymentById (deploymentId: string): Promise<boolean> {
+  async deleteDeploymentById(deploymentId: string): Promise<boolean> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
     const deployment = await deploymentRepository.findOneOrFail({
       where: {
@@ -449,7 +462,7 @@ export class Database {
     return Boolean(deleteResult);
   }
 
-  async addProject (user: User, organizationId: string, data: DeepPartial<Project>): Promise<Project> {
+  async addProject(user: User, organizationId: string, data: DeepPartial<Project>): Promise<Project> {
     const projectRepository = this.dataSource.getRepository(Project);
 
     // TODO: Check if organization exists
@@ -468,7 +481,7 @@ export class Database {
     return projectRepository.save(newProject);
   }
 
-  async updateProjectById (
+  async updateProjectById(
     projectId: string,
     data: DeepPartial<Project>
   ): Promise<boolean> {
@@ -481,7 +494,7 @@ export class Database {
     return Boolean(updateResult.affected);
   }
 
-  async deleteProjectById (projectId: string): Promise<boolean> {
+  async deleteProjectById(projectId: string): Promise<boolean> {
     const projectRepository = this.dataSource.getRepository(Project);
     const project = await projectRepository.findOneOrFail({
       where: {
@@ -497,7 +510,7 @@ export class Database {
     return Boolean(deleteResult);
   }
 
-  async deleteDomainById (domainId: string): Promise<boolean> {
+  async deleteDomainById(domainId: string): Promise<boolean> {
     const domainRepository = this.dataSource.getRepository(Domain);
 
     const deleteResult = await domainRepository.softDelete({ id: domainId });
@@ -509,21 +522,21 @@ export class Database {
     }
   }
 
-  async addDomain (data: DeepPartial<Domain>): Promise<Domain> {
+  async addDomain(data: DeepPartial<Domain>): Promise<Domain> {
     const domainRepository = this.dataSource.getRepository(Domain);
     const newDomain = await domainRepository.save(data);
 
     return newDomain;
   }
 
-  async getDomain (options: FindOneOptions<Domain>): Promise<Domain | null> {
+  async getDomain(options: FindOneOptions<Domain>): Promise<Domain | null> {
     const domainRepository = this.dataSource.getRepository(Domain);
     const domain = await domainRepository.findOne(options);
 
     return domain;
   }
 
-  async updateDomainById (
+  async updateDomainById(
     domainId: string,
     data: DeepPartial<Domain>
   ): Promise<boolean> {
@@ -533,7 +546,7 @@ export class Database {
     return Boolean(updateResult.affected);
   }
 
-  async getDomainsByProjectId (
+  async getDomainsByProjectId(
     projectId: string,
     filter?: FindOptionsWhere<Domain>
   ): Promise<Domain[]> {

packages/backend/src/registry.ts

@@ -416,14 +416,8 @@ export class Registry {
     };
   }
 
-  async getCompletedAuctionIds(auctionIds: (string | null | undefined)[]): Promise<string[] | null> {
-    const validAuctionIds = auctionIds.filter((id): id is string => id !== null && id !== undefined);
-
-    if (!validAuctionIds.length) {
-      return null;
-    }
-
-    const auctions = await this.registry.getAuctionsByIds(validAuctionIds);
+  async getCompletedAuctionIds(auctionIds: string[]): Promise<string[]> {
+    const auctions = await this.registry.getAuctionsByIds(auctionIds);
 
     const completedAuctions = auctions
       .filter((auction: { id:  string, status: string }) => auction.status === 'completed')

packages/backend/src/resolvers.ts

@@ -6,7 +6,7 @@ import { Permission } from './entity/ProjectMember';
 import { Domain } from './entity/Domain';
 import { Project } from './entity/Project';
 import { EnvironmentVariable } from './entity/EnvironmentVariable';
-import { AddProjectFromTemplateInput, AuctionParams } from './types';
+import { AddProjectFromTemplateInput, AuctionParams, EnvironmentVariables } from './types';
 
 const log = debug('snowball:resolver');
 
@@ -211,8 +211,15 @@ export const createResolvers = async (service: Service): Promise<any> => {
           organizationSlug,
           data,
           lrn,
-          auctionParams
-        }: { organizationSlug: string; data: AddProjectFromTemplateInput; lrn: string; auctionParams: AuctionParams },
+          auctionParams,
+          environmentVariables
+        }: {
+          organizationSlug: string;
+          data: AddProjectFromTemplateInput;
+          lrn: string;
+          auctionParams: AuctionParams,
+          environmentVariables: EnvironmentVariables[];
+        },
         context: any,
       ) => {
         try {
@@ -221,7 +228,8 @@ export const createResolvers = async (service: Service): Promise<any> => {
             organizationSlug,
             data,
             lrn,
-            auctionParams
+            auctionParams,
+            environmentVariables
           );
         } catch (err) {
           log(err);
@@ -235,12 +243,26 @@ export const createResolvers = async (service: Service): Promise<any> => {
           organizationSlug,
           data,
           lrn,
-          auctionParams
-        }: { organizationSlug: string; data: DeepPartial<Project>; lrn: string; auctionParams: AuctionParams },
+          auctionParams,
+          environmentVariables
+        }: {
+          organizationSlug: string;
+          data: DeepPartial<Project>;
+          lrn: string;
+          auctionParams: AuctionParams,
+          environmentVariables: EnvironmentVariables[];
+        },
         context: any,
       ) => {
         try {
-          return await service.addProject(context.user, organizationSlug, data, lrn, auctionParams);
+          return await service.addProject(
+            context.user,
+            organizationSlug,
+            data,
+            lrn,
+            auctionParams,
+            environmentVariables
+          );
         } catch (err) {
           log(err);
           throw err;

packages/backend/src/schema.gql

@@ -271,12 +271,14 @@ type Mutation {
     data: AddProjectFromTemplateInput
     lrn: String
     auctionParams: AuctionParams
+    environmentVariables: [AddEnvironmentVariableInput!]
   ): Project!
   addProject(
     organizationSlug: String!
     data: AddProjectInput!
     lrn: String
     auctionParams: AuctionParams
+    environmentVariables: [AddEnvironmentVariableInput!]
   ): Project!
   updateProject(projectId: String!, data: UpdateProjectInput): Boolean!
   redeployToProd(deploymentId: String!): Boolean!

packages/backend/src/service.ts

@@ -20,6 +20,7 @@ import {
   AppDeploymentRecord,
   AppDeploymentRemovalRecord,
   AuctionParams,
+  EnvironmentVariables,
   GitPushEventPayload,
 } from './types';
 import { Role } from './entity/UserOrganization';
@@ -167,7 +168,7 @@ export class Service {
   async updateDeploymentsWithRecordData(
     records: AppDeploymentRecord[],
   ): Promise<void> {
-    // get and update deployments to be updated using request id
+    // Fetch the deployments to be updated using deployment requestId
     const deployments = await this.db.getDeployments({
       where: records.map((record) => ({
         applicationDeploymentRequestId: record.attributes.request,
@@ -220,10 +221,10 @@ export class Service {
 
     await Promise.all(deploymentUpdatePromises);
 
-    // if iscurrent is true for this deployment then update the old ones
+    // Get deployments that are in production environment
     const prodDeployments = Object.values(recordToDeploymentsMap).filter(deployment => deployment.isCurrent);
 
-    // Get deployment IDs of deployments that are in production environment
+    // Set the isCurrent state to false for the old deployments
     for (const deployment of prodDeployments) {
       const projectDeployments = await this.db.getDeploymentsByProjectId(deployment.projectId);
       const oldDeployments = projectDeployments
@@ -236,15 +237,6 @@ export class Service {
       }
     }
 
-    // Get old deployments for ApplicationDeploymentRecords
-    // flter out deps with is current false
-
-    // loop over these deps
-    // get the project
-    // get all the deployemnts in that proj with the same deployer lrn (query filter not above updated dep)
-    // set is current to false
-
-
     await Promise.all(deploymentUpdatePromises);
   }
 
@@ -298,44 +290,30 @@ export class Service {
    * Calls the createDeploymentFromAuction method for deployments with completed auctions
    */
   async checkAuctionStatus(): Promise<void> {
-    const allProjects = await this.db.getProjects({
-      where: {
-        auctionId: Not(IsNull()),
-      },
-      relations: ['deployments'],
-      withDeleted: true,
-    });
+    const projects = await this.db.allProjectsWithoutDeployments();
 
-    // Should only check on the first deployment
-    const projects = allProjects.filter(project => {
-      if (project.deletedAt !== null) return false;
+    const validAuctionIds = projects.map((project) => project.auctionId!)
+      .filter((id): id is string => Boolean(id));
+    const completedAuctionIds = await this.laconicRegistry.getCompletedAuctionIds(validAuctionIds);
 
-      return project.deployments.length === 0;
-    });
+    const projectsToBedeployed = projects.filter((project) =>
+      completedAuctionIds.includes(project.auctionId!)
+    );
 
-    const auctionIds = projects.map((project) => project.auctionId);
-    const completedAuctionIds = await this.laconicRegistry.getCompletedAuctionIds(auctionIds);
+    for (const project of projectsToBedeployed) {
+      const deployerLrns = await this.laconicRegistry.getAuctionWinningDeployers(project!.auctionId!);
 
-    if (completedAuctionIds) {
-      const projectsToBedeployed = projects.filter((project) =>
-        completedAuctionIds.includes(project.auctionId!)
-      );
+      if (!deployerLrns) {
+        log(`No winning deployer for auction ${project!.auctionId}`);
+      } else {
+        // Update project with deployer LRNs
+        await this.db.updateProjectById(project.id!, {
+          deployerLrns
+        });
 
-      for (const project of projectsToBedeployed) {
-        const deployerLrns = await this.laconicRegistry.getAuctionWinningDeployers(project!.auctionId!);
-
-        if (!deployerLrns) {
-          log(`No winning deployer for auction ${project!.auctionId}`);
-        } else {
-          // Update project with deployer LRNs
-          await this.db.updateProjectById(project.id!, {
-            deployerLrns
-          });
-
-          for (const deployer of deployerLrns) {
-            log(`Creating deployment for deployer LRN ${deployer}`);
-            await this.createDeploymentFromAuction(project, deployer);
-          }
+        for (const deployer of deployerLrns) {
+          log(`Creating deployment for deployer LRN ${deployer}`);
+          await this.createDeploymentFromAuction(project, deployer);
         }
       }
     }
@@ -785,7 +763,8 @@ export class Service {
     organizationSlug: string,
     data: AddProjectFromTemplateInput,
     lrn?: string,
-    auctionParams?: AuctionParams
+    auctionParams?: AuctionParams,
+    environmentVariables?: EnvironmentVariables[],
   ): Promise<Project | undefined> {
     try {
       const octokit = await this.getOctokit(user.id);
@@ -816,7 +795,7 @@ export class Service {
         repository: gitRepo.data.full_name,
         // TODO: Set selected template
         template: 'webapp',
-      }, lrn, auctionParams);
+      }, lrn, auctionParams, environmentVariables);
 
       if (!project || !project.id) {
         throw new Error('Failed to create project from template');
@@ -834,7 +813,8 @@ export class Service {
     organizationSlug: string,
     data: DeepPartial<Project>,
     lrn?: string,
-    auctionParams?: AuctionParams
+    auctionParams?: AuctionParams,
+    environmentVariables?: EnvironmentVariables[],
   ): Promise<Project | undefined> {
     const organization = await this.db.getOrganization({
       where: {
@@ -846,7 +826,10 @@ export class Service {
     }
 
     const project = await this.db.addProject(user, organization.id, data);
-    log(`Project created ${project.id}`);
+
+    if (environmentVariables) {
+      await this.addEnvironmentVariables(project.id, environmentVariables);
+    }
 
     const octokit = await this.getOctokit(user.id);
     const [owner, repo] = project.repository.split('/');

packages/backend/src/types.ts

@@ -76,3 +76,9 @@ export interface AuctionParams {
   maxPrice: string,
   numProviders: number,
 }
+
+export interface EnvironmentVariables {
+  environments: string[],
+  key: string,
+  value: string,
+}