From ec3217dd55663424da8c5062b09574426367374a Mon Sep 17 00:00:00 2001
From: fduplessisduplessis <fduplessis@emss.co.za>
Date: Wed, 5 Jul 2017 14:33:57 +0200
Subject: [PATCH] fix: $pull bug

---
 lib/utils/Omnom.ts  |   2 +
 test/issues/pull.ts | 102 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 test/issues/pull.ts

diff --git a/lib/utils/Omnom.ts b/lib/utils/Omnom.ts
index 02f2e32..51eb931 100644
--- a/lib/utils/Omnom.ts
+++ b/lib/utils/Omnom.ts
@@ -224,6 +224,8 @@ export class Omnom {
 
         if (this.changes.$pullAll && this.changes.$pullAll[path]) {
             this.changes.$pullAll[path].push(value);
+            if (_.keys(this.changes.$pull).length === 0)
+                delete this.changes.$pull;
             return;
         }
 
diff --git a/test/issues/pull.ts b/test/issues/pull.ts
new file mode 100644
index 0000000..e2a7c1d
--- /dev/null
+++ b/test/issues/pull.ts
@@ -0,0 +1,102 @@
+import * as Iridium from "../../iridium";
+import * as chai from "chai";
+
+interface EventType
+{
+    type: string;
+    time: Date;
+};
+
+interface TestDocument {
+    _id?: string;
+
+    stuff?: {
+        [name: string]: {
+            [tracker: number]: EventType[];
+        }
+    };
+}
+
+
+@Iridium.Collection("test")
+@Iridium.Transform(doc => {
+    if (doc.metadata && typeof doc.metadata === "string")
+        doc.metadata = JSON.parse(doc.metadata);
+    return doc;
+}, doc => {
+    if (doc.metadata && typeof doc.metadata === "object")
+        doc.metadata = JSON.stringify(doc.metadata);
+    return doc
+})
+class Test extends Iridium.Instance<TestDocument, Test> implements TestDocument {
+    @Iridium.ObjectID
+    _id: string;
+
+    @Iridium.Property({
+        $propertyType: {
+            $propertyType: [{
+                type: String,
+                time: Date,
+                position: {
+                    $type: {
+                        type: /^Point$/,
+                        coordinates: [Number, 2, 2]
+                    },
+                    $required: false
+                },
+                data: {
+                    $type: Object,
+                    $required: false
+                }
+            }]
+        }
+    })
+    stuff: {
+        [name: string]: {
+            [event: number]: EventType[];
+        }
+    };
+}
+
+describe("issues", () => {
+    let core = new Iridium.Core({ database: "test" });
+    before(() => core.connect());
+    after(() => core.close());
+
+    describe("pull", () => {
+        let model = new Iridium.Model<TestDocument, Test>(core, Test);
+
+        it("save should not throw $pull is empty", () => {
+            return model.remove().then(() => model.insert({
+                stuff: {
+                    bomber: {
+                        123456: [
+                            { time: new Date("2016-06-08T13:27:18.000Z"), type: "absolute" },
+                            { time: new Date("2016-06-08T14:03:12.000Z"), type: "relative" },
+                            { time: new Date("2016-06-08T12:06:14.000Z"), type: "counted" },
+                            { time: new Date("2016-06-08T12:10:14.000Z"), type: "counted" },
+                            { time: new Date("2016-06-08T12:11:30.000Z"), type: "counted" },
+                            { time: new Date("2016-06-08T12:14:32.000Z"), type: "counted" },
+                            { time: new Date("2016-06-08T12:16:00.000Z"), type: "counted" },
+                            { time: new Date("2016-06-08T12:18:18.000Z"), type: "counted" }
+                        ]
+                    }
+                }
+            })).then(test => {
+                test.stuff = {
+                    bomber: {
+                        123456: [
+                            { time: new Date("2016-06-08T13:27:18.000Z"), type: "absolute"},
+                            { time: new Date("2016-06-08T13:03:24.000Z"), type: "counted"},
+                            { time: new Date("2016-06-08T13:07:58.000Z"), type: "counted"},
+                            { time: new Date("2016-06-08T13:10:02.000Z"), type: "counted"},
+                            { time: new Date("2016-06-08T13:12:32.000Z"), type: "counted"}
+                        ]
+                    }
+                }
+                console.log("test ran");
+                return test.save();
+            });
+        });
+    });
+});
\ No newline at end of file