Merge pull request #1708 from serlo/minor-changes

Update bucket for anonymous data and minor changes
serlo · Aug 5, 2024 · 3c5384d · 3c5384d
2 parents 4742dae + 599bd95
commit 3c5384d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/docker-compose.kratos.yml b/docker-compose.kratos.yml
@@ -14,7 +14,6 @@ services:
     ports:
       - '4433:4433' # public
       - '4434:4434' # admin
-    restart: unless-stopped
     environment:
       - LOG_LEVEL=trace
     command: serve -c /etc/config/kratos/config.yml --dev --watch-courier

diff --git a/packages/server/src/schema/uuid/user/resolvers.ts b/packages/server/src/schema/uuid/user/resolvers.ts
@@ -212,7 +212,12 @@ export const resolvers: Resolvers = {
 
       return F.pipe(
         await getSpreadsheetValues({ spreadsheetId, range }),
-        E.mapLeft(addContext({ location: 'motivationSpreadsheet' })),
+        E.mapLeft(
+          addContext({
+            location: 'motivationSpreadsheet',
+            errorContext: { userId: user.id },
+          }),
+        ),
         E.getOrElse(consumeErrorEvent([] as string[][])),
         A.findLast(
           (row) =>

diff --git a/scripts/mysql/import-anonymous-data.sh b/scripts/mysql/import-anonymous-data.sh
@@ -2,7 +2,7 @@
 
 tmp_dir="/tmp"
 
-latest_dump=$(gsutil ls -l gs://anonymous-data | grep dump | sort -rk 2 | head -n 1 | awk '{ print $3 }' | tr -d '\n')
+latest_dump=$(gsutil ls -l gs://anonymous-dump | grep dump | sort -rk 2 | head -n 1 | awk '{ print $3 }' | tr -d '\n')
 
 if [ -z "$latest_dump" ]; then
   echo "❌ Could not fetch latest dump, check your gsutil setup"