Preserve ACL when saving record with ACL=nil

refs #38
SkygearIO · Jul 21, 2016 · 0ebab13 · 0ebab13
1 parent 282a3dc
commit 0ebab13
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 1 deletion.
diff --git a/handler/record.go b/handler/record.go
@@ -658,7 +658,11 @@ func mergeRecord(dst, src *skydb.Record) {
 // the same record
 func deriveDeltaRecord(dst, base, delta *skydb.Record) {
 	dst.ID = delta.ID
-	dst.ACL = delta.ACL
+	if delta.ACL != nil {
+		dst.ACL = delta.ACL
+	} else {
+		dst.ACL = base.ACL
+	}
 	dst.OwnerID = delta.OwnerID
 	dst.CreatedAt = delta.CreatedAt
 	dst.CreatorID = delta.CreatorID

diff --git a/handler/record_test.go b/handler/record_test.go
@@ -2292,3 +2292,47 @@ func TestAtomicOperation(t *testing.T) {
 		})
 	})
 }
+
+func TestDeriveDeltaRecord(t *testing.T) {
+	Convey("DeriveDeltaRecord", t, func() {
+		Convey("set ACL when delta is non-nil", func() {
+			acl := skydb.RecordACL{
+				skydb.NewRecordACLEntryDirect("user0", skydb.WriteLevel),
+			}
+
+			dst := skydb.Record{}
+			base := skydb.Record{
+				ID:      skydb.NewRecordID("record", "id"),
+				OwnerID: "user0",
+			}
+			delta := skydb.Record{
+				ID:  skydb.NewRecordID("record", "id"),
+				ACL: acl,
+			}
+
+			deriveDeltaRecord(&dst, &base, &delta)
+
+			So(dst.ACL, ShouldResemble, acl)
+		})
+
+		Convey("preserve ACL when delta is nil", func() {
+			acl := skydb.RecordACL{
+				skydb.NewRecordACLEntryDirect("user0", skydb.WriteLevel),
+			}
+
+			dst := skydb.Record{}
+			base := skydb.Record{
+				ID:      skydb.NewRecordID("record", "id"),
+				OwnerID: "user0",
+				ACL:     acl,
+			}
+			delta := skydb.Record{
+				ID: skydb.NewRecordID("record", "id"),
+			}
+
+			deriveDeltaRecord(&dst, &base, &delta)
+
+			So(dst.ACL, ShouldResemble, acl)
+		})
+	})
+}