Added set/get required property for schema items. Closes issue #6

server/dist/definitions/modepress-api.d.ts

@@ -320,6 +320,18 @@ declare module Modepress
         */
         public setSensitive(val: boolean);
 
+        /**
+        * Gets if this item is required. This will throw an error on the item if the value is not set before validation.
+        * @returns {boolean}
+        */
+        public getRequired(): boolean;
+
+        /**
+        * Sets if this item is required. This will throw an error on the item if the value is not set before validation.
+        * @returns {SchemaItem<T>}
+        */
+        public setRequired(val: boolean);
+
         /**
         * Gets if this item is indexable by mongodb
         * @returns {boolean}

server/dist/src/models/model.js

@@ -269,7 +269,7 @@ var Model = (function () {
                     if (data)
                         instance.schema.set(data);
                     // Make sure the new updates are valid
-                    if (!instance.schema.validate()) {
+                    if (!instance.schema.validate(false)) {
                         if (instance.schema.error)
                             toRet.error = true;
                         toRet.tokens.push({ error: instance.schema.error, instance: instance });
@@ -397,7 +397,7 @@ var Model = (function () {
                     // Get the schema
                     var schema = instance.schema;
                     // Make sure the parameters are valid
-                    if (!schema.validate()) {
+                    if (!schema.validate(true)) {
                         reject(new Error(schema.error));
                         return;
                     }

server/dist/src/models/posts-model.js

@@ -13,7 +13,7 @@ var PostsModel = (function (_super) {
         _super.call(this, "posts");
         this.defaultSchema.add(new schema_item_factory_1.text("author", "", 1));
         this.defaultSchema.add(new schema_item_factory_1.text("title", "", 1));
-        this.defaultSchema.add(new schema_item_factory_1.text("slug", "", 1, 512)).setUnique(true);
+        this.defaultSchema.add(new schema_item_factory_1.text("slug", "", 1, 512)).setUnique(true).setRequired(true);
         this.defaultSchema.add(new schema_item_factory_1.text("brief", ""));
         this.defaultSchema.add(new schema_item_factory_1.text("featuredImage", ""));
         this.defaultSchema.add(new schema_item_factory_1.html("content", "", schema_html_1.SchemaHtml.defaultTags.concat("img"), undefined, false));

server/dist/src/models/schema-items/schema-bool.js

@@ -35,6 +35,9 @@ var SchemaBool = (function (_super) {
     * @returns {boolean | string} Returns true if successful or an error message string if unsuccessful
     */
     SchemaBool.prototype.validate = function () {
+        var val = _super.prototype.validate.call(this);
+        if (!val)
+            return false;
         return true;
     };
     /**

server/dist/src/models/schema-items/schema-item.js

@@ -10,6 +10,8 @@ var SchemaItem = (function () {
         this._unique = false;
         this._uniqueIndexer = false;
         this._indexable = false;
+        this._required = false;
+        this._modified = false;
     }
     /**
     * Creates a clone of this item
@@ -20,6 +22,7 @@ var SchemaItem = (function () {
         copy = copy === undefined ? new SchemaItem(this.name, this.value, this.sensitive) : copy;
         copy._unique = this._unique;
         copy._uniqueIndexer = this._uniqueIndexer;
+        copy._required = this._required;
         copy.sensitive = this.sensitive;
         return copy;
     };
@@ -37,6 +40,19 @@ var SchemaItem = (function () {
         return this;
     };
     /**
+    * Gets if this item is required. If true, then validations will fail if they are not specified
+    * @returns {boolean}
+    */
+    SchemaItem.prototype.getRequired = function () { return this._required; };
+    /**
+    * Sets if this item is required. If true, then validations will fail if they are not specified
+    * @returns {SchemaItem}
+    */
+    SchemaItem.prototype.setRequired = function (val) {
+        this._required = val;
+        return this;
+    };
+    /**
     * Gets if this item represents a unique value in the database. An example might be a username
     * @returns {boolean}
     */
@@ -74,6 +90,13 @@ var SchemaItem = (function () {
         return this.sensitive;
     };
     /**
+    * Gets if this item has been edited since its creation
+    * @returns {boolean}
+    */
+    SchemaItem.prototype.getModified = function () {
+        return this._modified;
+    };
+    /**
     * Sets if this item is sensitive
     * @returns {SchemaItem<T>}
     */
@@ -103,6 +126,7 @@ var SchemaItem = (function () {
     * @returns {SchemaValue}
     */
     SchemaItem.prototype.setValue = function (val) {
+        this._modified = true;
         return this.value = val;
     };
     return SchemaItem;

server/dist/src/models/schema.js

@@ -79,12 +79,17 @@ var Schema = (function () {
     };
     /**
     * Checks the value stored to see if its correct in its current form
+    * @param {boolean} checkForRequiredFields If true, then required fields must be present otherwise an error is flagged
     * @returns {boolean} Returns true if successful
     */
-    Schema.prototype.validate = function () {
+    Schema.prototype.validate = function (checkForRequiredFields) {
         var items = this.items;
         this.error = "";
         for (var i = 0, l = items.length; i < l; i++) {
+            if (checkForRequiredFields && !items[i].getModified() && items[i].getRequired()) {
+                this.error = items[i].name + " is required";
+                return false;
+            }
             var validated = items[i].validate();
             if (validated !== true) {
                 this.error = validated;

server/src/definitions/custom/modepress-api.d.ts

@@ -320,6 +320,18 @@
         */
         public setSensitive(val: boolean);
 
+        /**
+        * Gets if this item is required. This will throw an error on the item if the value is not set before validation.
+        * @returns {boolean}
+        */
+        public getRequired(): boolean;
+
+        /**
+        * Sets if this item is required. This will throw an error on the item if the value is not set before validation.
+        * @returns {SchemaItem<T>}
+        */
+        public setRequired(val: boolean);
+
         /**
         * Gets if this item is indexable by mongodb
         * @returns {boolean}

server/src/models/model.ts

@@ -353,7 +353,7 @@ export class Model
                         instance.schema.set(data);
 
                     // Make sure the new updates are valid
-                    if (!instance.schema.validate())
+                    if (!instance.schema.validate(false))
                     {
                         if (instance.schema.error)
                             toRet.error = true;
@@ -527,7 +527,7 @@ export class Model
 					var schema = instance.schema;
 
 					// Make sure the parameters are valid
-					if (!schema.validate())
+					if (!schema.validate(true))
 					{
 						reject(new Error(schema.error));
 						return;

server/src/models/posts-model.ts

@@ -11,7 +11,7 @@ export class PostsModel extends Model
 
         this.defaultSchema.add(new text("author", "", 1));
         this.defaultSchema.add(new text("title", "", 1));
-        this.defaultSchema.add(new text("slug", "", 1, 512)).setUnique(true);
+        this.defaultSchema.add(new text("slug", "", 1, 512)).setUnique(true).setRequired(true);
         this.defaultSchema.add(new text("brief", ""));
         this.defaultSchema.add(new text("featuredImage", ""));
         this.defaultSchema.add(new html("content", "", SchemaHtml.defaultTags.concat("img"), undefined, false));

server/src/models/schema-items/schema-bool.ts

@@ -34,6 +34,10 @@ export class SchemaBool extends SchemaItem<boolean>
 	*/
 	public validate(): boolean | string
 	{
+        var val = super.validate();
+        if (!val)
+            return false;
+
         return true;
     }
 

server/src/models/schema-items/schema-item.ts

@@ -9,6 +9,8 @@ export class SchemaItem<T>
     private _unique: boolean;
     private _uniqueIndexer: boolean;
     private _indexable: boolean;
+    private _required: boolean;
+    private _modified: boolean;
 
     constructor(name: string, value: T, sensitive: boolean)
 	{
@@ -18,6 +20,8 @@ export class SchemaItem<T>
         this._unique = false;
         this._uniqueIndexer = false;
         this._indexable = false;
+        this._required = false;
+        this._modified = false;
 	}
 
 	/**
@@ -30,6 +34,7 @@ export class SchemaItem<T>
         copy = copy === undefined ? new SchemaItem(this.name, this.value, this.sensitive) : copy;
         copy._unique = this._unique;
         copy._uniqueIndexer = this._uniqueIndexer;
+        copy._required = this._required;
         copy.sensitive = this.sensitive;
 		return copy;
     }
@@ -39,7 +44,7 @@ export class SchemaItem<T>
     * @returns {boolean}
     */
     public getIndexable(): boolean { return this._indexable; }
-    
+
     /**
     * Sets if this item is indexable by mongodb
     * @returns {SchemaItem}
@@ -50,6 +55,22 @@ export class SchemaItem<T>
         return this;
     }
 
+    /**
+    * Gets if this item is required. If true, then validations will fail if they are not specified
+    * @returns {boolean}
+    */
+    public getRequired(): boolean { return this._required; }
+
+    /**
+    * Sets if this item is required. If true, then validations will fail if they are not specified
+    * @returns {SchemaItem}
+    */
+    public setRequired(val?: boolean): SchemaItem<T>
+    {
+        this._required = val;
+        return this;
+    }
+
     /**
 	* Gets if this item represents a unique value in the database. An example might be a username
 	* @returns {boolean}
@@ -67,15 +88,15 @@ export class SchemaItem<T>
     }
 
     /**
-    * Gets if this item must be indexed when searching for uniqueness. For example, an item 'name' might be set as unique. But 
+    * Gets if this item must be indexed when searching for uniqueness. For example, an item 'name' might be set as unique. But
     * we might not be checking uniqueness for all items where name is the same. It might be where name is the same, but only in
     * a given project. In this case the project item is set as a uniqueIndexer
     * @returns {boolean}
     */
     public getUniqueIndexer(): boolean { return this._uniqueIndexer; }
 
     /**
-	* Sets if this item must be indexed when searching for uniqueness. For example, an item 'name' might be set as unique. But 
+	* Sets if this item must be indexed when searching for uniqueness. For example, an item 'name' might be set as unique. But
     * we might not be checking uniqueness for all items where name is the same. It might be where name is the same, but only in
     * a given project. In this case the project item is set as a uniqueIndexer
 	* @returns {SchemaItem}
@@ -95,6 +116,15 @@ export class SchemaItem<T>
         return this.sensitive;
     }
 
+    /**
+    * Gets if this item has been edited since its creation
+    * @returns {boolean}
+    */
+    public getModified(): boolean
+    {
+        return this._modified;
+    }
+
     /**
     * Sets if this item is sensitive
     * @returns {SchemaItem<T>}
@@ -131,6 +161,7 @@ export class SchemaItem<T>
 	*/
     public setValue(val : T): T
     {
+        this._modified = true;
         return this.value = val;
     }
 }

server/src/models/schema.ts

@@ -110,15 +110,22 @@ export class Schema
 
 	/**
 	* Checks the value stored to see if its correct in its current form
-	* @returns {boolean} Returns true if successful
+	* @param {boolean} checkForRequiredFields If true, then required fields must be present otherwise an error is flagged
+    * @returns {boolean} Returns true if successful
 	*/
-	public validate(): boolean
+	public validate( checkForRequiredFields: boolean ): boolean
 	{
 		var items = this.items;
 		this.error = "";
 
 		for (var i = 0, l = items.length; i < l; i++)
 		{
+            if ( checkForRequiredFields && !items[i].getModified() && items[i].getRequired() )
+            {
+				this.error = `${items[i].name} is required`;
+				return false;
+			}
+
 			var validated = items[i].validate();
 			if (validated !== true)
 			{

test/tests.js

@@ -89,7 +89,7 @@ describe('Testing all post related endpoints', function() {
             });
     })
 
-    it('Cannot create post without title', function(done) {
+    it('Cannot create a post without title', function(done) {
         modepressAgent
             .post('/api/posts/create-post').set('Accept', 'application/json').expect(200).expect('Content-Type', /json/)
             .set('Cookie', adminCookie)
@@ -102,8 +102,21 @@ describe('Testing all post related endpoints', function() {
                 done();
             });
     })
+
+	 it('Cannot create a post without a slug field', function(done) {
+        modepressAgent
+            .post('/api/posts/create-post').set('Accept', 'application/json').expect(200).expect('Content-Type', /json/)
+            .set('Cookie', adminCookie)
+            .send( { title: "test" } )
+            .end(function(err, res) {
+                test
+                    .string(res.body.message).is("slug is required")
+					.bool(res.body.error).isTrue()
+                done();
+            });
+    })
 
-    it('Cannot create post without slug', function(done) {
+    it('Cannot create a post without slug', function(done) {
         modepressAgent
             .post('/api/posts/create-post').set('Accept', 'application/json').expect(200).expect('Content-Type', /json/)
             .set('Cookie', adminCookie)