From d3ff82736fddfdbbf6ae6490862dca8a707637a4 Mon Sep 17 00:00:00 2001
From: Kevin Kamimura <kevin@yepstr.com>
Date: Fri, 14 Jun 2024 14:56:11 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20generate=20array/non-scal?=
 =?UTF-8?q?ar=20fields?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

use non-mapped table name to generate array/non-scalar fields on
relational queries

✅ Closes: #2581
---
 .../src/resolver/rds-generator.ts             | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/amplify-graphql-relational-transformer/src/resolver/rds-generator.ts b/packages/amplify-graphql-relational-transformer/src/resolver/rds-generator.ts
index 9832acb4d8..41ada287fc 100644
--- a/packages/amplify-graphql-relational-transformer/src/resolver/rds-generator.ts
+++ b/packages/amplify-graphql-relational-transformer/src/resolver/rds-generator.ts
@@ -49,7 +49,6 @@ export class RDSRelationalResolverGenerator extends RelationalResolverGenerator
     }
     const dataSourceName = getModelDataSourceNameForTypeName(ctx, relatedType.name.value);
     const dataSource = ctx.api.host.getDataSource(dataSourceName);
-    const mappedTableName = ctx.resourceHelper.getModelNameMapping(relatedType.name.value);
 
     const connectionCondition: Expression[] = [];
     const primaryKeys = getPrimaryKeyFields(object);
@@ -65,7 +64,7 @@ export class RDSRelationalResolverGenerator extends RelationalResolverGenerator
       resolverResourceId,
       dataSource as any,
       MappingTemplate.s3MappingTemplateFromString(
-        this.generateHasManyLambdaRequestTemplate(mappedTableName, 'LIST', 'ConnectionQuery', connectionCondition, ctx),
+        this.generateHasManyLambdaRequestTemplate(relatedType.name.value, 'LIST', 'ConnectionQuery', connectionCondition, ctx),
         `${object.name.value}.${field.name.value}.req.vtl`,
       ),
       MappingTemplate.s3MappingTemplateFromString(
@@ -88,12 +87,13 @@ export class RDSRelationalResolverGenerator extends RelationalResolverGenerator
     joinCondition: Expression[],
     ctx: TransformerContextProvider,
   ): string => {
+    const mappedTableName = ctx.resourceHelper.getModelNameMapping(tableName);
     return printBlock('Invoke RDS Lambda data source')(
       compoundExpression([
         iff(ref('ctx.stash.deniedField'), compoundExpression([set(ref('result'), obj({ items: list([]) })), raw('#return($result)')])),
         set(ref('lambdaInput'), obj({})),
         set(ref('lambdaInput.args'), obj({})),
-        set(ref('lambdaInput.table'), str(tableName)),
+        set(ref('lambdaInput.table'), str(mappedTableName)),
         set(ref('lambdaInput.operation'), str(operation)),
         set(ref('lambdaInput.operationName'), str(operationName)),
         set(ref('lambdaInput.args.metadata'), obj({})),
@@ -128,12 +128,13 @@ export class RDSRelationalResolverGenerator extends RelationalResolverGenerator
     relatedTypePrimaryKeys: string[],
     ctx: TransformerContextProvider,
   ): string => {
+    const mappedTableName = ctx.resourceHelper.getModelNameMapping(tableName);
     return printBlock('Invoke RDS Lambda data source')(
       compoundExpression([
         iff(ref('ctx.stash.deniedField'), raw('#return($util.toJson(null))')),
         set(ref('lambdaInput'), obj({})),
         set(ref('lambdaInput.args'), obj({})),
-        set(ref('lambdaInput.table'), str(tableName)),
+        set(ref('lambdaInput.table'), str(mappedTableName)),
         set(ref('lambdaInput.operation'), str(operation)),
         set(ref('lambdaInput.operationName'), str(operationName)),
         set(ref('lambdaInput.args.metadata'), obj({})),
@@ -212,7 +213,6 @@ export class RDSRelationalResolverGenerator extends RelationalResolverGenerator
     }
     const dataSourceName = getModelDataSourceNameForTypeName(ctx, relatedType.name.value);
     const dataSource = ctx.api.host.getDataSource(dataSourceName);
-    const mappedTableName = ctx.resourceHelper.getModelNameMapping(relatedType.name.value);
 
     const connectionCondition: Expression[] = [];
     const primaryKeys = getPrimaryKeyFields(object);
@@ -230,7 +230,7 @@ export class RDSRelationalResolverGenerator extends RelationalResolverGenerator
       dataSource as any,
       MappingTemplate.s3MappingTemplateFromString(
         this.generateHasOneLambdaRequestTemplate(
-          mappedTableName,
+          relatedType.name.value,
           'GET_FIRST',
           'GetItemConnectionQuery',
           connectionCondition,
@@ -257,7 +257,6 @@ export class RDSRelationalResolverGenerator extends RelationalResolverGenerator
     }
     const dataSourceName = getModelDataSourceNameForTypeName(ctx, relatedType.name.value);
     const dataSource = ctx.api.host.getDataSource(dataSourceName);
-    const mappedTableName = ctx.resourceHelper.getModelNameMapping(relatedType.name.value);
 
     const connectionCondition: Expression[] = [];
     const primaryKeys = getPrimaryKeyFields(relatedType);
@@ -271,7 +270,14 @@ export class RDSRelationalResolverGenerator extends RelationalResolverGenerator
       resolverResourceId,
       dataSource as any,
       MappingTemplate.s3MappingTemplateFromString(
-        this.generateHasOneLambdaRequestTemplate(mappedTableName, 'GET', 'BelongsToConnectionQuery', connectionCondition, primaryKeys, ctx),
+        this.generateHasOneLambdaRequestTemplate(
+          relatedType.name.value,
+          'GET',
+          'BelongsToConnectionQuery',
+          connectionCondition,
+          primaryKeys,
+          ctx,
+        ),
         `${object.name.value}.${field.name.value}.req.vtl`,
       ),
       MappingTemplate.s3MappingTemplateFromString(