From dc98719b85ca6bf816b7a8315c9e0f71aef6eb69 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Wed, 20 Sep 2023 09:24:46 +0800
Subject: [PATCH] reduce log

---
 .../src/resolvers/recommendations/index.ts    | 72 +++----------------
 .../migrate_from_elastic.py                   |  2 +-
 2 files changed, 9 insertions(+), 65 deletions(-)

diff --git a/packages/api/src/resolvers/recommendations/index.ts b/packages/api/src/resolvers/recommendations/index.ts
index 0a972d318..95f8585f2 100644
--- a/packages/api/src/resolvers/recommendations/index.ts
+++ b/packages/api/src/resolvers/recommendations/index.ts
@@ -205,21 +205,9 @@ export const joinGroupResolver = authorized<
   JoinGroupSuccess,
   JoinGroupError,
   MutationJoinGroupArgs
->(async (_, { inviteCode }, { claims: { uid }, log }) => {
-  log.info('Joining group', {
-    inviteCode,
-    labels: {
-      source: 'resolver',
-      resolver: 'joinGroupResolver',
-      uid,
-    },
-  })
-
+>(async (_, { inviteCode }, { uid, log }) => {
   try {
-    const user = await userRepository.findOne({
-      where: { id: uid },
-      relations: ['profile'],
-    })
+    const user = await userRepository.findById(uid)
     if (!user) {
       return {
         errorCodes: [JoinGroupErrorCode.Unauthorized],
@@ -243,14 +231,7 @@ export const joinGroupResolver = authorized<
       group,
     }
   } catch (error) {
-    log.error('Error joining group', {
-      error,
-      labels: {
-        source: 'resolver',
-        resolver: 'joinGroupResolver',
-        uid,
-      },
-    })
+    log.error('Error joining group', error)
 
     return {
       errorCodes: [JoinGroupErrorCode.BadRequest],
@@ -263,20 +244,8 @@ export const recommendHighlightsResolver = authorized<
   RecommendHighlightsError,
   MutationRecommendHighlightsArgs
 >(async (_, { input }, { uid, log, signToken }) => {
-  log.info('Recommend highlights', {
-    input,
-    labels: {
-      source: 'resolver',
-      resolver: 'recommendHighlightsResolver',
-      uid,
-    },
-  })
-
   try {
-    const user = await userRepository.findOne({
-      where: { id: uid },
-      relations: ['profile'],
-    })
+    const user = await userRepository.findById(uid)
     if (!user) {
       return {
         errorCodes: [RecommendHighlightsErrorCode.Unauthorized],
@@ -330,14 +299,7 @@ export const recommendHighlightsResolver = authorized<
       success: true,
     }
   } catch (error) {
-    log.error('Error recommending highlights', {
-      error,
-      labels: {
-        source: 'resolver',
-        resolver: 'recommendHighlightsResolver',
-        uid,
-      },
-    })
+    log.error('Error recommending highlights', error)
 
     return {
       errorCodes: [RecommendHighlightsErrorCode.BadRequest],
@@ -349,20 +311,9 @@ export const leaveGroupResolver = authorized<
   LeaveGroupSuccess,
   LeaveGroupError,
   MutationLeaveGroupArgs
->(async (_, { groupId }, { claims: { uid }, log }) => {
-  log.info('Leaving group', {
-    groupId,
-    labels: {
-      source: 'resolver',
-      resolver: 'leaveGroupResolver',
-      uid,
-    },
-  })
-
+>(async (_, { groupId }, { uid, log }) => {
   try {
-    const user = await userRepository.findOneBy({
-      id: uid,
-    })
+    const user = await userRepository.findById(uid)
     if (!user) {
       return {
         errorCodes: [LeaveGroupErrorCode.Unauthorized],
@@ -383,14 +334,7 @@ export const leaveGroupResolver = authorized<
       success,
     }
   } catch (error) {
-    log.error('Error leaving group', {
-      error,
-      labels: {
-        source: 'resolver',
-        resolver: 'leaveGroupResolver',
-        uid,
-      },
-    })
+    log.error('Error leaving group', error)
 
     return {
       errorCodes: [LeaveGroupErrorCode.BadRequest],
diff --git a/packages/db/elastic_migrations/migrate_from_elastic.py b/packages/db/elastic_migrations/migrate_from_elastic.py
index 02807a617..0546fdf4f 100755
--- a/packages/db/elastic_migrations/migrate_from_elastic.py
+++ b/packages/db/elastic_migrations/migrate_from_elastic.py
@@ -11,7 +11,7 @@ from elasticsearch.helpers import async_scan
 
 PG_HOST = os.getenv('PG_HOST', 'localhost')
 PG_PORT = os.getenv('PG_PORT', 5432)
-PG_USER = os.getenv('PG_USER', 'hongbo')
+PG_USER = os.getenv('PG_USER', 'app_user')
 PG_PASSWORD = os.getenv('PG_PASSWORD', 'app_pass')
 PG_DB = os.getenv('PG_DB', 'omnivore')
 ES_URL = os.getenv('ES_URL', 'http://localhost:9200')