retold-data-service 1.0.0 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "retold-data-service",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Serve up a whole model!",
   "main": "source/Retold-Data-Service.js",
   "scripts": {

package/source/Cumulation-Settings-Default.js

@@ -10,7 +10,7 @@
 module.exports = (
 	{
 		// The server to connect to (with trailing forward slash)
-		Server: 'http://127.0.0.1:8080/',
+		Server: 'http://127.0.0.1:8088/1.0/',
 
 		// Any cookies to be sent
 		Cookies: {},

package/source/Cumulation.js

@@ -11,7 +11,7 @@ const libGraphGet = require('./GraphGet.js');
 */
 class Cumulation
 {
-	constructor(pFable, pRequestSettings, pModel)
+	constructor(pFable, pRequestSettings)
 	{
 		this._Dependencies = {};
 		this._Dependencies.underscore = require('underscore');
@@ -20,7 +20,7 @@ class Cumulation
 		this._Dependencies.cumulation = this;
 
         // We want to make sure these are unique settings trees for each Cumulation object created.
-		this._RequestSettings = JSON.parse(JSON.stringify(this._Dependencies.underscore.extend(JSON.parse(JSON.stringify(require('./Cumulation-Settings-Default.js'))), pSettings)));
+		this._RequestSettings = JSON.parse(JSON.stringify(this._Dependencies.underscore.extend(JSON.parse(JSON.stringify(require('./Cumulation-Settings-Default.js'))), pRequestSettings)));
 
 		// This has behaviors similar to bunyan, for consistency
 		this._Log = pFable.log;
@@ -31,7 +31,7 @@ class Cumulation
 	 * GET RECORDS (plural)
 	 * 
 	**/
-	getRecordsFromServerGeneric (pEntity, pRecordsString, fCallback)
+	fetchRecords (pEntity, pRecordsString, fCallback)
 	{
 		let tmpCallBack = (typeof(fCallback) === 'function') ? fCallback : ()=>{};
 		let tmpURL = this._RequestSettings.Server+pEntity+'s/'+pRecordsString;
@@ -51,7 +51,7 @@ class Cumulation
 
 		if (this._RequestSettings.DebugLog)
 			this._Log.debug(`Beginning GET plural request`,tmpRequestOptions);
-		let tmpRequestTime = this._Log.getTimeStamp();
+		//let tmpRequestTime = this._Log.getTimeStamp();
 
 		this._Dependencies.simpleget.get(tmpRequestOptions, (pError, pResponse)=>
 			{
@@ -59,15 +59,15 @@ class Cumulation
 				{
 					return tmpCallBack(pError);
 				}
-				if (this._RequestSettings.DebugLog)
-					this._Log.debug(`--> GET plural connected in ${this._Log.getTimeDelta(tmpRequestTime)}ms code ${pResponse.statusCode}`);
+				//if (this._RequestSettings.DebugLog)
+				//	this._Log.debug(`--> GET plural connected in ${this._Log.getTimeDelta(tmpRequestTime)}ms code ${pResponse.statusCode}`);
 
 				let tmpData = '';
 
 				pResponse.on('data', (pChunk)=>
 					{
-						if (this._RequestSettings.DebugLog)
-							this._Log.debug(`--> GET plural data chunk size ${pChunk.length}b received in ${this._Log.getTimeDelta(tmpRequestTime)}ms`);
+						//if (this._RequestSettings.DebugLog)
+						//	this._Log.debug(`--> GET plural data chunk size ${pChunk.length}b received in ${this._Log.getTimeDelta(tmpRequestTime)}ms`);
 						tmpData += pChunk;
 					});
 
@@ -79,7 +79,7 @@ class Cumulation
 						if (this._RequestSettings.DebugLog)
 						{
 							//this._Log.debug(`==> GET plural completed data size ${tmpData.length}b received in ${this._Log.getTimeDelta(tmpRequestTime)}ms`,tmpResult);
-							this._Log.debug(`==> GET plural completed data size ${tmpData.length}b (${tmpResult.length} records) received in ${this._Log.getTimeDelta(tmpRequestTime)}ms`);
+							//this._Log.debug(`==> GET plural completed data size ${tmpData.length}b (${tmpResult.length} records) received in ${this._Log.getTimeDelta(tmpRequestTime)}ms`);
 						}
 						tmpCallBack(pError, tmpResult);
 					});

package/source/GraphGet.js

@@ -14,15 +14,13 @@ var libUnderscore = require('underscore');
 
 class GraphGet
 {
-	constructor(pFable, pCumulation, pModel)
+	constructor(pFable, pModel)
 	{
-        this._Cumulation = pCumulation;
-
-        // Wire up logging
+      // Wire up logging
 		this.log = pFable.log;
 
 		// Wire up settings
-		this._Settings = pFable._Settings;
+		this._Settings = pFable.settings;
 
 		// Get the data model graph
 		this._DataModel = pModel;
@@ -237,12 +235,12 @@ class GraphGet
 		return fCallback(null, tmpValidFilters);
 	};
 
-	get(pEntityName, pFilterObject, fGetRecords, fCallback)
+	get(pEntityName, pFilterObject, pCumulation, fCallback)
 	{
 		// Get a set of EntityNames based on the FilterObject
 		if (this._Settings.DebugLog)
 			this.log.debug(`[${pEntityName}] Beginning to graph GET a set of records based on some filter criteria`,pFilterObject);
-		let tmpGraphGetTime = this.log.getTimeStamp();
+		//let tmpGraphGetTime = this.log.getTimeStamp();
 
 		let tmpGraphHints = {};
 		let tmpGraphIgnores = {};
@@ -457,7 +455,7 @@ class GraphGet
 
 							// TODO: This is sick.  Fix it.
 							tmpURIFilter += `/0/10000`;
-							fGetRecords(pFilter.SatisfyingJoin, tmpURIFilter,
+							pCumulation.fetchRecords(pFilter.SatisfyingJoin, tmpURIFilter,
 								(pError, pData)=>
 								{
 									tmpJoinedDataSets[pFilter.Entity] = pData;
@@ -586,7 +584,7 @@ class GraphGet
 					if (tmpURIFilter !== '')
 						tmpURIFilter += '/';
 					tmpURIFilter += tmpPagingString;
-					fGetRecords(pEntityName, tmpURIFilter,
+					pCumulation.fetchRecords(pEntityName, tmpURIFilter,
 						(pError, pData)=>
 						{
 							return fStageComplete(pError, pData, pValidFilters, pFinalFilters, pJoinedDataSets, pValidIdentities);
@@ -598,7 +596,8 @@ class GraphGet
 				if (pError)
 					this.log.error(`[${pEntityName}] Graph Filter operation failed due to error: ${pError}`);
 
-				this.log.debug(`[${pEntityName}] Graph Filter operation completed in ${this.log.getTimeDelta(tmpGraphGetTime)}ms`);
+				//this.log.debug(`[${pEntityName}] Graph Filter operation completed in ${this.log.getTimeDelta(tmpGraphGetTime)}ms`);
+				this.log.debug(`[${pEntityName}] Graph Filter operation completed`);
 
 				fCallback(pError, pRecords, pValidFilters, pFinalFilters, pJoinedDataSets, pValidIdentities);
 			});

package/source/Retold-Data-Service.js

@@ -9,6 +9,9 @@ const libMeadow = require('meadow');
 const libMeadowEndpoints = require('meadow-endpoints');
 
 const libProviderBase = require('./ProviderHelpers/Meadow-Provider-Helper-Base.js');
+
+const libGraphSolver = require('./GraphGet.js');
+const libCumulation = require('./Cumulation.js');
 /**
 * Retold Data Service
 * 
@@ -54,6 +57,8 @@ class RetoldDataService
 
 		this._Providers = {};
 
+		this._GraphSolver = false;
+
 		this.log = this._Fable.log;
 
 		// Load the configurations
@@ -138,6 +143,45 @@ class RetoldDataService
 					return fStageComplete();
 				},
 				(fStageComplete) =>
+				{
+					// Initialize the graph solver library
+					this.initializeGraphEndpoints();
+					// Map the graph endpoints to it
+					// TODO: Decide if this follows the Meadow pattern or some other prefix pattern
+					this._Orator.webServer.post(`/1.0/GraphRead/:Entity`,
+						(pRequest, pResponse, fNext) =>
+						{
+							let tmpGraphRequestEntity = pRequest.params.Entity;
+							let tmpGraphRequestFilter = pRequest.body;
+
+							// TODO: Discuss how to pass in request settings -- what was in there worked for the web client and works for tokens so maybe it's okay?
+							let tmpCumulation = new libCumulation(this._Fable, {});
+
+							this._GraphSolver.get(tmpGraphRequestEntity, tmpGraphRequestFilter, tmpCumulation,
+								(pError, pRecords, pValidFilters, pFinalFilters, pJoinedDataSets, pValidIdentities) =>
+								{
+									pResponse.send(
+										{
+											GraphRequestEntity: tmpGraphRequestEntity,
+											GraphRequestFilter: tmpGraphRequestFilter,
+
+											Records: pRecords,
+
+											ValidFilters: pValidFilters,
+											Finalfilters: pFinalFilters,
+
+											JoinedDataSets: pJoinedDataSets,
+											ValidIdentities: pValidIdentities,
+
+											Error: pError
+										});
+									return fNext();		
+								});
+						});
+		
+					return fStageComplete();
+				},
+				(fStageComplete) =>
 				{
 					if (this._Settings.Retold.AutoStartAPIServer)
 					{
@@ -170,6 +214,11 @@ class RetoldDataService
 		return this._Providers.Default.connect();
 	}
 
+	initializeGraphEndpoints()
+	{
+		this._GraphSolver = new libGraphSolver(this._Fable, this._MeadowModelGraph);
+	}
+
 	mapBackplaneEndpoints()
 	{
 		const tmpBackplanePrefix = 'BACKPLANE';