Merge pull request #328 from aws-amplify/master

Release: Remove additional fields from many-to-many join

Author: phani-srikar

.circleci/config.base.yml

@@ -46,6 +46,7 @@ clean_up_e2e_resources: &cleanup_e2e
     cd packages/amplify-codegen-e2e-tests
     yarn clean-e2e-resources job ${CIRCLE_BUILD_NUM}
   working_directory: ~/repo
+  when: always
 
 jobs:
   build:

.circleci/config.yml

@@ -44,6 +44,7 @@ clean_up_e2e_resources: &ref_7
     cd packages/amplify-codegen-e2e-tests
     yarn clean-e2e-resources job ${CIRCLE_BUILD_NUM}
   working_directory: ~/repo
+  when: always
 jobs:
   build:
     working_directory: ~/repo

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

@@ -1279,8 +1279,6 @@ class _TagModelType extends ModelType<Tag> {
 class PostTags extends Model {
   static const classType = const _PostTagsModelType();
   final String id;
-  final String postID;
-  final String tagID;
   final Post post;
   final Tag tag;
 
@@ -1293,24 +1291,11 @@ class PostTags extends Model {
   }
 
   const PostTags._internal(
-      {@required this.id,
-      @required this.postID,
-      @required this.tagID,
-      @required this.post,
-      @required this.tag});
+      {@required this.id, @required this.post, @required this.tag});
 
-  factory PostTags(
-      {String id,
-      @required String postID,
-      @required String tagID,
-      @required Post post,
-      @required Tag tag}) {
+  factory PostTags({String id, @required Post post, @required Tag tag}) {
     return PostTags._internal(
-        id: id == null ? UUID.getUUID() : id,
-        postID: postID,
-        tagID: tagID,
-        post: post,
-        tag: tag);
+        id: id == null ? UUID.getUUID() : id, post: post, tag: tag);
   }
 
   bool equals(Object other) {
@@ -1322,8 +1307,6 @@ class PostTags extends Model {
     if (identical(other, this)) return true;
     return other is PostTags &&
         id == other.id &&
-        postID == other.postID &&
-        tagID == other.tagID &&
         post == other.post &&
         tag == other.tag;
   }
@@ -1337,47 +1320,31 @@ class PostTags extends Model {
 
     buffer.write(\\"PostTags {\\");
     buffer.write(\\"id=\\" + \\"$id\\" + \\", \\");
-    buffer.write(\\"postID=\\" + \\"$postID\\" + \\", \\");
-    buffer.write(\\"tagID=\\" + \\"$tagID\\" + \\", \\");
     buffer.write(\\"post=\\" + (post != null ? post.toString() : \\"null\\") + \\", \\");
     buffer.write(\\"tag=\\" + (tag != null ? tag.toString() : \\"null\\"));
     buffer.write(\\"}\\");
 
     return buffer.toString();
   }
 
-  PostTags copyWith(
-      {String id, String postID, String tagID, Post post, Tag tag}) {
+  PostTags copyWith({String id, Post post, Tag tag}) {
     return PostTags(
-        id: id ?? this.id,
-        postID: postID ?? this.postID,
-        tagID: tagID ?? this.tagID,
-        post: post ?? this.post,
-        tag: tag ?? this.tag);
+        id: id ?? this.id, post: post ?? this.post, tag: tag ?? this.tag);
   }
 
   PostTags.fromJson(Map<String, dynamic> json)
       : id = json['id'],
-        postID = json['postID'],
-        tagID = json['tagID'],
         post = json['post'] != null
             ? Post.fromJson(new Map<String, dynamic>.from(json['post']))
             : null,
         tag = json['tag'] != null
             ? Tag.fromJson(new Map<String, dynamic>.from(json['tag']))
             : null;
 
-  Map<String, dynamic> toJson() => {
-        'id': id,
-        'postID': postID,
-        'tagID': tagID,
-        'post': post?.toJson(),
-        'tag': tag?.toJson()
-      };
+  Map<String, dynamic> toJson() =>
+      {'id': id, 'post': post?.toJson(), 'tag': tag?.toJson()};
 
   static final QueryField ID = QueryField(fieldName: \\"postTags.id\\");
-  static final QueryField POSTID = QueryField(fieldName: \\"postID\\");
-  static final QueryField TAGID = QueryField(fieldName: \\"tagID\\");
   static final QueryField POST = QueryField(
       fieldName: \\"post\\",
       fieldType: ModelFieldType(ModelFieldTypeEnum.model,
@@ -1393,16 +1360,6 @@ class PostTags extends Model {
 
     modelSchemaDefinition.addField(ModelFieldDefinition.id());
 
-    modelSchemaDefinition.addField(ModelFieldDefinition.field(
-        key: PostTags.POSTID,
-        isRequired: true,
-        ofType: ModelFieldType(ModelFieldTypeEnum.string)));
-
-    modelSchemaDefinition.addField(ModelFieldDefinition.field(
-        key: PostTags.TAGID,
-        isRequired: true,
-        ofType: ModelFieldType(ModelFieldTypeEnum.string)));
-
     modelSchemaDefinition.addField(ModelFieldDefinition.belongsTo(
         key: PostTags.POST,
         isRequired: true,

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/visitors/appsync-visitor.ts

@@ -693,6 +693,9 @@ export class AppSyncModelVisitor<
               isList: false,
               isNullable: field.isNullable,
             });
+          } else if (connectionInfo.targetName !== 'id') {
+            // Need to remove the field that is targetName
+            removeFieldFromModel(model, connectionInfo.targetName);
           }
           field.connectionInfo = connectionInfo;
         }