From 61967fdde5e8b9c9245152a91b45d3a4fd637cd9 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Wed, 26 Jul 2023 18:07:25 +0800 Subject: [PATCH] fix test --- packages/api/src/services/integrations/readwise.ts | 11 ++++------- packages/api/src/utils/parser.ts | 2 +- .../api/test/services/save_newsletter_email.test.ts | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/packages/api/src/services/integrations/readwise.ts b/packages/api/src/services/integrations/readwise.ts index f07527154..a3bfe40ff 100644 --- a/packages/api/src/services/integrations/readwise.ts +++ b/packages/api/src/services/integrations/readwise.ts @@ -4,12 +4,9 @@ import { Integration } from '../../entity/integration' import { getRepository } from '../../entity/utils' import { env } from '../../env' import { wait } from '../../utils/helpers' -import { buildLogger } from '../../utils/logger' import { getHighlightUrl } from '../highlights' import { IntegrationService } from './integration' -const logger = buildLogger('app.dispatch') - interface ReadwiseHighlight { // The highlight text, (technically the only field required in a highlight object) text: string @@ -51,7 +48,7 @@ export class ReadwiseIntegration extends IntegrationService { }) return response.status === 204 ? token : null } catch (error) { - logger.error('error validating readwise token', error) + console.error('error validating readwise token', error) return null } } @@ -69,7 +66,7 @@ export class ReadwiseIntegration extends IntegrationService { // update integration syncedAt if successful if (result) { - logger.info('updating integration syncedAt') + console.info('updating integration syncedAt') await getRepository(Integration).update(integration.id, { syncedAt: new Date(), }) @@ -132,14 +129,14 @@ export class ReadwiseIntegration extends IntegrationService { error.response?.status === 429 && retryCount < 3 ) { - logger.info('Readwise API rate limit exceeded, retrying...') + console.info('Readwise API rate limit exceeded, retrying...') // wait for Retry-After seconds in the header if rate limited // max retry count is 3 const retryAfter = error.response?.headers['retry-after'] || '10' // default to 10 seconds await wait(parseInt(retryAfter, 10) * 1000) return this.syncWithReadwise(token, highlights, retryCount + 1) } - logger.error('Error creating highlights in Readwise', error) + console.error('Error creating highlights in Readwise', error) return false } } diff --git a/packages/api/src/utils/parser.ts b/packages/api/src/utils/parser.ts index ed6c77b58..841e82085 100644 --- a/packages/api/src/utils/parser.ts +++ b/packages/api/src/utils/parser.ts @@ -500,7 +500,7 @@ export const fetchFavicon = async ( const domain = new URL(realUrl).hostname return `https://api.faviconkit.com/${domain}/128` } catch (e) { - logger.info('Error fetching favicon', e) + console.log('Error fetching favicon', e) return undefined } } diff --git a/packages/api/test/services/save_newsletter_email.test.ts b/packages/api/test/services/save_newsletter_email.test.ts index af7a0f217..1e369d289 100644 --- a/packages/api/test/services/save_newsletter_email.test.ts +++ b/packages/api/test/services/save_newsletter_email.test.ts @@ -109,8 +109,8 @@ describe('saveNewsletterEmail', () => { }) it('does not create a subscription if no unsubscribe header', async () => { - const url = 'https://blog.omnivore.app/no-unsubscribe' - nock('https://blog.omnivore.app').get('/no-unsubscribe').reply(404) + const url = 'https://omnivore.app/no_url?q=no-unsubscribe' + nock('https://omnivore.app').get('/no_url?q=no-unsubscribe').reply(404) await saveNewsletterEmail( {