jxp 2.15.0 → 2.15.1

package/test/test.js

@@ -18,11 +18,11 @@ chai.use(chaiHttp);
 const pause = ms => new Promise(res => setTimeout(res, ms));
 
 describe('Test', () => {
-	before(async function() {
+	before(async function () {
 		await init.init();
-    })
+	})
 
-	beforeEach(async function() {
+	beforeEach(async function () {
 		await pause(0);
 	})
 
@@ -175,14 +175,14 @@ describe('Test', () => {
 		it("it should GET all the tests", (done) => {
 			Test.deleteMany(() => {
 				chai.request(server)
-				.get("/api/test")
-				// .auth(init.email, init.password)
-				.end((err, res) => {
-					res.should.have.status(200);
-					res.body.data.should.be.an('array');
-					res.body.data.length.should.be.eql(0);
-					done();
-				});
+					.get("/api/test")
+					// .auth(init.email, init.password)
+					.end((err, res) => {
+						res.should.have.status(200);
+						res.body.data.should.be.an('array');
+						res.body.data.length.should.be.eql(0);
+						done();
+					});
 			});
 		});
 	});
@@ -191,12 +191,12 @@ describe('Test', () => {
 		it("it should count all the tests", (done) => {
 			Test.deleteMany(() => {
 				chai.request(server)
-				.get("/count/test")
-				.end((err, res) => {
-					res.should.have.status(200);
-					res.body.count.should.be.eql(0);
-					done();
-				});
+					.get("/count/test")
+					.end((err, res) => {
+						res.should.have.status(200);
+						res.body.count.should.be.eql(0);
+						done();
+					});
 			});
 		});
 	});
@@ -208,42 +208,42 @@ describe('Test', () => {
 				foo: "Foo",
 				bar: "Bar",
 				yack: { yack: "yack", shmack: 1 },
-				shmack: [ "do", "ray", "me" ],
+				shmack: ["do", "ray", "me"],
 				password: "password",
 				fulltext: "In Xanadu did Kubla Khan a stately pleasure dome decree",
 			};
 			chai.request(server)
-			.post("/api/test")
-			.auth(init.email, init.password)
-			.send(test)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data.should.be.an('object');
-				res.body.data.should.have.property("_id");
-				res.body.data.should.have.property("foo");
-				res.body.data.should.have.property("bar");
-				res.body.data.should.have.property("yack").which.should.be.an("object");
-				res.body.data.should.have.property("shmack");
-				res.body.data.shmack.should.be.an("array");
-				res.body.data.foo.should.be.a("string");
-				res.body.data.bar.should.be.a("string");
-				res.body.data.foo.length.should.be.eql(3);
-				res.body.data.foo.length.should.not.be.eql("password");
-				post_id = res.body.data._id;
-				done();
-			});
+				.post("/api/test")
+				.auth(init.email, init.password)
+				.send(test)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data.should.be.an('object');
+					res.body.data.should.have.property("_id");
+					res.body.data.should.have.property("foo");
+					res.body.data.should.have.property("bar");
+					res.body.data.should.have.property("yack").which.should.be.an("object");
+					res.body.data.should.have.property("shmack");
+					res.body.data.shmack.should.be.an("array");
+					res.body.data.foo.should.be.a("string");
+					res.body.data.bar.should.be.a("string");
+					res.body.data.foo.length.should.be.eql(3);
+					res.body.data.foo.length.should.not.be.eql("password");
+					post_id = res.body.data._id;
+					done();
+				});
 		});
 	});
 
 	describe("/GET test count", () => {
 		it("it should count all the tests", (done) => {
 			chai.request(server)
-			.get("/count/test")
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.count.should.be.eql(1);
-				done();
-			});
+				.get("/count/test")
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.count.should.be.eql(1);
+					done();
+				});
 		});
 	});
 
@@ -253,50 +253,141 @@ describe('Test', () => {
 				foo: "Foo1",
 			};
 			chai.request(server)
-			.put("/api/test/" + post_id)
-			.send(test)
-			.auth(init.email, init.password)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data.should.be.an('object');
-				res.body.data.should.have.property("_id");
-				res.body.data.should.have.property("foo")
-				res.body.data.foo.should.eql("Foo1");
-				res.body.data._updated_by_id.should.eql(user_id);
-				done();
-			});
+				.put("/api/test/" + post_id)
+				.send(test)
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data.should.be.an('object');
+					res.body.data.should.have.property("_id");
+					res.body.data.should.have.property("foo")
+					res.body.data.foo.should.eql("Foo1");
+					res.body.data._updated_by_id.should.eql(user_id);
+					done();
+				});
 		});
 	});
 
 	describe("Search test", () => {
 		it("it should search all the tests", (done) => {
 			chai.request(server)
-			.get("/api/test?search=Xanadu")
-			// .auth(init.email, init.password)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data.should.be.a('array');
-				res.body.data.length.should.be.eql(1);
-				res.body.data[0].score.should.be.a("number");
-				done();
+				.get("/api/test?search=Xanadu")
+				// .auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data.should.be.a('array');
+					res.body.data.length.should.be.eql(1);
+					res.body.data[0].score.should.be.a("number");
+					done();
+				});
+		});
+	});
+
+	describe("Date filtering", () => {
+		let dateTestId;
+		const testDate = new Date('2024-03-20T10:00:00.000Z');
+
+		before(async () => {
+			// Create a test record with a known date
+			const test = new Test({
+				foo: "DateTest",
+				bar: "DateTestBar",
+				date_field: testDate
 			});
+			const saved = await test.save();
+			dateTestId = saved._id;
+		});
+
+		it("should filter by exact date", (done) => {
+			chai.request(server)
+				.get(`/api/test?filter[date_field]=${testDate.toISOString()}`)
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data.should.be.an('array');
+					res.body.data.length.should.be.eql(1);
+					res.body.data[0]._id.should.equal(dateTestId.toString());
+					done();
+				});
+		});
+
+		it("should filter by date range using array syntax", (done) => {
+			const startDate = new Date(testDate);
+			startDate.setDate(startDate.getDate() - 1);
+			const endDate = new Date(testDate);
+			endDate.setDate(endDate.getDate() + 1);
+
+			chai.request(server)
+				.get(`/api/test?filter[date_field]=$gte:${startDate.toISOString()}&filter[date_field]=$lte:${endDate.toISOString()}`)
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data.should.be.an('array');
+					res.body.data.length.should.be.eql(1);
+					res.body.data[0]._id.should.equal(dateTestId.toString());
+					done();
+				});
+		});
+
+		it("should filter by date range using operator syntax", (done) => {
+			const startDate = new Date(testDate);
+			startDate.setDate(startDate.getDate() - 1);
+			const endDate = new Date(testDate);
+			endDate.setDate(endDate.getDate() + 1);
+
+			chai.request(server)
+				.get(`/api/test?filter[date_field]=$gte:${startDate.toISOString()}&filter[date_field]=$lte:${endDate.toISOString()}`)
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data.should.be.an('array');
+					res.body.data.length.should.be.eql(1);
+					res.body.data[0]._id.should.equal(dateTestId.toString());
+					done();
+				});
+		});
+
+		it("should handle invalid date formats gracefully", (done) => {
+			chai.request(server)
+				.get('/api/test?filter[date_field]=invalid-date')
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(500);
+					res.body.should.have.property('code', 'InternalServer');
+					done();
+				});
+		});
+
+		it("should return empty array for dates outside range", (done) => {
+			const futureDate = new Date(testDate);
+			futureDate.setFullYear(futureDate.getFullYear() + 1);
+
+			chai.request(server)
+				.get(`/api/test?filter[date_field]=${futureDate.toISOString()}`)
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data.should.be.an('array');
+					res.body.data.length.should.be.eql(0);
+					done();
+				});
 		});
 	});
 
 	describe("/GET test", () => {
 		it("it should GET a single test contained in a data object", (done) => {
 			chai.request(server)
-			.get("/api/test/" + post_id)
-			.auth(init.email, init.password)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.should.have.property("data");
-				res.body.data.should.be.an('object');
-				res.body.data.should.have.property("_id");
-				res.body.data.should.have.property("foo")
-				res.body.data.foo.should.eql("Foo1");
-				done();
-			});
+				.get("/api/test/" + post_id)
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.should.have.property("data");
+					res.body.data.should.be.an('object');
+					res.body.data.should.have.property("_id");
+					res.body.data.should.have.property("foo")
+					res.body.data.foo.should.eql("Foo1");
+					done();
+				});
 		});
 	});
 
@@ -308,31 +399,31 @@ describe('Test', () => {
 				val: "val1"
 			}
 			chai.request(server)
-			.post("/api/link")
-			.auth(init.email, init.password)
-			.send(data)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data.should.be.an('object');
-				res.body.data.should.have.property("_id");
-				res.body.data.should.have.property("name")
-				res.body.data.name.should.eql("name1");
-				link_id = res.body.data._id;
-				done();
-			});
+				.post("/api/link")
+				.auth(init.email, init.password)
+				.send(data)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data.should.be.an('object');
+					res.body.data.should.have.property("_id");
+					res.body.data.should.have.property("name")
+					res.body.data.name.should.eql("name1");
+					link_id = res.body.data._id;
+					done();
+				});
 		});
 		it("should link a LINK item to a TEST", done => {
 			chai.request(server)
-			.put("/api/test/" + post_id)
-			.auth(init.email, init.password)
-			.send({link_id})
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data.should.be.an('object');
-				res.body.data.should.have.property("link_id")
-				res.body.data.link_id.should.eql(link_id);
-				done();
-			});
+				.put("/api/test/" + post_id)
+				.auth(init.email, init.password)
+				.send({ link_id })
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data.should.be.an('object');
+					res.body.data.should.have.property("link_id")
+					res.body.data.link_id.should.eql(link_id);
+					done();
+				});
 		});
 		var other_link_id = null;
 		it("should add another LINK item", done => {
@@ -341,47 +432,47 @@ describe('Test', () => {
 				val: "val2"
 			}
 			chai.request(server)
-			.post("/api/link")
-			.auth(init.email, init.password)
-			.send(data)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data.should.be.an('object');
-				res.body.data.should.have.property("_id");
-				res.body.data.should.have.property("name")
-				res.body.data.name.should.eql("name2");
-				other_link_id = res.body.data._id;
-				done();
-			});
+				.post("/api/link")
+				.auth(init.email, init.password)
+				.send(data)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data.should.be.an('object');
+					res.body.data.should.have.property("_id");
+					res.body.data.should.have.property("name")
+					res.body.data.name.should.eql("name2");
+					other_link_id = res.body.data._id;
+					done();
+				});
 		});
 		it("should link another LINK item to a TEST", done => {
 			chai.request(server)
-			.put("/api/test/" + post_id)
-			.auth(init.email, init.password)
-			.send({other_link_id})
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data.should.be.an('object');
-				res.body.data.should.have.property("other_link_id")
-				res.body.data.other_link_id.should.eql(other_link_id);
-				done();
-			});
+				.put("/api/test/" + post_id)
+				.auth(init.email, init.password)
+				.send({ other_link_id })
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data.should.be.an('object');
+					res.body.data.should.have.property("other_link_id")
+					res.body.data.other_link_id.should.eql(other_link_id);
+					done();
+				});
 		});
 		it("should non-descructively autopopulate on a single record", done => {
 			chai.request(server)
-			.get(`/api/test/${post_id}?populate=link`)
-			.auth(init.email, init.password)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.should.have.property("data");
-				res.body.data.should.have.property("link");
-				res.body.data.link.should.be.an('object');
-				res.body.data.link.name.should.eql("name1");
-				res.body.data.link.val.should.eql("val1");
-				res.body.data.should.have.property("link_id");
-				res.body.data.link_id.should.be.eql(link_id);
-				done();
-			});
+				.get(`/api/test/${post_id}?populate=link`)
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.should.have.property("data");
+					res.body.data.should.have.property("link");
+					res.body.data.link.should.be.an('object');
+					res.body.data.link.name.should.eql("name1");
+					res.body.data.link.val.should.eql("val1");
+					res.body.data.should.have.property("link_id");
+					res.body.data.link_id.should.be.eql(link_id);
+					done();
+				});
 		});
 		it("should non-descructively autopopulate on a single record to a specific virtual", done => {
 			chai.request(server)
@@ -401,20 +492,20 @@ describe('Test', () => {
 		});
 		it("should autopopulate on all records", done => {
 			chai.request(server)
-			.get(`/api/test?autopopulate=true`)
-			.auth(init.email, init.password)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data[0].should.have.property("link")
-				res.body.data[0].link.should.be.an('object');
-				res.body.data[0].link.name.should.eql("name1");
-				res.body.data[0].link.val.should.eql("val1");
-				res.body.data[0].should.have.property("other_link")
-				res.body.data[0].other_link.should.be.an('object');
-				res.body.data[0].other_link.name.should.eql("name2");
-				res.body.data[0].other_link.val.should.eql("val2");
-				done();
-			});
+				.get(`/api/test?autopopulate=true`)
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data[0].should.have.property("link")
+					res.body.data[0].link.should.be.an('object');
+					res.body.data[0].link.name.should.eql("name1");
+					res.body.data[0].link.val.should.eql("val1");
+					res.body.data[0].should.have.property("other_link")
+					res.body.data[0].other_link.should.be.an('object');
+					res.body.data[0].other_link.name.should.eql("name2");
+					res.body.data[0].other_link.val.should.eql("val2");
+					done();
+				});
 		});
 		it("should autopopulate on a single records", done => {
 			chai.request(server)
@@ -435,123 +526,123 @@ describe('Test', () => {
 		});
 		it("should non-destructively populate link on a single record", done => {
 			chai.request(server)
-			.get(`/api/test/${post_id}?populate=link`)
-			.auth(init.email, init.password)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.should.have.property("data");
-				res.body.data.should.have.property("link")
-				res.body.data.link.should.be.an('object');
-				res.body.data.link.name.should.eql("name1");
-				res.body.data.link.val.should.eql("val1");
-				res.body.data.link_id.should.be.eql(link_id);
-				done();
-			});
+				.get(`/api/test/${post_id}?populate=link`)
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.should.have.property("data");
+					res.body.data.should.have.property("link")
+					res.body.data.link.should.be.an('object');
+					res.body.data.link.name.should.eql("name1");
+					res.body.data.link.val.should.eql("val1");
+					res.body.data.link_id.should.be.eql(link_id);
+					done();
+				});
 		});
 		it("should populate link_id on all records", done => {
 			chai.request(server)
-			.get(`/api/test?populate=link`)
-			.auth(init.email, init.password)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data[0].should.have.property("link")
-				res.body.data[0].link.should.be.an('object');
-				res.body.data[0].link.name.should.eql("name1");
-				res.body.data[0].link.val.should.eql("val1");
-				res.body.data[0].link_id.should.be.eql(link_id);
-				done();
-			});
+				.get(`/api/test?populate=link`)
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data[0].should.have.property("link")
+					res.body.data[0].link.should.be.an('object');
+					res.body.data[0].link.name.should.eql("name1");
+					res.body.data[0].link.val.should.eql("val1");
+					res.body.data[0].link_id.should.be.eql(link_id);
+					done();
+				});
 		});
 		it("should populate just val from link_id on a single record", done => {
 			chai.request(server)
-			.get(`/api/test/${post_id}?populate[link]=val`)
-			.auth(init.email, init.password)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.should.have.property("data");
-				res.body.data.link.should.have.property("val")
-				res.body.data.link.should.not.have.property("name")
-				res.body.data.link.should.be.an('object');
-				res.body.data.link.val.should.eql("val1");
-				done();
-			});
+				.get(`/api/test/${post_id}?populate[link]=val`)
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.should.have.property("data");
+					res.body.data.link.should.have.property("val")
+					res.body.data.link.should.not.have.property("name")
+					res.body.data.link.should.be.an('object');
+					res.body.data.link.val.should.eql("val1");
+					done();
+				});
 		});
 		it("should populate just val from link_id on all records", done => {
 			chai.request(server)
-			.get(`/api/test?populate[link]=val`)
-			.auth(init.email, init.password)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data[0].link.should.have.property("val")
-				res.body.data[0].link.should.not.have.property("name")
-				res.body.data[0].link.val.should.eql("val1");
-				done();
-			});
+				.get(`/api/test?populate[link]=val`)
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data[0].link.should.have.property("val")
+					res.body.data[0].link.should.not.have.property("name")
+					res.body.data[0].link.val.should.eql("val1");
+					done();
+				});
 		});
 		it("should populate name and val from link_id on a single record", done => {
 			chai.request(server)
-			.get(`/api/test/${post_id}?populate[link]=val,name`)
-			.auth(init.email, init.password)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.should.have.property("data");
-				res.body.data.link.should.have.property("val")
-				res.body.data.link.should.have.property("name")
-				res.body.data.link.should.be.an('object');
-				res.body.data.link.val.should.eql("val1");
-				done();
-			});
+				.get(`/api/test/${post_id}?populate[link]=val,name`)
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.should.have.property("data");
+					res.body.data.link.should.have.property("val")
+					res.body.data.link.should.have.property("name")
+					res.body.data.link.should.be.an('object');
+					res.body.data.link.val.should.eql("val1");
+					done();
+				});
 		});
 		it("should populate name and val from link_id on all records", done => {
 			chai.request(server)
-			.get(`/api/test?populate[link]=val,name`)
-			.auth(init.email, init.password)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data[0].link.should.have.property("val")
-				res.body.data[0].link.should.have.property("name")
-				res.body.data[0].link.val.should.eql("val1");
-				done();
-			});
+				.get(`/api/test?populate[link]=val,name`)
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data[0].link.should.have.property("val")
+					res.body.data[0].link.should.have.property("name")
+					res.body.data[0].link.val.should.eql("val1");
+					done();
+				});
 		});
 		it("should populate link_id and other_link_id on a single record", done => {
 			chai.request(server)
-			.get(`/api/test/${post_id}?populate[]=link&populate[]=other_link`)
-			.auth(init.email, init.password)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.should.have.property("data");
-				res.body.data.should.have.property("link")
-				res.body.data.link.should.be.an('object');
-				res.body.data.link.name.should.eql("name1");
-				res.body.data.link.val.should.eql("val1");
-				res.body.data.should.have.property("other_link");
-				res.body.data.other_link.should.be.an('object');
-				res.body.data.other_link.name.should.eql("name2");
-				res.body.data.other_link.val.should.eql("val2");
-				done();
-			});
+				.get(`/api/test/${post_id}?populate[]=link&populate[]=other_link`)
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.should.have.property("data");
+					res.body.data.should.have.property("link")
+					res.body.data.link.should.be.an('object');
+					res.body.data.link.name.should.eql("name1");
+					res.body.data.link.val.should.eql("val1");
+					res.body.data.should.have.property("other_link");
+					res.body.data.other_link.should.be.an('object');
+					res.body.data.other_link.name.should.eql("name2");
+					res.body.data.other_link.val.should.eql("val2");
+					done();
+				});
 		});
 		it("should populate link_id and other_link_id on all records", done => {
 			chai.request(server)
-			.get(`/api/test?populate[]=link&populate[]=other_link`)
-			.auth(init.email, init.password)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data[0].link.should.have.property("val")
-				res.body.data[0].link.should.have.property("name")
-				res.body.data[0].link.val.should.eql("val1");
-				res.body.data[0].other_link.should.have.property("val")
-				res.body.data[0].other_link.should.have.property("name")
-				res.body.data[0].other_link.val.should.eql("val2");
-				done();
-			});
+				.get(`/api/test?populate[]=link&populate[]=other_link`)
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data[0].link.should.have.property("val")
+					res.body.data[0].link.should.have.property("name")
+					res.body.data[0].link.val.should.eql("val1");
+					res.body.data[0].other_link.should.have.property("val")
+					res.body.data[0].other_link.should.have.property("name")
+					res.body.data[0].other_link.val.should.eql("val2");
+					done();
+				});
 		});
 		it("should link an array of links to TEST", done => {
 			chai.request(server)
 				.put("/api/test/" + post_id)
 				.auth(init.email, init.password)
-				.send({ array_link_id: [ link_id, other_link_id ] })
+				.send({ array_link_id: [link_id, other_link_id] })
 				.end((err, res) => {
 					res.should.have.status(200);
 					res.body.data.should.be.an('object');
@@ -579,37 +670,37 @@ describe('Test', () => {
 			it("it should POST a complex query", (done) => {
 				var query = {
 					"$and": [
-						{ 
+						{
 							"foo": {
 								"$regex": "foo",
 								"$options": "i"
 							}
 						},
-						{	
+						{
 							"bar": "Bar"
 						}
 					]
 				};
 				chai.request(server)
-				.post("/query/test")
-				.auth(init.email, init.password)
-				.send({query})
-				.end((err, res) => {
-					res.should.have.status(200);
-					res.body.data.should.be.an('array');
-					res.body.data[0].should.have.property("_id");
-					res.body.data[0].should.have.property("foo");
-					res.body.data[0].should.have.property("bar");
-					res.body.data[0].should.have.property("yack").which.should.be.an("object");
-					res.body.data[0].should.have.property("shmack");
-					res.body.data[0].shmack.should.be.an("array");
-					res.body.data[0].foo.should.be.a("string");
-					res.body.data[0].bar.should.be.a("string");
-					res.body.data[0].foo.should.eql("Foo1");
-					res.body.data[0].bar.should.eql("Bar");
-					objectid = res.body.data[0]._id;
-					done();
-				});
+					.post("/query/test")
+					.auth(init.email, init.password)
+					.send({ query })
+					.end((err, res) => {
+						res.should.have.status(200);
+						res.body.data.should.be.an('array');
+						res.body.data[0].should.have.property("_id");
+						res.body.data[0].should.have.property("foo");
+						res.body.data[0].should.have.property("bar");
+						res.body.data[0].should.have.property("yack").which.should.be.an("object");
+						res.body.data[0].should.have.property("shmack");
+						res.body.data[0].shmack.should.be.an("array");
+						res.body.data[0].foo.should.be.a("string");
+						res.body.data[0].bar.should.be.a("string");
+						res.body.data[0].foo.should.eql("Foo1");
+						res.body.data[0].bar.should.eql("Bar");
+						objectid = res.body.data[0]._id;
+						done();
+					});
 			});
 		});
 		describe("/POST aggregate", () => {
@@ -618,17 +709,17 @@ describe('Test', () => {
 					{ $group: { _id: null, count: { $sum: 1 } } }
 				];
 				chai.request(server)
-				.post("/aggregate/test")
-				.auth(init.email, init.password)
-				.send({ query })
-				.end((err, res) => {
-					res.should.have.status(200);
-					res.body.data.should.be.an('array');
-					res.body.data[0].should.have.property("_id");
-					res.body.data[0].should.have.property("count");
-					res.body.data[0].count.should.eql(1);
-					done();
-				});
+					.post("/aggregate/test")
+					.auth(init.email, init.password)
+					.send({ query })
+					.end((err, res) => {
+						res.should.have.status(200);
+						res.body.data.should.be.an('array');
+						res.body.data[0].should.have.property("_id");
+						res.body.data[0].should.have.property("count");
+						res.body.data[0].count.should.eql(2);
+						done();
+					});
 			});
 		});
 		describe("/POST aggregate", () => {
@@ -637,23 +728,23 @@ describe('Test', () => {
 					{ $group: { _id: null, count: { $sum: 1 } } }
 				];
 				chai.request(server)
-				.post("/aggregate/test")
-				.auth(init.email, init.password)
-				.send(query)
-				.end((err, res) => {
-					res.should.have.status(200);
-					res.body.data.should.be.an('array');
-					res.body.data[0].should.have.property("_id");
-					res.body.data[0].should.have.property("count");
-					res.body.data[0].count.should.eql(1);
-					done();
-				});
+					.post("/aggregate/test")
+					.auth(init.email, init.password)
+					.send(query)
+					.end((err, res) => {
+						res.should.have.status(200);
+						res.body.data.should.be.an('array');
+						res.body.data[0].should.have.property("_id");
+						res.body.data[0].should.have.property("count");
+						res.body.data[0].count.should.eql(2);
+						done();
+					});
 			});
 		});
 		describe("/POST aggregate", () => {
 			it("it should POST an aggregate query with calculated Date", (done) => {
 				var query = [
-					{ 
+					{
 						$match: {
 							"createdAt": {
 								"$gte": "new Date(\"2020-01-01\")"
@@ -663,23 +754,23 @@ describe('Test', () => {
 					{ $group: { _id: null, count: { $sum: 1 } } }
 				];
 				chai.request(server)
-				.post("/aggregate/test")
-				.auth(init.email, init.password)
-				.send({ query })
-				.end((err, res) => {
-					res.should.have.status(200);
-					res.body.data.should.be.an('array');
-					res.body.data[0].should.have.property("_id");
-					res.body.data[0].should.have.property("count");
-					res.body.data[0].count.should.eql(1);
-					done();
-				});
+					.post("/aggregate/test")
+					.auth(init.email, init.password)
+					.send({ query })
+					.end((err, res) => {
+						res.should.have.status(200);
+						res.body.data.should.be.an('array');
+						res.body.data[0].should.have.property("_id");
+						res.body.data[0].should.have.property("count");
+						res.body.data[0].count.should.eql(2);
+						done();
+					});
 			});
 		});
 		describe("/POST aggregate", () => {
 			it("it should POST an aggregate query with calculated relative_date", (done) => {
 				var query = [
-					{ 
+					{
 						$match: {
 							"createdAt": {
 								"$gte": "relative_date(-1, \"days\")",
@@ -690,23 +781,23 @@ describe('Test', () => {
 					{ $group: { _id: null, count: { $sum: 1 } } }
 				];
 				chai.request(server)
-				.post("/aggregate/test")
-				.auth(init.email, init.password)
-				.send({ query })
-				.end((err, res) => {
-					res.should.have.status(200);
-					res.body.data.should.be.an('array');
-					res.body.data[0].should.have.property("_id");
-					res.body.data[0].should.have.property("count");
-					res.body.data[0].count.should.eql(1);
-					done();
-				});
+					.post("/aggregate/test")
+					.auth(init.email, init.password)
+					.send({ query })
+					.end((err, res) => {
+						res.should.have.status(200);
+						res.body.data.should.be.an('array');
+						res.body.data[0].should.have.property("_id");
+						res.body.data[0].should.have.property("count");
+						res.body.data[0].count.should.eql(2);
+						done();
+					});
 			});
 		});
 		describe("/POST aggregate", () => {
 			it("it should POST an aggregate query with calculated ObjectId", (done) => {
 				var query = [
-					{ 
+					{
 						$match: {
 							"_id": `ObjectId("${objectid}")`
 						}
@@ -714,17 +805,17 @@ describe('Test', () => {
 					{ $group: { _id: null, count: { $sum: 1 } } }
 				];
 				chai.request(server)
-				.post("/aggregate/test")
-				.auth(init.email, init.password)
-				.send({ query })
-				.end((err, res) => {
-					res.should.have.status(200);
-					res.body.data.should.be.an('array');
-					res.body.data[0].should.have.property("_id");
-					res.body.data[0].should.have.property("count");
-					res.body.data[0].count.should.eql(1);
-					done();
-				});
+					.post("/aggregate/test")
+					.auth(init.email, init.password)
+					.send({ query })
+					.end((err, res) => {
+						res.should.have.status(200);
+						res.body.data.should.be.an('array');
+						res.body.data[0].should.have.property("_id");
+						res.body.data[0].should.have.property("count");
+						res.body.data[0].count.should.eql(1);
+						done();
+					});
 			});
 		});
 		describe("/POST aggregate allowDiskUse", () => {
@@ -741,7 +832,7 @@ describe('Test', () => {
 						res.body.data.should.be.an('array');
 						res.body.data[0].should.have.property("_id");
 						res.body.data[0].should.have.property("count");
-						res.body.data[0].count.should.eql(1);
+						res.body.data[0].count.should.eql(2);
 						done();
 					});
 			});
@@ -757,7 +848,7 @@ describe('Test', () => {
 						res.body.data[0].should.have.property("foo");
 						res.body.data[0].foo.should.eql("Foo1");
 						res.body.should.have.property("count");
-						res.body.count.should.eql(1);
+						res.body.count.should.eql(2);
 						done();
 					});
 			})
@@ -826,7 +917,7 @@ describe('Test', () => {
 						res.body.data[1].should.have.property("foo");
 						res.body.data[2].should.have.property("foo");
 						res.body.should.have.property("count");
-						res.body.count.should.eql(3);
+						res.body.count.should.eql(4);
 						done();
 					});
 			});
@@ -946,34 +1037,34 @@ describe('Test', () => {
 				bar: "Gloop"
 			}
 			chai.request(server)
-			.post("/api/link")
-			.auth(init.email, init.password)
-			.send(data)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data.should.be.an('object');
-				res.body.data.should.have.property("_id");
-				res.body.data.should.have.property("name")
-				res.body.data.name.should.eql("deltest_name");
-				link_id = res.body.data._id;
-				done();
-			});
+				.post("/api/link")
+				.auth(init.email, init.password)
+				.send(data)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data.should.be.an('object');
+					res.body.data.should.have.property("_id");
+					res.body.data.should.have.property("name")
+					res.body.data.name.should.eql("deltest_name");
+					link_id = res.body.data._id;
+					done();
+				});
 		});
 		it("should link a LINK item to a TEST", done => {
 			chai.request(server)
-			.post("/api/test")
-			.auth(init.email, init.password)
-			.send({
-				link_id
-			})
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data.should.be.an('object');
-				res.body.data.should.have.property("link_id")
-				res.body.data.link_id.should.eql(link_id);
-				test_with_links_id = res.body.data._id;
-				done();
-			});
+				.post("/api/test")
+				.auth(init.email, init.password)
+				.send({
+					link_id
+				})
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data.should.be.an('object');
+					res.body.data.should.have.property("link_id")
+					res.body.data.link_id.should.eql(link_id);
+					test_with_links_id = res.body.data._id;
+					done();
+				});
 		});
 		it("should fail because a parent item exists", (done) => {
 			chai.request(server)
@@ -1021,35 +1112,35 @@ describe('Test', () => {
 				bar: "Yoop"
 			}
 			chai.request(server)
-			.post("/api/link")
-			.auth(init.email, init.password)
-			.send(data)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data.should.be.an('object');
-				res.body.data.should.have.property("_id");
-				res.body.data.should.have.property("name")
-				res.body.data.name.should.eql("permdeltest_name");
-				link_id = res.body.data._id;
-				done();
-			});
+				.post("/api/link")
+				.auth(init.email, init.password)
+				.send(data)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data.should.be.an('object');
+					res.body.data.should.have.property("_id");
+					res.body.data.should.have.property("name")
+					res.body.data.name.should.eql("permdeltest_name");
+					link_id = res.body.data._id;
+					done();
+				});
 		});
 		it("should link a LINK item to a TEST", done => {
 			chai.request(server)
-			.post("/api/test")
-			.auth(init.email, init.password)
-			.send({
-				link_id,
-				bar: "link1"
-			})
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data.should.be.an('object');
-				res.body.data.should.have.property("link_id")
-				res.body.data.link_id.should.eql(link_id);
-				test_with_links_id = res.body.data._id;
-				done();
-			});
+				.post("/api/test")
+				.auth(init.email, init.password)
+				.send({
+					link_id,
+					bar: "link1"
+				})
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data.should.be.an('object');
+					res.body.data.should.have.property("link_id")
+					res.body.data.link_id.should.eql(link_id);
+					test_with_links_id = res.body.data._id;
+					done();
+				});
 		});
 		it("should fail because a parent item exists", (done) => {
 			chai.request(server)
@@ -1089,96 +1180,96 @@ describe('Test', () => {
 				email: "plus+user@gmail.com"
 			};
 			chai.request(server)
-			.post("/api/user")
-			.auth(init.admin_email, init.admin_password)
-			.send(user)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data.should.have.property("_id");
-				done();
-			});
+				.post("/api/user")
+				.auth(init.admin_email, init.admin_password)
+				.send(user)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data.should.have.property("_id");
+					done();
+				});
 		});
 		it("it should GET a user with a + in email", (done) => {
 			chai.request(server)
-			.get("/api/user?filter[email]=plus%2Buser@gmail.com")
-			.auth(init.admin_email, init.admin_password)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.data[0].should.have.property("_id");
-				done();
-			});
+				.get("/api/user?filter[email]=plus%2Buser@gmail.com")
+				.auth(init.admin_email, init.admin_password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.data[0].should.have.property("_id");
+					done();
+				});
 		});
 	});
 
 	describe("Error Handling", () => {
-		it ("should get an error", (done) => {
+		it("should get an error", (done) => {
 			chai.request(server)
-			.post("/api/test")
-			.auth(init.email, init.password)
-			.send({
-				error: true,
-				bar: "Throw an error"
-			})
-			.end((err, res) => {
-				res.should.have.status(418);
-				res.body.message.should.equal(`I'm a teapot`);
-				done();
-			});
+				.post("/api/test")
+				.auth(init.email, init.password)
+				.send({
+					error: true,
+					bar: "Throw an error"
+				})
+				.end((err, res) => {
+					res.should.have.status(418);
+					res.body.message.should.equal(`I'm a teapot`);
+					done();
+				});
 		})
 	});
 
 	describe("Caching", () => {
-		it ("should give us cache stats", (done) => {
-			chai.request(server)
-			.get("/cache/stats")
-			.end((err, res) => {
-				// console.log(res.body);
-				res.should.have.status(200);
-				res.body.should.have.property("hits");
-				done();
-			});
+		it("should give us cache stats", (done) => {
+			chai.request(server)
+				.get("/cache/stats")
+				.end((err, res) => {
+					// console.log(res.body);
+					res.should.have.status(200);
+					res.body.should.have.property("hits");
+					done();
+				});
 		})
-		it ("should clear the cache stats", (done) => {
+		it("should clear the cache stats", (done) => {
 			chai.request(server)
-			.get("/cache/clear")
-			.end((err, res) => {
-				// console.log(res.body);
-				res.should.have.status(200);
-				done();
-			});
+				.get("/cache/clear")
+				.end((err, res) => {
+					// console.log(res.body);
+					res.should.have.status(200);
+					done();
+				});
 		});
-		it ("should get an uncached request", (done) => {
+		it("should get an uncached request", (done) => {
 			chai.request(server)
-			.get("/api/test")
-			.auth(init.email, init.password)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.headers.should.have.property("jxp-cache");
-				res.headers["jxp-cache"].should.equal("miss");
-				done();
-			});
+				.get("/api/test")
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.headers.should.have.property("jxp-cache");
+					res.headers["jxp-cache"].should.equal("miss");
+					done();
+				});
 		});
-		it ("should get an cached request", (done) => {
+		it("should get an cached request", (done) => {
 			chai.request(server)
-			.get("/api/test")
-			.auth(init.email, init.password)
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.headers.should.have.property("jxp-cache");
-				res.headers["jxp-cache"].should.equal("hit");
-				done();
-			});
+				.get("/api/test")
+				.auth(init.email, init.password)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.headers.should.have.property("jxp-cache");
+					res.headers["jxp-cache"].should.equal("hit");
+					done();
+				});
 		});
-		it ("should give us cache stats", (done) => {
+		it("should give us cache stats", (done) => {
 			chai.request(server)
-			.get("/cache/stats")
-			.end((err, res) => {
-				res.should.have.status(200);
-				res.body.should.have.property("hits");
-				res.body.hits.should.be.greaterThan(0);
-				res.body.misses.should.be.greaterThan(0);
-				done();
-			});
+				.get("/cache/stats")
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.should.have.property("hits");
+					res.body.hits.should.be.greaterThan(0);
+					res.body.misses.should.be.greaterThan(0);
+					done();
+				});
 		})
 	});
 	describe("Cache invalidating", () => {
@@ -1210,7 +1301,7 @@ describe('Test', () => {
 					should.equal(res.body.data[0].link, null);
 					done();
 				});
-			});
+		});
 		let link_id;
 		it("should add a link record", done => {
 			chai.request(server)