Implemented create and delete member links for sync

astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java

@@ -235,7 +235,6 @@ public class MakeChanges<TYPE extends RemoteModel> extends ServerToClientMessage
             boolean membersRemoved = (removeMembers != null && removeMembers.length() > 0);
 
             if (membersAdded) {
-                model.setValue(TagData.MEMBERS, ""); // Clear this value for migration purposes
                 model.setValue(TagData.MEMBERS, ""); // Clear this value for migration purposes
                 for (int i = 0; i < addMembers.length(); i++) {
                     try {
@@ -257,7 +256,7 @@ public class MakeChanges<TYPE extends RemoteModel> extends ServerToClientMessage
                         //
                     }
                 }
-                tagMetadataDao.removeMemberLinks(uuid, toRemove.toArray(new String[toRemove.size()]));
+                tagMetadataDao.removeMemberLinks(uuid, toRemove.toArray(new String[toRemove.size()]), true);
             }
         }
     }

astrid/plugin-src/com/todoroo/astrid/tags/TagMemberMetadata.java

@@ -9,4 +9,12 @@ public class TagMemberMetadata {
 
     public static final StringProperty USER_UUID = new StringProperty(
             TagMetadata.TABLE, TagMetadata.VALUE1.name);
+
+    public static TagMetadata newMemberMetadata(String tagUuid, String userUuid) {
+        TagMetadata m = new TagMetadata();
+        m.setValue(TagMetadata.TAG_UUID, tagUuid);
+        m.setValue(USER_UUID, userUuid);
+        m.setValue(TagMetadata.DELETION_DATE, 0L);
+        return m;
+    }
 }

astrid/src/com/todoroo/astrid/dao/TagMetadataDao.java

@@ -8,8 +8,12 @@ package com.todoroo.astrid.dao;
 import com.todoroo.andlib.data.DatabaseDao;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
+import com.todoroo.andlib.sql.Criterion;
+import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Metadata;
+import com.todoroo.astrid.data.SyncFlags;
 import com.todoroo.astrid.data.TagMetadata;
+import com.todoroo.astrid.tags.TagMemberMetadata;
 
 /**
  * Data Access layer for {@link Metadata}-related operations.
@@ -29,12 +33,46 @@ public class TagMetadataDao extends DatabaseDao<TagMetadata> {
         setDatabase(database);
     }
 
+    public static class TagMetadataCriteria {
+        /** Returns all metadata associated with a given task */
+        public static Criterion byTag(String tagUuid) {
+            return TagMetadata.TAG_UUID.eq(tagUuid);
+        }
+
+        /** Returns all metadata associated with a given key */
+        public static Criterion withKey(String key) {
+            return TagMetadata.KEY.eq(key);
+        }
+
+        /** Returns all metadata associated with a given key */
+        public static Criterion byTagAndWithKey(String tagUuid, String key) {
+            return Criterion.and(withKey(key), byTag(tagUuid));
+        }
+    }
+
     public void createMemberLink(String tagUuid, String memberId) {
-        // TODO: Implement
+        TagMetadata newMetadata = TagMemberMetadata.newMemberMetadata(tagUuid, memberId);
+        if (update(Criterion.and(TagMetadataCriteria.byTagAndWithKey(tagUuid, TagMemberMetadata.KEY),
+                TagMemberMetadata.USER_UUID.eq(memberId)), newMetadata) <= 0) {
+            createNew(newMetadata);
+        }
     }
 
-    public void removeMemberLinks(String tagUuid, String[] memberIds) {
-        // TODO: Implement
+    public void removeMemberLinks(String tagUuid, String[] memberIds, boolean suppressOutstanding) {
+        TagMetadata deleteTemplate = new TagMetadata();
+        deleteTemplate.setValue(TagMetadata.TAG_UUID, tagUuid); // Need this for recording changes in outstanding table
+        deleteTemplate.setValue(Metadata.DELETION_DATE, DateUtilities.now());
+        if (memberIds != null) {
+            for (String uuid : memberIds) {
+                // TODO: Right now this is in a loop because each deleteTemplate needs the individual tagUuid in order to record
+                // the outstanding entry correctly. If possible, this should be improved to a single query
+                deleteTemplate.setValue(TagMemberMetadata.USER_UUID, uuid); // Need this for recording changes in outstanding table
+                if (suppressOutstanding)
+                    deleteTemplate.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
+                update(Criterion.and(TagMetadataCriteria.withKey(TagMemberMetadata.KEY), Metadata.DELETION_DATE.eq(0),
+                        TagMetadata.TAG_UUID.eq(tagUuid), TagMemberMetadata.USER_UUID.eq(uuid)), deleteTemplate);
+            }
+        }
     }
 }