refact: renamed nods to nodules

This commit is contained in:
ysandler 2020-06-17 00:58:46 -05:00 committed by Joshua Shoemaker
parent 921154f1d2
commit 7ffc47db22
9 changed files with 105 additions and 105 deletions

View File

@ -1,6 +1,6 @@
import Table from './Table.js' import Table from './Table.js'
class Node { class Nodule {
constructor (props) { constructor (props) {
const validatePropsResponse = this._validateConstructionProps(props) const validatePropsResponse = this._validateConstructionProps(props)
if (validatePropsResponse.status === 'ERR') { if (validatePropsResponse.status === 'ERR') {
@ -58,7 +58,7 @@ class Node {
_assignProps = props => { _assignProps = props => {
this.id = props.id this.id = props.id
this.label = props.label this.label = props.label
this.type = 'Node' this.type = 'Nodule'
this.isValid = true this.isValid = true
if (props.tables) this.importTables(props.tables) if (props.tables) this.importTables(props.tables)
@ -114,4 +114,4 @@ class Node {
} }
} }
export default Node export default Nodule

View File

@ -1,7 +1,7 @@
import Node from '../Node.js' import Nodule from '../Nodule.js'
import filterTypes from '../../constants/filterTypes.js' import filterTypes from '../../constants/filterTypes.js'
class FilterNode extends Node { class FilterNodule extends Nodule {
constructor (props) { constructor (props) {
super (props) super (props)
this._assignProps(props) this._assignProps(props)
@ -94,4 +94,4 @@ class FilterNode extends Node {
} }
} }
export default FilterNode export default FilterNodule

View File

@ -1,6 +1,6 @@
import Node from '../Node.js' import Nodule from '../Nodule.js'
class JoinNode extends Node { class JoinNodule extends Nodule {
constructor (props) { constructor (props) {
super(props) super(props)
this._assignProps(props) this._assignProps(props)
@ -77,4 +77,4 @@ class JoinNode extends Node {
} }
} }
export default JoinNode export default JoinNodule

View File

@ -1,6 +1,6 @@
import Node from '../Node.js' import Nodule from '../Nodule.js'
class TransformNode extends Node { class TransformNodule extends Nodule {
constructor (props) { constructor (props) {
super(props) super(props)
this._assignProps(props) this._assignProps(props)
@ -53,4 +53,4 @@ class TransformNode extends Node {
} }
} }
export default TransformNode export default TransformNodule

View File

@ -1,4 +1,4 @@
import Node from '../../core/entities/Node.js' import Nodule from '../../core/entities/Nodule.js'
import Table from '../../core/entities/Table.js' import Table from '../../core/entities/Table.js'
const input = { const input = {
@ -17,7 +17,7 @@ const getNodeProperties = () => {
const expectedOutput = { const expectedOutput = {
id: 'ABC', id: 'ABC',
label: 'Test Node', label: 'Test Node',
type: 'Node', type: 'Nodule',
tables: [ tables: [
{ {
id: 'XYZ', id: 'XYZ',
@ -31,8 +31,8 @@ const getNodeProperties = () => {
} }
try { try {
const node = new Node(input) const nodule = new Nodule(input)
const nodeProps = node.getProperties() const nodeProps = nodule.getProperties()
if (JSON.stringify(nodeProps) == JSON.stringify(expectedOutput)) return true if (JSON.stringify(nodeProps) == JSON.stringify(expectedOutput)) return true
else return false else return false
} catch (err) { } catch (err) {
@ -49,14 +49,14 @@ const createNodeWithoutTables = () => {
const expectedOutput = { const expectedOutput = {
id: 'ABC', id: 'ABC',
label: 'Test Node', label: 'Test Node',
type: 'Node', type: 'Nodule',
tables: [], tables: [],
isValid: true isValid: true
} }
try { try {
const node = new Node(input) const nodule = new Nodule(input)
const nodeProps = node.getProperties() const nodeProps = nodule.getProperties()
if (JSON.stringify(nodeProps) == JSON.stringify(expectedOutput)) return true if (JSON.stringify(nodeProps) == JSON.stringify(expectedOutput)) return true
else return false else return false
} catch (err) { } catch (err) {
@ -74,7 +74,7 @@ const importTables = () => {
const expectedOutput = { const expectedOutput = {
id: 'ABC', id: 'ABC',
label: 'Test Node', label: 'Test Node',
type: 'Node', type: 'Nodule',
tables: [{ tables: [{
id: 'XYZ', id: 'XYZ',
label: 'Test Table', label: 'Test Table',
@ -86,12 +86,12 @@ const importTables = () => {
} }
try { try {
const node = new Node({ const nodule = new Nodule({
id: 'ABC', id: 'ABC',
label: 'Test Node', label: 'Test Node',
}) })
node.importTables(table) nodule.importTables(table)
const nodeProps = node.getProperties() const nodeProps = nodule.getProperties()
if (JSON.stringify(nodeProps) == JSON.stringify(expectedOutput)) return true if (JSON.stringify(nodeProps) == JSON.stringify(expectedOutput)) return true
else return false else return false
@ -103,19 +103,19 @@ const importTables = () => {
const failToExport = () => { const failToExport = () => {
const expectedOutput = null const expectedOutput = null
const node = new Node({ const nodule = new Nodule({
id: 'ABC', id: 'ABC',
label: 'Test Node', label: 'Test Node',
}) })
const nodeAsTable = node.asTable() const nodeAsTable = nodule.asTable()
if (expectedOutput === nodeAsTable) return true if (expectedOutput === nodeAsTable) return true
else return false else return false
} }
export default [ export default [
{ name: 'Entity | Get Node Properties', test: getNodeProperties }, { name: 'Entity | Get Nodule Properties', test: getNodeProperties },
{ name: 'Entity | Create Node Without Tables', test: createNodeWithoutTables }, { name: 'Entity | Create Nodule Without Tables', test: createNodeWithoutTables },
{ name: 'Entity | Import Tables to Node', test: importTables }, { name: 'Entity | Import Tables to Nodule', test: importTables },
{ name: 'Entity | Fail to Export', test: failToExport } { name: 'Entity | Fail to Export', test: failToExport }
] ]

View File

@ -1,4 +1,4 @@
import FilterNode from '../../../core/entities/nodes/FilterNode.js' import FilterNodule from '../../../core/entities/nodules/FilterNodule.js'
import Table from '../../../core/entities/Table.js' import Table from '../../../core/entities/Table.js'
const equalFilter = () => { const equalFilter = () => {
@ -23,11 +23,11 @@ const equalFilter = () => {
return false return false
} }
let filterNode = {} let filterNodule = {}
try { try {
filterNode = new FilterNode({ filterNodule = new FilterNodule({
id: 'ABC', id: 'ABC',
label: 'Test Node', label: 'Test Nodule',
tables: [table], tables: [table],
filterParams: { filterParams: {
data: 'row', data: 'row',
@ -40,7 +40,7 @@ const equalFilter = () => {
return false return false
} }
const filteredRows = filterNode.export() const filteredRows = filterNodule.export()
if (JSON.stringify(filteredRows) === JSON.stringify(expectedOutput)) { if (JSON.stringify(filteredRows) === JSON.stringify(expectedOutput)) {
return true return true
} else { } else {
@ -70,11 +70,11 @@ const addFilter = () => {
return false return false
} }
let filterNode = {} let filterNodule = {}
try { try {
filterNode = new FilterNode({ filterNodule = new FilterNodule({
id: 'ABC', id: 'ABC',
label: 'Test Node', label: 'Test Nodule',
tables: [table], tables: [table],
filterParams: { filterParams: {
data: 'row', data: 'row',
@ -87,13 +87,13 @@ const addFilter = () => {
} }
try { try {
filterNode.addFilter({ contractor: 'AshBritt' }) filterNodule.addFilter({ contractor: 'AshBritt' })
} catch (err) { } catch (err) {
console.log(err) console.log(err)
return false return false
} }
const filteredRows = filterNode.export() const filteredRows = filterNodule.export()
if (JSON.stringify(filteredRows) === JSON.stringify(expectedOutput)) { if (JSON.stringify(filteredRows) === JSON.stringify(expectedOutput)) {
return true return true
} else { } else {
@ -123,11 +123,11 @@ const exportWithoutTypeErrorHandle = () => {
return false return false
} }
let filterNode = {} let filterNodule = {}
try { try {
filterNode = new FilterNode({ filterNodule = new FilterNodule({
id: 'ABC', id: 'ABC',
label: 'Test Node', label: 'Test Nodule',
tables: [table], tables: [table],
filterParams: { filterParams: {
data: 'row', data: 'row',
@ -140,7 +140,7 @@ const exportWithoutTypeErrorHandle = () => {
} }
try { try {
filterNode.export() filterNodule.export()
} catch (err) { } catch (err) {
if (JSON.stringify(err) === JSON.stringify(expectedOutput)) { if (JSON.stringify(err) === JSON.stringify(expectedOutput)) {
return true return true
@ -172,11 +172,11 @@ const setType = () => {
return false return false
} }
let filterNode = {} let filterNodule = {}
try { try {
filterNode = new FilterNode({ filterNodule = new FilterNodule({
id: 'ABC', id: 'ABC',
label: 'Test Node', label: 'Test Nodule',
tables: [table], tables: [table],
filterParams: { filterParams: {
data: 'row', data: 'row',
@ -189,13 +189,13 @@ const setType = () => {
} }
try { try {
filterNode.setFilterType('EQUAL') filterNodule.setFilterType('EQUAL')
} catch (err) { } catch (err) {
console.log(err) console.log(err)
return false return false
} }
const filteredRows = filterNode.export() const filteredRows = filterNodule.export()
if (JSON.stringify(filteredRows) === JSON.stringify(expectedOutput)) { if (JSON.stringify(filteredRows) === JSON.stringify(expectedOutput)) {
return true return true
} else { } else {
@ -225,11 +225,11 @@ const greaterFilter = () => {
return false return false
} }
let filterNode = {} let filterNodule = {}
try { try {
filterNode = new FilterNode({ filterNodule = new FilterNodule({
id: 'ABC', id: 'ABC',
label: 'Test Node', label: 'Test Nodule',
tables: [table], tables: [table],
filterParams: { filterParams: {
count: 4 count: 4
@ -243,7 +243,7 @@ const greaterFilter = () => {
let filteredRows = [] let filteredRows = []
try { try {
filteredRows = filterNode.export() filteredRows = filterNodule.export()
} catch (err) { } catch (err) {
console.log(err) console.log(err)
return false return false
@ -278,11 +278,11 @@ const greaterEqualFilter = () => {
return false return false
} }
let filterNode = {} let filterNodule = {}
try { try {
filterNode = new FilterNode({ filterNodule = new FilterNodule({
id: 'ABC', id: 'ABC',
label: 'Test Node', label: 'Test Nodule',
tables: [table], tables: [table],
filterParams: { filterParams: {
count: 4 count: 4
@ -296,7 +296,7 @@ const greaterEqualFilter = () => {
let filteredRows = [] let filteredRows = []
try { try {
filteredRows = filterNode.export() filteredRows = filterNodule.export()
} catch (err) { } catch (err) {
console.log(err) console.log(err)
return false return false
@ -329,11 +329,11 @@ const lesserFilter = () => {
return false return false
} }
let filterNode = {} let filterNodule = {}
try { try {
filterNode = new FilterNode({ filterNodule = new FilterNodule({
id: 'ABC', id: 'ABC',
label: 'Test Node', label: 'Test Nodule',
tables: [table], tables: [table],
filterParams: { filterParams: {
count: 4 count: 4
@ -347,7 +347,7 @@ const lesserFilter = () => {
let filteredRows = [] let filteredRows = []
try { try {
filteredRows = filterNode.export() filteredRows = filterNodule.export()
} catch (err) { } catch (err) {
console.log(err) console.log(err)
return false return false
@ -381,11 +381,11 @@ const lesserEqualFilter = () => {
return false return false
} }
let filterNode = {} let filterNodule = {}
try { try {
filterNode = new FilterNode({ filterNodule = new FilterNodule({
id: 'ABC', id: 'ABC',
label: 'Test Node', label: 'Test Nodule',
tables: [table], tables: [table],
filterParams: { filterParams: {
count: 4 count: 4
@ -399,7 +399,7 @@ const lesserEqualFilter = () => {
let filteredRows = [] let filteredRows = []
try { try {
filteredRows = filterNode.export() filteredRows = filterNodule.export()
} catch (err) { } catch (err) {
console.log(err) console.log(err)
return false return false
@ -414,7 +414,7 @@ const lesserEqualFilter = () => {
const getAsTable = () => { const getAsTable = () => {
const expectedOutput = { const expectedOutput = {
id: 'ABC', id: 'ABC',
label: 'Test Node', label: 'Test Nodule',
rows: [ rows: [
{ id: 'qwe', count: 4, contractor: 'AshBritt' }, { id: 'qwe', count: 4, contractor: 'AshBritt' },
{ id: 'xyz', count: 2, contractor: 'HeyDay' } { id: 'xyz', count: 2, contractor: 'HeyDay' }
@ -439,11 +439,11 @@ const getAsTable = () => {
return false return false
} }
let filterNode = {} let filterNodule = {}
try { try {
filterNode = new FilterNode({ filterNodule = new FilterNodule({
id: 'ABC', id: 'ABC',
label: 'Test Node', label: 'Test Nodule',
tables: [table], tables: [table],
filterParams: { filterParams: {
count: 4 count: 4
@ -455,14 +455,14 @@ const getAsTable = () => {
return false return false
} }
let filterNodeAsTable = [] let filterNoduleAsTable = []
try { try {
filterNodeAsTable = filterNode.asTable().getProperties() filterNoduleAsTable = filterNodule.asTable().getProperties()
} catch (err) { } catch (err) {
console.log(err) console.log(err)
return false return false
} }
if (JSON.stringify(filterNodeAsTable) === JSON.stringify(expectedOutput)) { if (JSON.stringify(filterNoduleAsTable) === JSON.stringify(expectedOutput)) {
return true return true
} else { } else {
return false return false
@ -470,13 +470,13 @@ const getAsTable = () => {
} }
export default [ export default [
{ name: 'Entity | FilterNode Equal Filter', test: equalFilter }, { name: 'Entity | FilterNodule Equal Filter', test: equalFilter },
{ name: 'Entity | FilterNode GREATER Filter', test: greaterFilter }, { name: 'Entity | FilterNodule GREATER Filter', test: greaterFilter },
{ name: 'Entity | FilterNode GREATEREQUAL Filter', test: greaterEqualFilter }, { name: 'Entity | FilterNodule GREATEREQUAL Filter', test: greaterEqualFilter },
{ name: 'Entity | FilterNode LESSER Filter', test: lesserFilter }, { name: 'Entity | FilterNodule LESSER Filter', test: lesserFilter },
{ name: 'Entity | FilterNode LESSEREQUAL Filter', test: lesserEqualFilter }, { name: 'Entity | FilterNodule LESSEREQUAL Filter', test: lesserEqualFilter },
{ name: 'Entity | FilterNode Add Filter', test: addFilter }, { name: 'Entity | FilterNodule Add Filter', test: addFilter },
{ name: 'Entity | FilterNode Set Type', test: setType }, { name: 'Entity | FilterNodule Set Type', test: setType },
{ name: 'Entity | FilterNode Export Without Type Error', test: exportWithoutTypeErrorHandle }, { name: 'Entity | FilterNodule Export Without Type Error', test: exportWithoutTypeErrorHandle },
{ name: 'Entity | FilterNode Export As Table', test: getAsTable }, { name: 'Entity | FilterNodule Export As Table', test: getAsTable },
] ]

View File

@ -1,4 +1,4 @@
import JoinNode from '../../../core/entities/nodes/JoinNode.js' import JoinNodule from '../../../core/entities/nodules/JoinNodule.js'
import Table from '../../../core/entities/Table.js' import Table from '../../../core/entities/Table.js'
const joinTables = () => { const joinTables = () => {
@ -27,7 +27,7 @@ const joinTables = () => {
{ id: '2345676', contractor: 'AshBritt', type: 'lh', lat: 80, long: -41, 'contractors::id': '1WE3V6', 'contractors::name': 'AshBritt', 'contractors::employeeCount': 43, 'contractors::homeState': 'CA' }, { id: '2345676', contractor: 'AshBritt', type: 'lh', lat: 80, long: -41, 'contractors::id': '1WE3V6', 'contractors::name': 'AshBritt', 'contractors::employeeCount': 43, 'contractors::homeState': 'CA' },
] ]
const joinNode = new JoinNode({ const joinNodule = new JoinNodule({
id: 'QWE', id: 'QWE',
label: 'Receipts with Contractors', label: 'Receipts with Contractors',
tables: [pickupTable, contractorTable], tables: [pickupTable, contractorTable],
@ -41,9 +41,9 @@ const joinTables = () => {
const joinNodeProps = joinNode.export() const joinNoduleProps = joinNodule.export()
if (JSON.stringify(joinNodeProps) === JSON.stringify(expectedOutput)) return true if (JSON.stringify(joinNoduleProps) === JSON.stringify(expectedOutput)) return true
else return false else return false
} }
@ -73,21 +73,21 @@ const setJoinBy = () => {
{ id: '2345676', contractor: 'AshBritt', type: 'lh', lat: 80, long: -41, 'contractors::id': '1WE3V6', 'contractors::name': 'AshBritt', 'contractors::employeeCount': 43, 'contractors::homeState': 'CA' }, { id: '2345676', contractor: 'AshBritt', type: 'lh', lat: 80, long: -41, 'contractors::id': '1WE3V6', 'contractors::name': 'AshBritt', 'contractors::employeeCount': 43, 'contractors::homeState': 'CA' },
] ]
const joinNode = new JoinNode({ const joinNodule = new JoinNodule({
id: 'QWE', id: 'QWE',
label: 'Receipts with Contractors', label: 'Receipts with Contractors',
tables: [pickupTable, contractorTable] tables: [pickupTable, contractorTable]
}) })
joinNode.setJoinBy({ joinNodule.setJoinBy({
baseTableLabel: 'receipts', baseTableLabel: 'receipts',
joinParams: [ joinParams: [
{ foreignTable: 'contractors', primaryTableKey: 'contractor', matchingKey: 'name' } { foreignTable: 'contractors', primaryTableKey: 'contractor', matchingKey: 'name' }
] ]
}) })
const joinNodeProps = joinNode.export() const joinNoduleProps = joinNodule.export()
if (JSON.stringify(joinNodeProps) === JSON.stringify(expectedOutput)) return true if (JSON.stringify(joinNoduleProps) === JSON.stringify(expectedOutput)) return true
else return false else return false
} }

View File

@ -1,5 +1,5 @@
import Table from '../../../core/entities/Table.js' import Table from '../../../core/entities/Table.js'
import TransformNode from '../../../core/entities/nodes/TransformNode.js' import TransformNodule from '../../../core/entities/nodules/TransformNodule.js'
const transformTable = () => { const transformTable = () => {
const expectedOutput = [ const expectedOutput = [
@ -26,9 +26,9 @@ const transformTable = () => {
return false return false
} }
let transformNode = {} let transformNodule = {}
try { try {
transformNode = new TransformNode({ transformNodule = new TransformNodule({
id: 'ABC', id: 'ABC',
label: 'Transform Test', label: 'Transform Test',
tables: [table], tables: [table],
@ -43,7 +43,7 @@ const transformTable = () => {
return false return false
} }
const transformRows = transformNode.export() const transformRows = transformNodule.export()
if (JSON.stringify(transformRows) === JSON.stringify(expectedOutput)) return true if (JSON.stringify(transformRows) === JSON.stringify(expectedOutput)) return true
else return false else return false
} }
@ -73,9 +73,9 @@ const setStructure = () => {
return false return false
} }
let transformNode = {} let transformNodule = {}
try { try {
transformNode = new TransformNode({ transformNodule = new TransformNodule({
id: 'ABC', id: 'ABC',
label: 'Transform Test', label: 'Transform Test',
tables: [table], tables: [table],
@ -86,7 +86,7 @@ const setStructure = () => {
} }
try { try {
transformNode.setStructure({ transformNodule.setStructure({
'id': 'identifier', 'id': 'identifier',
'data': 'ticketType', 'data': 'ticketType',
'contractor': 'contractor' 'contractor': 'contractor'
@ -96,12 +96,12 @@ const setStructure = () => {
return false return false
} }
const transformRows = transformNode.export() const transformRows = transformNodule.export()
if (JSON.stringify(transformRows) === JSON.stringify(expectedOutput)) return true if (JSON.stringify(transformRows) === JSON.stringify(expectedOutput)) return true
else return false else return false
} }
export default [ export default [
{ name: 'Entities | Transform Node Test', test: transformTable }, { name: 'Entities | Transform Nodule Test', test: transformTable },
{ name: 'Entities | Transform Node Set Structure', test: setStructure } { name: 'Entities | Transform Nodule Set Structure', test: setStructure }
] ]

View File

@ -1,10 +1,10 @@
import ProgressBar from 'progress' import ProgressBar from 'progress'
import tableTests from '../tests/core/tableTests.js' import tableTests from '../tests/core/tableTests.js'
import nodeTests from '../tests/core/nodeTests.js' import noduleTests from '../tests/core/noduleTests.js'
import filterNodeTests from '../tests/core/nodes/filterNodeTests.js' import filterNoduleTests from '../tests/core/nodules/filterNoduleTests.js'
import joinNodeTests from '../tests/core/nodes/joinNodeTests.js' import joinNoduleTests from '../tests/core/nodules/joinNoduleTests.js'
import transformNodeTests from '../tests/core/nodes/transformNodeTests.js' import transformNoduleTests from '../tests/core/nodules/transformNoduleTests.js'
function runTestsAndReturnFailures (tests) { function runTestsAndReturnFailures (tests) {
const testTotalCount = tests.length const testTotalCount = tests.length
@ -40,10 +40,10 @@ function init (tests) {
const testsArray = [ const testsArray = [
tableTests, tableTests,
nodeTests, noduleTests,
filterNodeTests, filterNoduleTests,
joinNodeTests, joinNoduleTests,
transformNodeTests transformNoduleTests
] ]
init (testsArray.flat()) init (testsArray.flat())