Merge branch 'main' into develop

desci-labs · Jul 8, 2024 · 4aaf98e · 4aaf98e
2 parents bd03fcd + 4b73e66
commit 4aaf98e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/desci-server/src/controllers/attestations/claims.ts b/desci-server/src/controllers/attestations/claims.ts
@@ -135,7 +135,7 @@ export const claimEntryRequirements = async (req: Request, res: Response, _next:
   logger.info({ communityId, body: req.body }, 'claimEntryRequirements');
   const uuid = ensureUuidEndsWithDot(nodeUuid);
 
-  const entryAttestations = await attestationService.getCommunityEntryAttestations(communityId);
+  const entryAttestations = await attestationService.getAllCommunityEntryAttestations(communityId);
   logger.info({ entryAttestations });
 
   const claimables = (await asyncMap(entryAttestations, async (attestation) => {

diff --git a/desci-server/src/services/Attestation.ts b/desci-server/src/services/Attestation.ts
@@ -297,6 +297,12 @@ export class AttestationService {
     return prisma.communityEntryAttestation.findMany({ where: { desciCommunityId: communityId, required: true } });
   }
 
+  async getAllCommunityEntryAttestations(communityId: number) {
+    const community = await communityService.findCommunityById(communityId);
+    if (!community) throw new CommunityNotFoundError();
+    return prisma.communityEntryAttestation.findMany({ where: { desciCommunityId: communityId } });
+  }
+
   async claimAttestation({
     attestationId,
     attestationVersion,

diff --git a/desci-server/src/workers/publish.ts b/desci-server/src/workers/publish.ts
@@ -46,6 +46,7 @@ async function processPublishQueue() {
 
   try {
     const txStatus = await checkTransaction(task.transactionId, task.uuid);
+    logger.info({ txStatus }, 'publish::processPublishQueue txStatus');
     if (txStatus === 1) {
       publishHandler(task)
         .then(async (published) => {
@@ -80,7 +81,7 @@ async function processPublishQueue() {
     }
     return ProcessOutcome.TaskCompleted;
   } catch (err) {
-    logger.error({ err }, 'ProcessPublishQueue::ERROR');
+    logger.error({ err }, 'publish::processPublishQueue ProcessPublishQueue::ERROR');
     return ProcessOutcome.Error;
   } finally {
     lockService.freeLock(task.transactionId);