refactor(golang,python): extract method for getting field's type

Author: php-coder

src/cli.js

@@ -157,6 +157,16 @@ const lengthOfLongestString = (arr) => arr
 			0 /* initial value */
 		)
 
+// returns user-defined variable's type or null
+// Accepts method.dto.fields fieldsInfo
+const retrieveType = (fieldsInfo, fieldName) => {
+	const hasTypeInfo = fieldsInfo.hasOwnProperty(fieldName) && fieldsInfo[fieldName].hasOwnProperty('type')
+	if (hasTypeInfo) {
+		return fieldsInfo[fieldName].type
+	}
+    return null
+}
+
 const createEndpoints = async (destDir, { lang }, config) => {
     const ext = lang2extension(lang)
     const fileName = `routes.${ext}`
@@ -299,6 +309,7 @@ const createEndpoints = async (destDir, { lang }, config) => {
 
             "placeholdersMap": placeholdersMap,
             "removeComments": removeComments,
+            "retrieveType": retrieveType,
         }
     )
 

src/templates/routes.go.ejs

@@ -71,18 +71,14 @@ function extractProperties(queryAst) {
 }
 
 function findOutType(fieldsInfo, fieldName) {
-	const defaultType = '*string'
-	const hasTypeInfo = fieldsInfo.hasOwnProperty(fieldName) && fieldsInfo[fieldName].hasOwnProperty('type')
-	if (!hasTypeInfo) {
-		return defaultType
-	}
-	if (hasTypeInfo && fieldsInfo[fieldName].type === 'integer') {
+	const fieldType = retrieveType(fieldsInfo, fieldName)
+	if (fieldType === 'integer') {
 		return '*int'
 	}
-	if (hasTypeInfo && fieldsInfo[fieldName].type === 'boolean') {
+	if (fieldType === 'boolean') {
 		return '*bool'
 	}
-	return defaultType
+	return '*string'
 }
 
 function addTypes(props, fieldsInfo) {

src/templates/routes.py.ejs

@@ -87,20 +87,15 @@ function extractProperties(queryAst) {
 	return []
 }
 
-// LATER: try to reduce duplication with routes.go.ejs
 function findOutType(fieldsInfo, fieldName) {
-	const defaultType = 'str'
-	const hasTypeInfo = fieldsInfo.hasOwnProperty(fieldName) && fieldsInfo[fieldName].hasOwnProperty('type')
-	if (!hasTypeInfo) {
-		return defaultType
-	}
-	if (fieldsInfo[fieldName].type === 'integer') {
+	const fieldType = retrieveType(fieldsInfo, fieldName)
+	if (fieldType === 'integer') {
 		return 'int'
 	}
-	if (fieldsInfo[fieldName].type === 'boolean') {
+	if (fieldType === 'boolean') {
 		return 'bool'
 	}
-	return defaultType
+	return 'str'
 }
 
 // LATER: reduce duplication with routes.go.ejs