refactor(projects): expose isVisible flag in project queries

Implements: #38
drips-network · Nov 6, 2024 · 47cd433 · 47cd433
1 parent 6ecfae0
commit 47cd433
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/src/dataLoaders/sqlQueries/projectsQueries.ts b/src/dataLoaders/sqlQueries/projectsQueries.ts
@@ -13,7 +13,7 @@ async function getProjectByUrl(
   url: string,
 ): Promise<ProjectDataValues[]> {
   const baseSQL = (schema: DbSchema) => `
-    SELECT "id", "isValid", "name", "verificationStatus"::TEXT, "claimedAt", "forge"::TEXT, "ownerAddress", "ownerAccountId", "url", "emoji", "avatarCid", "color", "description", "createdAt", "updatedAt", '${schema}' AS chain
+    SELECT "id", "isValid", "isVisible", "name", "verificationStatus"::TEXT, "claimedAt", "forge"::TEXT, "ownerAddress", "ownerAccountId", "url", "emoji", "avatarCid", "color", "description", "createdAt", "updatedAt", '${schema}' AS chain
     FROM "${schema}"."GitProjects"
   `;
 
@@ -43,7 +43,7 @@ async function getProjectsByFilter(
 ): Promise<ProjectDataValues[]> {
   const baseSQL = (schema: DbSchema) =>
     `SELECT 
-      "id", "isValid", "name", "verificationStatus"::TEXT, "claimedAt", "forge"::TEXT, "ownerAddress", "ownerAccountId", "url", "emoji", "avatarCid", "color", "description", "createdAt", "updatedAt", '${schema}' AS chain 
+      "id", "isValid", "isVisible", "name", "verificationStatus"::TEXT, "claimedAt", "forge"::TEXT, "ownerAddress", "ownerAccountId", "url", "emoji", "avatarCid", "color", "description", "createdAt", "updatedAt", '${schema}' AS chain 
      FROM "${schema}"."GitProjects" `;
 
   const conditions: string[] = ['"isValid" = true'];
@@ -91,7 +91,7 @@ async function getProjectsByIds(
   projectIds: ProjectId[],
 ): Promise<ProjectDataValues[]> {
   const baseSQL = (schema: DbSchema) => `
-  SELECT "id", "isValid", "name", "verificationStatus"::TEXT, "claimedAt", "forge"::TEXT, "ownerAddress", "ownerAccountId", "url", "emoji", "avatarCid", "color", "description", "createdAt", "updatedAt", '${schema}' AS chain
+  SELECT "id", "isValid", "isVisible", "name", "verificationStatus"::TEXT, "claimedAt", "forge"::TEXT, "ownerAddress", "ownerAccountId", "url", "emoji", "avatarCid", "color", "description", "createdAt", "updatedAt", '${schema}' AS chain
   FROM "${schema}"."GitProjects"
 `;
 

diff --git a/src/project/ProjectModel.ts b/src/project/ProjectModel.ts
@@ -41,6 +41,7 @@ export default class ProjectModel extends Model<
   public declare color: string | null;
   public declare description: string | null;
   public declare verificationStatus: ProjectVerificationStatus;
+  public declare isVisible: boolean;
 
   public declare claimedAt: Date | null;
 
@@ -99,6 +100,10 @@ export default class ProjectModel extends Model<
           type: DataTypes.TEXT,
           allowNull: true,
         },
+        isVisible: {
+          type: DataTypes.BOOLEAN,
+          allowNull: false,
+        },
       },
       {
         sequelize,

diff --git a/src/project/projectResolvers.ts b/src/project/projectResolvers.ts
@@ -136,6 +136,7 @@ const projectResolvers = {
     source: (project: ResolverProject): Source => project.source,
     account: (project: ResolverProject): RepoDriverAccount => project.account,
     chainData: (project: ResolverProject): ProjectData[] => project.chainData,
+    isVisible: (project: ResolverProject): boolean => project.isVisible,
   },
   ProjectData: {
     __resolveType(parent: ProjectData) {

diff --git a/src/project/projectTypeDef.ts b/src/project/projectTypeDef.ts
@@ -29,6 +29,7 @@ const projectTypeDef = gql`
     source: Source!
     account: RepoDriverAccount!
     chainData: [ProjectData!]!
+    isVisible: Boolean!
   }
 
   union ProjectData = ClaimedProjectData | UnClaimedProjectData

diff --git a/src/project/projectUtils.ts b/src/project/projectUtils.ts
@@ -12,8 +12,8 @@ import { ProjectVerificationStatus } from './ProjectModel';
 import assert from '../utils/assert';
 import appSettings from '../common/appSettings';
 import { getCrossChainRepoDriverAccountIdByAddress } from '../common/dripsContracts';
-import { Driver } from '../generated/graphql';
 import type { Forge as GraphQlForge, Splits } from '../generated/graphql';
+import { Driver } from '../generated/graphql';
 import { singleOrDefault } from '../utils/linq';
 import { dbSchemaToChain } from '../utils/chainSchemaMappings';
 
@@ -97,6 +97,7 @@ export async function toProjectRepresentationFromUrl(
     url,
     verificationStatus: ProjectVerificationStatus.Unclaimed,
     isValid: true,
+    isVisible: true,
   } as ProjectDataValues;
 }
 
@@ -253,6 +254,7 @@ export async function toResolverProjects(
             .ownerName,
           forge: (project.forge as GraphQlForge) || shouldNeverHappen(),
         },
+        isVisible: project.isVisible,
         chainData,
       } as ResolverProject;
     }),
@@ -304,7 +306,7 @@ export async function mergeProjects(
     }),
   );
 
-  const mergedProject = {
+  return {
     account: {
       accountId: projectBase.id,
       driver: Driver.REPO,
@@ -317,8 +319,7 @@ export async function mergeProjects(
         .ownerName,
       forge: (projectBase.forge as GraphQlForge) || shouldNeverHappen(),
     },
+    isVisible: projectBase.isVisible,
     chainData,
   } as ResolverProject;
-
-  return mergedProject;
 }