Merge pull request #461 from kaizumaki/feature/reduce-attribute-query

不要なattributeを取り除いたqueryを追加

Author: MasaGon

src/pages/user/classlist.vue

@@ -52,10 +52,9 @@
 import Vue from 'vue'
 import BaseBottomSheetLayer from '@/components/BaseBottomSheetLayer.vue'
 import BaseActionButton from '@/components/BaseActionButton.vue'
-import { Auth, API, graphqlOperation } from 'aws-amplify'
+import { Auth, API } from 'aws-amplify'
 import { GraphQLResult } from '@aws-amplify/api'
 import { vxm } from '@/store'
-import { listClasss } from '@/graphql/queries'
 import { ListClasssQuery } from '@/API'
 
 type DataType = {
@@ -77,11 +76,30 @@ export default Vue.extend({
   },
   async created() {
     const user = await Auth.currentAuthenticatedUser()
-    const result = (await API.graphql(
-      graphqlOperation(listClasss, {
+    const listClasssSimple = /* GraphQL */ `
+      query ListClasss(
+        $filter: ModelClassFilterInput
+        $limit: Int
+        $nextToken: String
+      ) {
+        listClasss(filter: $filter, limit: $limit, nextToken: $nextToken) {
+          items {
+            id
+            school {
+              name
+            }
+            className
+          }
+          nextToken
+        }
+      }
+    `
+    const result = (await API.graphql({
+      query: listClasssSimple,
+      variables: {
         filter: { owner: { eq: user.username } },
-      })
-    )) as GraphQLResult<ListClasssQuery>
+      },
+    })) as GraphQLResult<ListClasssQuery>
     this.items = (result?.data?.listClasss?.items as any[]).map((item) => {
       return {
         classId: item.id,

src/store/modules/classData.ts

@@ -8,7 +8,6 @@ import { AppStore } from '@/store/modules/app'
 import classData from '@/types/store/classData'
 import { API, Auth, graphqlOperation } from 'aws-amplify'
 import { GRAPHQL_AUTH_MODE, GraphQLResult } from '@aws-amplify/api'
-import { getClass, listLessonsByClass } from '@/graphql/queries'
 import {
   createSchool,
   createClass,
@@ -22,6 +21,60 @@ type LessonsGroupedBy = {
   [key: string]: classData.LessonWithId[]
 }
 
+const getClassSimple = /* GraphQL */ `
+  query GetClass($id: ID!) {
+    getClass(id: $id) {
+      id
+      className
+    }
+  }
+`
+
+const listLessonsByClassSimple = /* GraphQL */ `
+  query ListLessonsByClass(
+    $classId: ID
+    $startTime: ModelStringKeyConditionInput
+    $sortDirection: ModelSortDirection
+    $filter: ModelLessonFilterInput
+    $limit: Int
+    $nextToken: String
+  ) {
+    listLessonsByClass(
+      classId: $classId
+      startTime: $startTime
+      sortDirection: $sortDirection
+      filter: $filter
+      limit: $limit
+      nextToken: $nextToken
+    ) {
+      items {
+        id
+        startTime
+        endTime
+        title
+        subject {
+          name
+          color
+        }
+        goal
+        description
+        videos {
+          title
+          url
+          thumbnailUrl
+        }
+        pages
+        materials {
+          title
+          url
+        }
+        isHidden
+      }
+      nextToken
+    }
+  }
+`
+
 const VuexModule = createModule({
   namespaced: 'classData',
   strict: false,
@@ -64,7 +117,7 @@ export class ClassDataStore extends VuexModule implements classData.ClassData {
   @action
   public async lessonsOnCurrentDate(date: Date) {
     const lessons = (await API.graphql({
-      query: listLessonsByClass,
+      query: listLessonsByClassSimple,
       variables: {
         classId: this.classId,
         startTime: {
@@ -156,9 +209,10 @@ export class ClassDataStore extends VuexModule implements classData.ClassData {
 
   @action
   public async loadClassData(classId: classData.ClassId) {
-    const result = (await API.graphql(
-      graphqlOperation(getClass, { id: classId })
-    )) as GraphQLResult<GetClassQuery>
+    const result = (await API.graphql({
+      query: getClassSimple,
+      variables: { id: classId },
+    })) as GraphQLResult<GetClassQuery>
 
     const classObject = result?.data?.getClass
     if (!classObject) {
@@ -188,11 +242,10 @@ export class ClassDataStore extends VuexModule implements classData.ClassData {
     do {
       classId = generateUniqueId()
       try {
-        const result = (await API.graphql(
-          graphqlOperation(getClass, {
-            id: classId,
-          })
-        )) as GraphQLResult<GetClassQuery>
+        const result = (await API.graphql({
+          query: getClassSimple,
+          variables: { id: classId },
+        })) as GraphQLResult<GetClassQuery>
         classObject = result?.data?.getClass
       } catch {
         throw new Error('エラーによって処理に失敗しました')

tsconfig.json

@@ -19,7 +19,6 @@
     "types": [
       "@types/node",
       "@nuxt/types",
-      "@types/js-cookie",
       "@types/jest",
       "vuetify",
       "nuxt-i18n"