fix: map implementation, dockerfile and ui

Author: mahendraintelops

core/Dockerfile

@@ -22,15 +22,15 @@ FROM alpine:3.18.2
 # Create project directory (workdir)
 WORKDIR /app
 
-RUN apk update && apk add protoc && apk add dos2unix && apk add openjdk8 && apk add make && apk add bash && apk add curl && apk add jq && apk add --update go \
+RUN apk update && apk add protoc && apk add dos2unix && apk add openjdk11 && apk add make && apk add bash && apk add curl && apk add jq && apk add --update go \
     && curl https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/bin/utils/openapi-generator-cli.sh \
     > /app/openapi-generator-cli \
     && chmod a+x /app/openapi-generator-cli
 
 # Downloading and installing Maven
-ARG MAVEN_VERSION=3.9.3
+ARG MAVEN_VERSION=3.9.4
 ARG USER_HOME_DIR="/root"
-ARG BASE_URL=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ARG BASE_URL=https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries
 RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
   && echo "Downloading maven" \
   && curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \

core/internal/languages/golang/frameworks/go-gin-server/copier.go

@@ -52,6 +52,7 @@ const MySQLGORMDaoFile = "mysql-gorm-dao.go.tmpl"
 const SQLiteGORMDaoFile = "sqlite-gorm-dao.go.tmpl"
 const MySQLGORMDBConfigFile = "mysql-gorm.go.tmpl"
 const SQLiteGORMDBConfigFile = "sqlite-gorm.go.tmpl"
+const MapDBConfigFile = "map.go.tmpl"
 
 const ClientFile = "client.go.tmpl"
 const ConfigFile = "rest-opentel-config.go.tmpl"
@@ -62,7 +63,7 @@ const MongoDB = "MongoDB"
 // SQLite sql databases
 const SQLite = "SQLite"
 const MySQL = "MySQL"
-const InMemory = "InMemory"
+const Map = "Map"
 
 const SQLiteGORM = "SQLite-GORM"
 const MySQLGORM = "MySQL-GORM"
@@ -554,7 +555,16 @@ func (c *Copier) copySQLDBResourceFiles(resourceName string, filePaths []*string
 			return nil, err
 		}
 		filePaths = append(filePaths, &targetResourceDaoFileName)
-	} else if c.SQLDB == InMemory {
+	} else if c.SQLDB == Map {
+		// model files
+		// copy model files to generated project
+		targetResourceModelFileName := c.NodeDirectoryName + ModelsPath + "/" + resourceName + "-" + strings.Replace(SQLModelFile, "sqls-", "", 1)
+		_, err = utils.CopyFile(targetResourceModelFileName, c.TemplatesRootPath+ModelsPath+"/"+SQLModelFile)
+		if err != nil {
+			log.Debugf("error copying model file: %v", err)
+			return nil, err
+		}
+		filePaths = append(filePaths, &targetResourceModelFileName)
 		targetResourceDaoFileName = c.NodeDirectoryName + DaosPath + "/" + resourceName + "-" + DaoFile
 		_, err := utils.CopyFile(targetResourceDaoFileName, c.TemplatesRootPath+DaosPath+"/"+DaoFile)
 		if err != nil {
@@ -694,6 +704,17 @@ func (c *Copier) CreateRestServer() error {
 				}
 				filePaths = append(filePaths, targetMySQLConfigFileName)
 				return executor.Execute(filePaths, c.Data)
+			} else if c.SQLDB == Map {
+				var filePaths []string
+				// client files
+				targetMapConfigFileName := c.NodeDirectoryName + SQLDBClientsPath + "/" + MapDBConfigFile
+				_, err := utils.CopyFile(targetMapConfigFileName, c.TemplatesRootPath+SQLDBClientsPath+"/"+MapDBConfigFile)
+				if err != nil {
+					log.Debugf("error copying map config file: %v", err)
+					return err
+				}
+				filePaths = append(filePaths, targetMapConfigFileName)
+				return executor.Execute(filePaths, c.Data)
 			}
 		} else if c.IsNoSQLDB {
 			// create nosql db config file (common to all resources for specific database)

core/internal/languages/golang/frameworks/go-grpc-server/copier.go

@@ -52,6 +52,7 @@ const MySQLGORMDaoFile = "mysql-gorm-dao.go.tmpl"
 const SQLiteGORMDaoFile = "sqlite-gorm-dao.go.tmpl"
 const MySQLGORMDBConfigFile = "mysql-gorm.go.tmpl"
 const SQLiteGORMDBConfigFile = "sqlite-gorm.go.tmpl"
+const MapDBConfigFile = "map.go.tmpl"
 
 const ClientFile = "client.go.tmpl"
 const ConfigFile = "grpc-opentel-config.go.tmpl"
@@ -62,7 +63,7 @@ const MongoDB = "MongoDB"
 // SQLite sql databases
 const SQLite = "SQLite"
 const MySQL = "MySQL"
-const InMemory = "InMemory"
+const Map = "Map"
 
 // SQLiteGORM - GORM sql databases
 const SQLiteGORM = "SQLite-GORM"
@@ -363,7 +364,16 @@ func (c *Copier) copySQLDBResourceFiles(resourceName string, filePaths []*string
 			return nil, err
 		}
 		filePaths = append(filePaths, &targetResourceDaoFileName)
-	} else if c.SQLDB == InMemory {
+	} else if c.SQLDB == Map {
+		// model files
+		// copy model files to generated project
+		targetResourceModelFileName := c.NodeDirectoryName + ModelsPath + "/" + resourceName + "-" + strings.Replace(SQLModelFile, "sqls-", "", 1)
+		_, err = utils.CopyFile(targetResourceModelFileName, c.TemplatesRootPath+ModelsPath+"/"+SQLModelFile)
+		if err != nil {
+			log.Debugf("error copying model file: %v", err)
+			return nil, err
+		}
+		filePaths = append(filePaths, &targetResourceModelFileName)
 		targetResourceDaoFileName = c.NodeDirectoryName + DaosPath + "/" + resourceName + "-" + DaoFile
 		_, err := utils.CopyFile(targetResourceDaoFileName, c.TemplatesRootPath+DaosPath+"/"+DaoFile)
 		if err != nil {
@@ -729,6 +739,17 @@ func (c *Copier) CreateGrpcServer() error {
 				}
 				filePaths = append(filePaths, targetMySQLConfigFileName)
 				return executor.Execute(filePaths, c.Data)
+			} else if c.SQLDB == Map {
+				var filePaths []string
+				// client files
+				targetMapConfigFileName := c.NodeDirectoryName + SQLDBClientsPath + "/" + MapDBConfigFile
+				_, err := utils.CopyFile(targetMapConfigFileName, c.TemplatesRootPath+SQLDBClientsPath+"/"+MapDBConfigFile)
+				if err != nil {
+					log.Debugf("error copying map config file: %v", err)
+					return err
+				}
+				filePaths = append(filePaths, targetMapConfigFileName)
+				return executor.Execute(filePaths, c.Data)
 			}
 		} else if c.IsNoSQLDB {
 			// create nosql db config file (common to all resources for specific database)

core/templates/compage-template-go

@@ -34,7 +34,7 @@ export const COMPAGE_LANGUAGE_SQL_DBS = {
 
 // compage template sql_dbs supported.
 export const COMPAGE_LANGUAGE_NOSQL_DBS = {
-    [GO]: ["MongoDB", "Map"],
+    [GO]: ["MongoDB"],
 };
 
 // openapi template frameworks supported.