Merge pull request #19 from lxdao-official/develop

Develop
lxdao-official · Nov 4, 2024 · 7128c5c · 7128c5c
2 parents 218c929 + 7b562e9
commit 7128c5c
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 4 deletions.
diff --git a/src/controller/contribution.controller.ts b/src/controller/contribution.controller.ts
@@ -77,4 +77,10 @@ export class ContributionController {
     const data = await this.contributionService.syncUnClaimed(chainId);
     return CoreApiResponse.success(data);
   }
+
+  @Get('allUnClaimedList')
+  async allUnClaimedList(@Query() query: ContributionListQuery) {
+    const data = await this.contributionService.getAllUnClaimedList(query);
+    return CoreApiResponse.success(data);
+  }
 }
diff --git a/src/core/service/contribution.service.ts b/src/core/service/contribution.service.ts
@@ -31,6 +31,9 @@ export class ContributionService {
     const where = {
       deleted: false,
       projectId,
+      status: {
+        in: [Status.READY, Status.CLAIM],
+      },
     };
     if (endDateTo && endDateFrom) {
       where['endDate'] = {
@@ -360,8 +363,17 @@ export class ContributionService {
   }
 
   async syncUnClaimed(chainId: number) {
-    const ids = await this.easService.getEASList(chainId);
-    const data = await this.prisma.contribution.findMany({
+    let data = await this.prisma.contribution.findMany({
+      where: {
+        status: Status.READY,
+      },
+    });
+    const unClaimedIds = data.map((item) => item.uId);
+    const id_in = unClaimedIds.reduce((pre, cur) => {
+      return pre + `${pre ? '\n' : ''}` + `"${cur}"`;
+    }, '');
+    const ids = await this.easService.getEASList(chainId, id_in);
+    data = await this.prisma.contribution.findMany({
       where: {
         id: {
           in: ids,
@@ -385,4 +397,22 @@ export class ContributionService {
     }
     return unClaimed;
   }
+
+  async getAllUnClaimedList(query: ContributionListQuery) {
+    const { projectId, endDateFrom, endDateTo } = query;
+    const where = {
+      deleted: false,
+      projectId,
+      status: Status.READY,
+    };
+    if (endDateTo && endDateFrom) {
+      where['endDate'] = {
+        gte: new Date(endDateFrom),
+        lte: new Date(endDateTo),
+      };
+    }
+    return this.prisma.contribution.findMany({
+      where,
+    });
+  }
 }
diff --git a/src/core/service/eas.service.ts b/src/core/service/eas.service.ts
@@ -51,9 +51,10 @@ export class EasService {
     return signerWallet.signMessage(ethers.getBytes(hash));
   }
 
-  async getEASList(chainId?: number) {
+  async getEASList(chainId?: number, uIds?: string) {
     const easMap = chainId === 10 ? MainEasSchemaMap : SepoliaEasSchemaMap;
-    const query = `
+    const query = uIds
+      ? `
 		query Attestations {
 		  attestations(
 		  take: 100,
@@ -75,6 +76,32 @@ export class EasService {
 			revoked
 		  }
 		}
+	`
+      : `
+		query Attestations {
+		  attestations(
+			where: {
+			  id: {
+				in: [
+				  ${uIds}
+				]
+			  },
+			  schemaId: {
+				equals: "${easMap.claim}"
+			  }
+			}
+		  ) {
+			id
+			refUID
+			ipfsHash
+			recipient
+			decodedDataJson
+			data
+			attester
+			revocable
+			revoked
+		  }
+		}
 	`;
     const { data } = await axios.post<{
       data: { attestations: EasAttestation<EasSchemaVoteKey>[] };