Models: fillup default values before validation

Author: jsmrcaga

lib/models/fields.js

@@ -455,6 +455,10 @@ function fillup(Model, values={}) {
 	const missing_keys = Object.keys(schema).filter(k => !result_keys.includes(k));
 
 	for(let k of missing_keys) {
+		if(schema[k] instanceof PrimaryKey) {
+			continue;
+		}
+
 		if(schema[k].defaultValue !== undefined){
 			values[k] = schema[k].get_default();
 		}

lib/models/model.js

@@ -16,21 +16,23 @@ class Model {
 			throw new Error('Models can only be instanciated with an object as parameter');
 		}
 
+		// Will fill up "from db" as well
+		const values = Fields.fillup(this.constructor, params);
+
 		if(validate) {
 			// Validate object
-			Fields.validate(this, params);
+			Fields.validate(this, values);
 		}
 
 		// Create PK if needed
-		let { pk, key } = Fields.get_pk(this, params);
+		let { pk, key } = Fields.get_pk(this, values);
 
 		this[key] = pk;
 		this.__updated = __updated;
 		this.__created = __created;
 		this.__deleted = __deleted;
 
 		// Populate with validation having been performed earlier
-		const values = Fields.fillup(this.constructor, params);
 
 		for(let [k, v] of Object.entries(values)) {
 			this[k] = v;

test/models.js

@@ -418,7 +418,7 @@ describe('Models', () => {
 			TestModel.VALIDATION_SCHEMA = {
 				test_field: new Fields.String({ defaultValue: () => 'functional vlaue' }),
 				test_field_auto: new Fields.Number({ defaultValue: 54 }),
-				default_empty_string: new Fields.String({ defaultValue: '' }),
+				default_empty_string: new Fields.String({ defaultValue: '', blank: true }),
 				default_zero: new Fields.Number({ defaultValue: 0 }),
 				default_null: new Fields.Number({ nullable: true, defaultValue: null }),
 				default_false: new Fields.Boolean({ nullable: true, defaultValue: false }),