Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions forward_engineering/helpers/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,15 @@ const getItemPropertyKeys = (itemName, properties = []) =>

const getPropertyKeyGetScript = propertyName => `${propertyName} = mgmt.getPropertyKey('${propertyName}')`;

const getEdgeName = relationship => relationship.code || relationship.name;

module.exports = {
transformToValidGremlinName,
setInManagement,
getTTlScript,
getItemPropertyKeys,
getPropertyKeyGetScript,
getEdgeName,
DEFAULT_INDENT,
NEW_LINE_DOUBLE_INDENT,
};
6 changes: 3 additions & 3 deletions forward_engineering/helpers/edgeLabelHelper.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
const { transformToValidGremlinName, getTTlScript, getItemPropertyKeys } = require('./common');
const { transformToValidGremlinName, getTTlScript, getItemPropertyKeys, getEdgeName } = require('./common');
const _ = require('lodash');

const generateEdges = ({ relationships, vertices }) => {
return _.uniqBy(relationships, relationship => relationship.name)
return _.uniqBy(relationships, relationship => getEdgeName(relationship))
.map(getEdgeLabelScript(vertices))
.join('\n\n');
};

const getEdgeLabelScript = vertices => relationship => {
const name = transformToValidGremlinName(relationship.name);
const name = transformToValidGremlinName(getEdgeName(relationship));

const multiplicity = _.get(relationship, 'customProperties.multiplicity', 'MULTI');
const unidirectedScript = getUnidirectedScript(relationship);
Expand Down
4 changes: 2 additions & 2 deletions forward_engineering/helpers/sampleDataHelper.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { transformToValidGremlinName, DEFAULT_INDENT } = require('./common');
const { transformToValidGremlinName, DEFAULT_INDENT, getEdgeName } = require('./common');
const { getGeoshapeSample } = require('./geoshapeHelper');
const _ = require('lodash');

Expand Down Expand Up @@ -59,7 +59,7 @@ const generateVertices = (collections, jsonData, graphName) => {
};

const generateEdge = (from, to, relationship, edgeData, graphName) => {
const edgeName = transformToValidGremlinName(relationship.name);
const edgeName = transformToValidGremlinName(getEdgeName(relationship));
const propertiesScript = addPropertiesScript(relationship, edgeData, edgeName);

return `${edgeName} = ${from}.\n${DEFAULT_INDENT}addEdge(${JSON.stringify(edgeName)}, ${to});${propertiesScript}`;
Expand Down