Merge pull request #326 from aws-amplify/fix-hasone-belongsto

fix: set associatedWith to correct field with hasOne/hasMany and belongsTo

Author: phani-srikar

packages/appsync-modelgen-plugin/src/__tests__/visitors/appsync-visitor.test.ts

@@ -853,10 +853,10 @@ describe('AppSyncModelVisitor', () => {
       expect(visitor.models.Human.fields[2].directives[0].arguments.fields[0]).toEqual('governmentID');
       expect(visitor.models.Human.fields[2].directives[0].arguments.indexName).toEqual('byHuman');
       expect(visitor.models.PetFriend).toBeDefined();
-      expect(visitor.models.PetFriend.fields.length).toEqual(7);
-      expect(visitor.models.PetFriend.fields[4].directives[0].name).toEqual('belongsTo');
-      expect(visitor.models.PetFriend.fields[4].directives[0].arguments.fields.length).toEqual(1);
-      expect(visitor.models.PetFriend.fields[4].directives[0].arguments.fields[0]).toEqual('animalID');
+      expect(visitor.models.PetFriend.fields.length).toEqual(5);
+      expect(visitor.models.PetFriend.fields[2].directives[0].name).toEqual('belongsTo');
+      expect(visitor.models.PetFriend.fields[2].directives[0].arguments.fields.length).toEqual(1);
+      expect(visitor.models.PetFriend.fields[2].directives[0].arguments.fields[0]).toEqual('animalID');
       expect(visitor.models.Animal.fields.length).toEqual(5);
       expect(visitor.models.Animal.fields[2].type).toEqual('PetFriend');
       expect(visitor.models.Animal.fields[2].directives.length).toEqual(1);
@@ -876,7 +876,7 @@ describe('AppSyncModelVisitor', () => {
       expect(visitor.models.ModelA.fields[1].directives[0].arguments.indexName).toEqual('byModelA');
 
       expect(visitor.models.Models).toBeDefined();
-      expect(visitor.models.Models.fields.length).toEqual(7);
+      expect(visitor.models.Models.fields.length).toEqual(5);
 
       const modelA = visitor.models.Models.fields.find(f => f.name === 'modelA');
       expect(modelA).toBeDefined();

packages/appsync-modelgen-plugin/src/__tests__/visitors/gqlv2-regression-tests/__snapshots__/appsync-dart-visitor.test.ts.snap

@@ -630,7 +630,7 @@ class Project extends Model {
       key: Project.TEAM,
       isRequired: false,
       ofModelName: (Team).toString(),
-      associatedKey: Team.ID
+      associatedKey: Team.PROJECT
     ));
 
     modelSchemaDefinition.addField(ModelFieldDefinition.field(
@@ -936,7 +936,7 @@ class Project2 extends Model {
       key: Project2.TEAM,
       isRequired: false,
       ofModelName: (Team2).toString(),
-      associatedKey: Team2.ID
+      associatedKey: Team2.PROJECT
     ));
 
     modelSchemaDefinition.addField(ModelFieldDefinition.field(
@@ -1536,7 +1536,7 @@ class Post extends Model {
       key: Post.COMMENTS,
       isRequired: false,
       ofModelName: (Comment).toString(),
-      associatedKey: Comment.POSTCOMMENTSID
+      associatedKey: Comment.ID
     ));
   });
 }
@@ -1583,7 +1583,6 @@ class Comment extends Model {
   static const classType = const _CommentModelType();
   final String id;
   final String? _content;
-  final String? _postCommentsId;
 
   @override
   getInstanceType() => classType;
@@ -1601,17 +1600,12 @@ class Comment extends Model {
     }
   }
 
-  String? get postCommentsId {
-    return _postCommentsId;
-  }
+  const Comment._internal({required this.id, required content}): _content = content;
 
-  const Comment._internal({required this.id, required content, postCommentsId}): _content = content, _postCommentsId = postCommentsId;
-  
-  factory Comment({String? id, required String content, String? postCommentsId}) {
+  factory Comment({String? id, required String content}) {
     return Comment._internal(
       id: id == null ? UUID.getUUID() : id,
-      content: content,
-      postCommentsId: postCommentsId);
+      content: content);
   }
 
   bool equals(Object other) {
@@ -1623,8 +1617,7 @@ class Comment extends Model {
     if (identical(other, this)) return true;
     return other is Comment &&
       id == other.id &&
-      _content == other._content &&
-      _postCommentsId == other._postCommentsId;
+      _content == other._content;
   }
 
   @override
@@ -1636,32 +1629,28 @@ class Comment extends Model {
 
     buffer.write(\\"Comment {\\");
     buffer.write(\\"id=\\" + \\"$id\\" + \\", \\");
-    buffer.write(\\"content=\\" + \\"$_content\\" + \\", \\");
-    buffer.write(\\"postCommentsId=\\" + \\"$_postCommentsId\\");
+    buffer.write(\\"content=\\" + \\"$_content\\");
     buffer.write(\\"}\\");
 
     return buffer.toString();
   }
 
-  Comment copyWith({String? id, String? content, String? postCommentsId}) {
+  Comment copyWith({String? id, String? content}) {
     return Comment(
       id: id ?? this.id,
-      content: content ?? this.content,
-      postCommentsId: postCommentsId ?? this.postCommentsId);
+      content: content ?? this.content);
   }
 
   Comment.fromJson(Map<String, dynamic> json)  
     : id = json['id'],
-      _content = json['content'],
-      _postCommentsId = json['postCommentsId'];
+      _content = json['content'];
 
   Map<String, dynamic> toJson() => {
-    'id': id, 'content': _content, 'postCommentsId': _postCommentsId
+    'id': id, 'content': _content
   };
 
   static final QueryField ID = QueryField(fieldName: \\"comment.id\\");
   static final QueryField CONTENT = QueryField(fieldName: \\"content\\");
-  static final QueryField POSTCOMMENTSID = QueryField(fieldName: \\"postCommentsId\\");
   static var schema = Model.defineSchema(define: (ModelSchemaDefinition modelSchemaDefinition) {
     modelSchemaDefinition.name = \\"Comment\\";
     modelSchemaDefinition.pluralName = \\"Comments\\";
@@ -1673,12 +1662,6 @@ class Comment extends Model {
       isRequired: true,
       ofType: ModelFieldType(ModelFieldTypeEnum.string)
     ));
-    
-    modelSchemaDefinition.addField(ModelFieldDefinition.field(
-      key: Comment.POSTCOMMENTSID,
-      isRequired: false,
-      ofType: ModelFieldType(ModelFieldTypeEnum.string)
-    ));
   });
 }