fix gitcoin adapter to resubmit passport score

Giveth · Jun 29, 2023 · fcdc0ec · fcdc0ec
1 parent 6ca67f9
commit fcdc0ec
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 39 deletions.
diff --git a/src/adapters/gitcoin/gitcoinAdapter.ts b/src/adapters/gitcoin/gitcoinAdapter.ts
@@ -96,7 +96,8 @@ export class GitcoinAdapter implements GitcoinAdapterInterface {
       const result = await axios.post(
         `${GITCOIN_API_BASE_URL}/registry/submit-passport`,
         {
-          variables: params,
+          address: params.address.toLowerCase(),
+          scorer_id: this.ScorerID,
         },
         {
           headers: {

diff --git a/src/adapters/gitcoin/gitcoinAdapterInterface.ts b/src/adapters/gitcoin/gitcoinAdapterInterface.ts
@@ -5,9 +5,6 @@ export interface SigningMessageAndNonceResponse {
 
 export interface SubmitPassportInput {
   address: string;
-  scorer: string;
-  signature: string;
-  nonce: string;
 }
 
 export interface SubmittedPassportResponse {

diff --git a/src/adapters/gitcoin/gitcoinMockAdapter.ts b/src/adapters/gitcoin/gitcoinMockAdapter.ts
@@ -63,7 +63,7 @@ export class GitcoinMockAdapter implements GitcoinAdapterInterface {
     }
     return Promise.resolve({
       address: 'string',
-      score: 'string',
+      score: '10',
       status: 'string',
       last_score_timestamp: 'string',
       evidence: undefined,

diff --git a/src/resolvers/userResolver.test.ts b/src/resolvers/userResolver.test.ts
@@ -45,9 +45,6 @@ function refreshUserScoresTestCases() {
     const user = await User.create(userData).save();
     await getGitcoinAdapter().submitPassport({
       address: userData.walletAddress,
-      scorer: '200',
-      signature: 'any',
-      nonce: 'any',
     });
     const result = await axios.post(graphqlUrl, {
       query: refreshUserScores,
@@ -74,9 +71,6 @@ function refreshUserScoresTestCases() {
     const user = await User.create(userData).save();
     await getGitcoinAdapter().submitPassport({
       address: userData.walletAddress,
-      scorer: '200',
-      signature: 'any',
-      nonce: 'any',
     });
     const result = await axios.post(graphqlUrl, {
       query: refreshUserScores,
@@ -102,30 +96,6 @@ function refreshUserScoresTestCases() {
       updatedUser.passportScore,
     );
   });
-  it('should not refresh user scores if not registered to gitcoin', async () => {
-    const userData = {
-      firstName: 'firstName',
-      lastName: 'lastName',
-      email: '[email protected]',
-      avatar: 'pinata address',
-      url: 'website url',
-      loginType: 'wallet',
-      walletAddress: generateRandomEtheriumAddress(),
-    };
-    const user = await User.create(userData).save();
-    const result = await axios.post(graphqlUrl, {
-      query: refreshUserScores,
-      variables: {
-        address: userData.walletAddress,
-      },
-    });
-
-    const updatedUser = result.data.data.refreshUserScores;
-    assert.equal(updatedUser.walletAddress, user.walletAddress);
-    // if score remains null the user has not registered
-    assert.equal(updatedUser.passportScore, 0);
-    assert.equal(updatedUser.passportStamps, 0);
-  });
 }
 
 function userByAddressTestCases() {

diff --git a/src/resolvers/userResolver.ts b/src/resolvers/userResolver.ts
@@ -61,16 +61,16 @@ export class UserResolver {
     if (!foundUser) return;
 
     try {
-      const passportScore = await getGitcoinAdapter().getWalletAddressScore(
+      const passportScore = await getGitcoinAdapter().submitPassport({
         address,
-      );
+      });
       const passportStamps = await getGitcoinAdapter().getPassportStamps(
         address,
       );
 
-      if (passportScore) {
+      if (passportScore && passportScore?.score) {
         const score = Number(passportScore.score);
-        foundUser.passportScore = isNaN(score) ? 0 : score;
+        foundUser.passportScore = score;
       }
       if (passportStamps)
         foundUser.passportStamps = passportStamps.items.length;