setStoragesを使ってリクエスト数削減

kgtkr · Jan 16, 2024 · b053bc4 · b053bc4
1 parent 7832e8c
commit b053bc4
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 53 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   server:
-    image: ghcr.io/kgtkr/anontown-server:20240114090236576-8130ec4
+    image: ghcr.io/kgtkr/anontown-server:20240116045245741-be819fe
     ports:
       - "8080:8080"
     environment:

diff --git a/packages/client/codegen.yml b/packages/client/codegen.yml
@@ -1,6 +1,7 @@
 overwrite: true
 schema: "./schema.json"
-documents: ["./src/**/*.gql", "./src/**/*.ts", "./src/**/*.tsx"]
+documents:
+  ["./src/**/*.gql", "./src/**/*.ts", "./src/**/*.tsx", "!./src/generated/**/*"]
 generates:
   src/generated/graphql/:
     preset: "client"

diff --git a/packages/client/schema.json b/packages/client/schema.json
diff --git a/packages/client/src/domains/entities/storage/StorageCollectionHooks.ts b/packages/client/src/domains/entities/storage/StorageCollectionHooks.ts
@@ -27,12 +27,11 @@ const StorageQueryDocument = graphql(/* GraphQL */ `
   }
 `);
 
-const SetStorageMutationDocument = graphql(/* GraphQL */ `
-  mutation StorageCollectionHooks_setStorageMutation(
-    $key: String!
-    $value: String!
+const SetStoragesMutationDocument = graphql(/* GraphQL */ `
+  mutation StorageCollectionHooks_setStoragesMutation(
+    $input: SetStoragesInput!
   ) {
-    setStorage(key: $key, value: $value) {
+    setStorages(input: $input) {
       __typename
     }
   }
@@ -144,15 +143,16 @@ function refetchQueries(key: string): InternalRefetchQueriesInclude {
 }
 
 export function useSetStorage<T>(storageCollection: StorageCollection<T>) {
-  const [mutation, result] = useMutation(SetStorageMutationDocument);
+  const [mutation, result] = useMutation(SetStoragesMutationDocument);
 
   return [
     async (value: T) => {
       const key = getKey(storageCollection, value);
       await mutation({
         variables: {
-          key,
-          value: JSON.stringify(value),
+          input: {
+            storages: [{ key, value: JSON.stringify(value) }],
+          },
         },
         refetchQueries: refetchQueries(key),
       });

diff --git a/packages/client/src/domains/entities/storage/classic-storage-json/storage-json-10.ts b/packages/client/src/domains/entities/storage/classic-storage-json/storage-json-10.ts
@@ -129,26 +129,24 @@ export async function convert9To10(
       value: JSON.stringify(x),
     })),
   ];
-  await Promise.all(
-    keyValues.map(async ({ key, value }) => {
-      const result = await gqlClient.mutate<
-        GA.SetStorageMutation,
-        GA.SetStorageMutationVariables
-      >({
-        mutation: GA.SetStorageDocument,
-        variables: {
-          key,
-          value,
-        },
-        context: {
-          headers: createHeaders(token.id, token.key),
-        },
-      });
-      if (result.errors !== undefined && result.errors.length > 0) {
-        throw new Error(result.errors[0].message);
-      }
-    })
-  );
+
+  const result = await gqlClient.mutate<
+    GA.SetStoragesMutation,
+    GA.SetStoragesMutationVariables
+  >({
+    mutation: GA.SetStoragesDocument,
+    variables: {
+      input: {
+        storages: keyValues,
+      },
+    },
+    context: {
+      headers: createHeaders(token.id, token.key),
+    },
+  });
+  if (result.errors !== undefined && result.errors.length > 0) {
+    throw new Error(result.errors[0].message);
+  }
 
   return {
     ver: "10",

diff --git a/packages/client/src/domains/entities/storage/migration.ts b/packages/client/src/domains/entities/storage/migration.ts
@@ -45,16 +45,18 @@ export async function migration(token: GA.TokenMasterFragment) {
     sto !== undefined ? JSON.parse(sto.value) : Sto.initStorage
   );
 
-  await gqlClient.mutate<GA.SetStorageMutation, GA.SetStorageMutationVariables>(
-    {
-      mutation: GA.SetStorageDocument,
-      variables: {
-        key: Sto.verArray[0],
-        value: JSON.stringify(storage),
-      },
-      context: {
-        headers: createHeaders(token.id, token.key),
+  await gqlClient.mutate<
+    GA.SetStoragesMutation,
+    GA.SetStoragesMutationVariables
+  >({
+    mutation: GA.SetStoragesDocument,
+    variables: {
+      input: {
+        storages: [{ key: Sto.verArray[0], value: JSON.stringify(storage) }],
       },
-    }
-  );
+    },
+    context: {
+      headers: createHeaders(token.id, token.key),
+    },
+  });
 }
diff --git a/packages/client/src/gql/storage.gql b/packages/client/src/gql/storage.gql
@@ -1,16 +1,18 @@
-fragment storage on Storage{
-    key
-    value
+fragment storage on Storage {
+  key
+  value
 }
 
-query findStorages($query:StorageQuery!){
-    storages(query:$query){
-        ...storage
-    }
+query findStorages($query: StorageQuery!) {
+  storages(query: $query) {
+    ...storage
+  }
 }
 
-mutation setStorage($key:String!,$value:String!){
-    setStorage(key:$key,value:$value){
-        ...storage
+mutation setStorages($input: SetStoragesInput!) {
+  setStorages(input: $input) {
+    storages {
+      ...storage
     }
-}
+  }
+}