Merge pull request #65 from Giveth/revoked-url-change

Removed revoked attestations + change slug to url
Giveth · Jun 6, 2024 · d739559 · d739559
2 parents 058a791 + 325b2d0
commit d739559
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 77 deletions.
diff --git a/db/migrations/1716207083370-Data.js b/db/migrations/1716207083370-Data.js
diff --git a/db/migrations/1717657836767-Data.js b/db/migrations/1717657836767-Data.js
diff --git a/db/migrations/1717658264897-Data.js b/db/migrations/1717658264897-Data.js
diff --git a/db/migrations/1715693415593-Data.js → db/migrations/1717662179474-Data.js b/db/migrations/1715693415593-Data.js → db/migrations/1717662179474-Data.js
diff --git a/schema.graphql b/schema.graphql
@@ -4,7 +4,6 @@ type ProjectAttestation @entity {
   recipient: String!
   vouch: Boolean!
   txHash: String!
-  revoked: Boolean!
   attestorOrganisation: AttestorOrganisation!
   project: Project!
   attestTimestamp: DateTime!
@@ -18,7 +17,6 @@ type AttestorOrganisation @entity {
   organisation: Organisation!
   "Timestamp at which the relationship was created"
   attestTimestamp: DateTime!
-  revoked: Boolean!
 }
 
 type Attestor @entity {
@@ -60,7 +58,7 @@ type Project @entity {
   "Total attests"
   totalAttests: Int!
   "Slug of the project"
-  slug: String
+  url: String
   "Image of the project"
   image: String
   "project data is imported from a source or not"

diff --git a/src/controllers/authorizeAttestation.ts b/src/controllers/authorizeAttestation.ts
@@ -39,7 +39,6 @@ export const handleAuthorize = async (
     id: key,
     attestor,
     organisation,
-    revoked: false,
     attestTimestamp: new Date(log.block.timestamp),
   });
 
@@ -66,7 +65,6 @@ export const handleAuthorizeRevoke = async (
     return;
   }
 
-  attestation.revoked = true;
-  await ctx.store.upsert(attestation);
+  await ctx.store.remove(attestation);
   ctx.log.debug(`Revoked authorize attestation ${attestation}`);
 };
diff --git a/src/controllers/projectVerificationAttestation.ts b/src/controllers/projectVerificationAttestation.ts
@@ -47,13 +47,6 @@ export const handleProjectAttestation = async (
     return;
   }
 
-  if (attestorOrganisation.revoked) {
-    ctx.log.debug(
-      `Attestor ${issuer} authorization attestation ${refUID} is revoked from organisation ${attestorOrganisation.organisation.name}`
-    );
-    return;
-  }
-
   const { success, data: projectVerificationAttestation } =
     parseAttestationData(decodedData);
 
@@ -93,7 +86,6 @@ export const handleProjectAttestation = async (
     attestorOrganisation,
     comment,
     attestTimestamp: new Date(log.block.timestamp),
-    revoked: false,
     recipient,
   });
 
@@ -124,8 +116,7 @@ export const handleProjectAttestationRevoke = async (
     return;
   }
 
-  attestation.revoked = true;
-  await ctx.store.upsert(attestation);
+  await ctx.store.remove(attestation);
   ctx.log.debug(`Revoked project attestation ${JSON.stringify(attestation)}`);
 
   await updateProjectAttestationCounts(ctx, attestation.project);

diff --git a/src/features/import-projects/gitcoin/helpers.ts b/src/features/import-projects/gitcoin/helpers.ts
@@ -30,7 +30,7 @@ export const processProjectsBatch = async (
       id: project.id,
       title: project.name || project.metadata?.title,
       description: project.metadata?.description,
-      slug: generateGitcoinSlug(project),
+      url: generateGitcoinSlug(project),
       image: project.metadata?.bannerImg
         ? convertIpfsHashToHttps(project.metadata?.bannerImg)
         : "",

diff --git a/src/features/import-projects/helpers.ts b/src/features/import-projects/helpers.ts
@@ -36,7 +36,7 @@ export const updateOrCreateProject = async (
     const isUpdated =
       existingProject.title !== project[titleField] ||
       existingProject.description !== project[descriptionField] ||
-      existingProject.slug !== project[slugField] ||
+      existingProject.url !== project[slugField] ||
       existingProject.image !== project[imageField];
 
     if (isUpdated) {
@@ -45,7 +45,7 @@ export const updateOrCreateProject = async (
         title: project[titleField],
         description: project[descriptionField],
         image: project[imageField],
-        slug: project[slugField],
+        url: project[slugField],
         lastUpdatedTimestamp: new Date(),
         imported: true,
       });
@@ -67,7 +67,7 @@ export const updateOrCreateProject = async (
       title: project[titleField],
       description: project[descriptionField],
       image: project[imageField],
-      slug: project[slugField],
+      url: project[slugField],
       projectId: projectId,
       source: source,
       totalVouches: 0,

diff --git a/src/model/generated/attestorOrganisation.model.ts b/src/model/generated/attestorOrganisation.model.ts
@@ -27,7 +27,4 @@ export class AttestorOrganisation {
      */
     @Column_("timestamp with time zone", {nullable: false})
     attestTimestamp!: Date
-
-    @Column_("bool", {nullable: false})
-    revoked!: boolean
 }
diff --git a/src/model/generated/project.model.ts b/src/model/generated/project.model.ts
@@ -62,7 +62,7 @@ export class Project {
      * Slug of the project
      */
     @Column_("text", {nullable: true})
-    slug!: string | undefined | null
+    url!: string | undefined | null
 
     /**
      * Image of the project

diff --git a/src/model/generated/projectAttestation.model.ts b/src/model/generated/projectAttestation.model.ts
@@ -23,9 +23,6 @@ export class ProjectAttestation {
     @Column_("text", {nullable: false})
     txHash!: string
 
-    @Column_("bool", {nullable: false})
-    revoked!: boolean
-
     @Index_()
     @ManyToOne_(() => AttestorOrganisation, {nullable: true})
     attestorOrganisation!: AttestorOrganisation