feat: implement graphql querying for join tables

aws-amplify · Jul 31, 2023 · faaf011 · faaf011
1 parent 1b52a80
commit faaf011
Show file tree

Hide file tree

Showing 5 changed files with 242 additions and 101 deletions.
diff --git a/...s/codegen-ui-react/lib/__tests__/__snapshots__/studio-ui-codegen-react-forms.test.ts.snap b/...s/codegen-ui-react/lib/__tests__/__snapshots__/studio-ui-codegen-react-forms.test.ts.snap
@@ -5714,8 +5714,13 @@ import {
 } from \\"@aws-amplify/ui-react\\";
 import { getOverrideProps } from \\"@aws-amplify/ui-react/internal\\";
 import { fetchByPath, validateField } from \\"./utils\\";
+import {
+  getMovie,
+  listMovieTags,
+  listTags,
+  movieTagsByMovieMovieKeyAndMovietitleAndMoviegenre,
+} from \\"../graphql/queries\\";
 import { API } from \\"aws-amplify\\";
-import { getMovie, listMovieTags, listTags } from \\"../graphql/queries\\";
 import {
   createMovieTags,
   deleteMovieTags,
@@ -5935,12 +5940,17 @@ export default function MovieUpdateForm(props) {
         : movieModelProp;
       setMovieRecord(record);
       const linkedTags = record
-        ? await Promise.all(
-            (
-              await record.tags.toArray()
-            ).map((r) => {
-              return r.tag;
+        ? (
+            await API.graphql({
+              query: movieTagsByMovieMovieKeyAndMovietitleAndMoviegenre,
+              variables: {
+                movieMovieKey: record.movieKey,
+                movietitle: record.title,
+                moviegenre: record.genre,
+              },
             })
+          ).data.movieTagsByMovieMovieKeyAndMovietitleAndMoviegenre.items.map(
+            (t) => t.tag
           )
         : [];
       setLinkedTags(linkedTags);
@@ -7891,8 +7901,13 @@ import {
 } from \\"@aws-amplify/ui-react\\";
 import { getOverrideProps } from \\"@aws-amplify/ui-react/internal\\";
 import { fetchByPath, validateField } from \\"./utils\\";
+import {
+  getClass,
+  listStudentClasses,
+  listStudents,
+  studentClassByClassId,
+} from \\"../graphql/queries\\";
 import { API } from \\"aws-amplify\\";
-import { getClass, listStudentClasses, listStudents } from \\"../graphql/queries\\";
 import {
   createStudentClass,
   deleteStudentClass,
@@ -8100,13 +8115,14 @@ export default function ClassUpdateForm(props) {
         : classModelProp;
       setClassRecord(record);
       const linkedStudents = record
-        ? await Promise.all(
-            (
-              await record.students.toArray()
-            ).map((r) => {
-              return r.student;
+        ? (
+            await API.graphql({
+              query: studentClassByClassId,
+              variables: {
+                classId: record.id,
+              },
             })
-          )
+          ).data.studentClassByClassId.items.map((t) => t.student)
         : [];
       setLinkedStudents(linkedStudents);
     };
@@ -8496,15 +8512,16 @@ import {
 } from \\"@aws-amplify/ui-react\\";
 import { getOverrideProps } from \\"@aws-amplify/ui-react/internal\\";
 import { fetchByPath, validateField } from \\"./utils\\";
-import { API } from \\"aws-amplify\\";
 import {
   cPKProjectsByCPKTeacherID,
+  cPKTeacherCPKClassByCPKTeacherSpecialTeacherId,
   getCPKTeacher,
   listCPKClasses,
   listCPKProjects,
   listCPKStudents,
   listCPKTeacherCPKClasses,
 } from \\"../graphql/queries\\";
+import { API } from \\"aws-amplify\\";
 import {
   createCPKTeacherCPKClass,
   deleteCPKTeacherCPKClass,
@@ -8745,12 +8762,15 @@ export default function UpdateCPKTeacherForm(props) {
       const CPKStudentRecord = record ? await record.CPKStudent : undefined;
       setCPKStudent(CPKStudentRecord);
       const linkedCPKClasses = record
-        ? await Promise.all(
-            (
-              await record.CPKClasses.toArray()
-            ).map((r) => {
-              return r.cpkClass;
+        ? (
+            await API.graphql({
+              query: cPKTeacherCPKClassByCPKTeacherSpecialTeacherId,
+              variables: {
+                cPKTeacherSpecialTeacherId: record.specialTeacherId,
+              },
             })
+          ).data.cPKTeacherCPKClassByCPKTeacherSpecialTeacherId.items.map(
+            (t) => t.cpkClass
           )
         : [];
       setLinkedCPKClasses(linkedCPKClasses);

diff --git a/packages/codegen-ui-react/lib/__tests__/studio-ui-codegen-react-forms.test.ts b/packages/codegen-ui-react/lib/__tests__/studio-ui-codegen-react-forms.test.ts
@@ -863,6 +863,9 @@ describe('amplify form renderer tests', () => {
       expect(componentText).toContain('moviegenre: movieRecord.genre,');
       expect(componentText).toContain('tagId: tagToLink.id,');
 
+      // query for join table records indexed by current model's ids
+      expect(componentText).toContain('query: movieTagsByMovieMovieKeyAndMovietitleAndMoviegenre');
+
       expect(componentText).toMatchSnapshot();
       expect(declaration).toMatchSnapshot();
     });