Merge pull request #21 from iExecBlockchainComputing/feature/update-chatid-to-telegram_chatId

Feature/update chatid to telegram chat

Author: abbesBenayache

src/utils/subgraphQuery.ts

@@ -41,7 +41,7 @@ export const getValidContact = async (
 
     do {
       const variables = {
-        requiredSchema: ['chatId:string'],
+        requiredSchema: ['telegram_chatId:string'],
         id: contactsAddresses,
         start,
         range,
@@ -88,7 +88,7 @@ export const checkProtectedDataValidity = async (
 ): Promise<boolean> => {
   try {
     const variables = {
-      requiredSchema: ['chatId:string'],
+      requiredSchema: ['telegram_chatId:string'],
       id: [protectedData],
       start: 0,
       range: 1,

src/web3telegram/sendTelegram.ts

@@ -104,7 +104,7 @@ export const sendTelegram = async ({
     );
     if (!isValidProtectedData) {
       throw new Error(
-        'This protected data does not contain "chatId:string" in its schema.'
+        'This protected data does not contain "telegram_chatId:string" in its schema.'
       );
     }
     const requesterAddress = await iexec.wallet.getAddress();

tests/e2e/fetchMyContacts.test.ts

@@ -26,7 +26,7 @@ describe('web3telegram.fetchMyContacts()', () => {
     dataProtector = new IExecDataProtector(...getTestConfig(wallet.privateKey));
     web3telegram = new IExecWeb3telegram(...getTestConfig(wallet.privateKey));
     protectedData = await dataProtector.core.protectData({
-      data: { chatId: '1461320872' },
+      data: { telegram_chatId: '12345' },
       name: 'test do not use',
     });
     await waitSubgraphIndexing();

tests/e2e/fetchUserContacts.test.ts

@@ -29,11 +29,11 @@ describe('web3telegram.fetchMyContacts()', () => {
 
     //create valid protected data
     protectedData1 = await dataProtector.protectData({
-      data: { chatId: '1234' },
+      data: { telegram_chatId: '1234' },
       name: 'test do not use',
     });
     protectedData2 = await dataProtector.protectData({
-      data: { chatId: '5678' },
+      data: { telegram_chatId: '5678' },
       name: 'test do not use',
     });
     await waitSubgraphIndexing();

tests/e2e/sendTelegram.test.ts

@@ -82,7 +82,7 @@ describe('web3telegram.sendTelegram()', () => {
       ...getTestConfig(providerWallet.privateKey)
     );
     validProtectedData = await dataProtector.protectData({
-      data: { chatId: '[email protected]' },
+      data: { telegram_chatId: '12345' },
       name: 'test do not use',
     });
     //create invalid protected data
@@ -201,7 +201,7 @@ describe('web3telegram.sendTelegram()', () => {
       expect(error?.message).toBe('Failed to sendTelegram');
       expect(error?.cause).toBeInstanceOf(Error);
       expect((error?.cause as Error).message).toBe(
-        'This protected data does not contain "chatId:string" in its schema.'
+        'This protected data does not contain "telegram_chatId:string" in its schema.'
       );
     },
     MAX_EXPECTED_WEB2_SERVICES_TIME
@@ -212,7 +212,7 @@ describe('web3telegram.sendTelegram()', () => {
     async () => {
       //create valid protected data with blank order to not have: datasetorder is fully consumed error from iexec sdk
       const protectedData = await dataProtector.protectData({
-        data: { chatId: '12345' },
+        data: { telegram_chatId: '12345' },
         name: 'test do not use',
       });
       await waitSubgraphIndexing();
@@ -290,7 +290,7 @@ describe('web3telegram.sendTelegram()', () => {
     async () => {
       //create valid protected data
       const protectedDataForWhitelist = await dataProtector.protectData({
-        data: { chatId: '[email protected]' },
+        data: { telegram_chatId: '12345' },
         name: 'test do not use',
       });
       await waitSubgraphIndexing();

tests/unit/utils/subgraphQuery.test.ts

@@ -64,7 +64,7 @@ describe('getValidContact', () => {
     expect(graphQLClient.request).toHaveBeenCalledWith(
       expect.anything(),
       expect.objectContaining({
-        requiredSchema: ['chatId:string'],
+        requiredSchema: ['telegram_chatId:string'],
         id: ['address1', 'address2', 'address3'],
         start: expect.any(Number),
         range: 1000,