work in progress

Author: Robb Sadler

src/core/@model/model-operators/from-db.spec.ts

@@ -471,7 +471,7 @@ describe('@Model.fromDb', () => {
  expect(result.leads.length).toBe(0);
  });
 
- fit('maps an array of sub documents from the DB to a resulting array of type model', () => {
+ it('maps an array of sub documents from the DB to a resulting array of type model', () => {
 
  const leadSubDocs = [
  {

src/core/@model/model-operators/from-db.ts

@@ -54,7 +54,6 @@ export function fromDb(json: any, options?: IFromDbOptions): object {
  return source;
  }
 
- console.log('=================='.zebra.green, JSON.stringify(target, null, 2).green);
  const dbOptionsByFieldName: Map<string, IDbOptions>
  = Reflect.getMetadata(dbSymbols.dbByFieldName, target) || new Map<string, IDbOptions>();
 
@@ -64,7 +63,6 @@ export function fromDb(json: any, options?: IFromDbOptions): object {
 
  // convert the DB key name to the Model key name
  const mapper = map(key, source[key], dbOptionsByFieldName);
- if (key === 'tag') console.log('================== mapper'.cyan, JSON.stringify(mapper, null, 2).cyan);
  const model = mapper.model;
 
  let nextTarget;
@@ -77,8 +75,6 @@ export function fromDb(json: any, options?: IFromDbOptions): object {
  + ` cannot be constructed`);
  }
 
- console.log('================== 111111'.zebra.green, JSON.stringify(target, null, 2).green);
-
  if (model || shouldRecurse(source[key])) {
 
  // if the key should be included
@@ -91,9 +87,10 @@ export function fromDb(json: any, options?: IFromDbOptions): object {
  const values = [];
 
  for (const src of source[key]) {
- console.log('==================src'.cyan, src);
- nextTarget = (model);
  values.push(Object.assign(new model(), mapDbToModel(src, nextTarget, map)));
+ nextTarget = (model)
+ ? Object.assign(new model(), target[mapper.newKey])
+ : target[mapper.newKey];
  }
  value = values;
 
@@ -108,23 +105,19 @@ export function fromDb(json: any, options?: IFromDbOptions): object {
  }
  }
  }
- console.log('================== >>>>>>>'.cyan, mapper.newKey);
  target[mapper.newKey] = value;
  }
 
  } else {
  // otherwise, map a property that has a primitive value or an ObjectID value
- if (mapper.newKey !== undefined) {
- console.log('================== %%%%%%'.cyan, `assigning ${source[key]} to ${mapper.newKey}`);
+ if (mapper.newKey !== undefined) {
  target[mapper.newKey] = (source[key] !== undefined && source[key] !== null)
  ? source[key]
  : nextTarget; // resolves issue #94
  }
  }
- console.log('================== 222222'.zebra.green, JSON.stringify(target, null, 2).green);
  }
 
- if (!!target.order) console.log('=================='.zebra.red, JSON.stringify(target, null, 2).red);
  return target;
  }