fix: issues in project's code generation

Author: mahendraintelops

app/Dockerfile

@@ -16,7 +16,8 @@ RUN apk update && apk add git
 COPY --from=builder /app/dist /server/dist
 COPY --from=builder /app/node_modules /server/node_modules
 COPY --from=builder /app/protobufs /server/protobufs
-RUN mkdir "/server/workdir"
+RUN mkdir -p /compage/workdir
+RUN chmod -R 777 /compage/workdir
 ENV NODE_ENV=production
 EXPOSE 5000
 CMD [ "node", "dist/src/app.js" ]

app/src/integrations/git-platforms/index.ts

@@ -23,7 +23,7 @@ export const createRepository = async (projectEntity: ProjectEntity) => {
 };
 
 export const makeInitialCommit = async (projectEntity: ProjectEntity) => {
-    const createdProjectPath = `/server/workdir/${projectEntity.id}`;
+    const createdProjectPath = `/compage/workdir/workdir/${projectEntity.id}`;
     fs.mkdirSync(createdProjectPath, {recursive: true});
     fs.writeFileSync(`${createdProjectPath}/README.md`, `# ${projectEntity.repository_name}`);
     const gitPlatform: GitPlatformEntity = await gitPlatformService.getGitPlatform(projectEntity.owner_email, projectEntity.git_platform_name);

app/src/integrations/simple-git/existingProject.ts

@@ -30,7 +30,7 @@ export const cloneExistingProjectFromGitServer = async (existingProjectGitServer
 };
 
 export const pushToExistingProjectOnGitServer = async (existingProjectGitServerRequest: ExistingProjectGitServerRequest): Promise<string> => {
-    const baseDir = existingProjectGitServerRequest.clonedProjectPath + '/' + existingProjectGitServerRequest.projectName;
+    const baseDir = existingProjectGitServerRequest.clonedProjectPath + '/' + existingProjectGitServerRequest.repositoryName;
     const options: Partial<SimpleGitOptions> = {
         baseDir,
         binary: 'git',

app/src/integrations/simple-git/models.ts

@@ -18,6 +18,7 @@ export interface NewProjectGitServerRequest {
 export interface ExistingProjectGitServerRequest {
     projectName: string;
     projectVersion: string;
+    repositoryName: string;
     gitProviderDetails: GitProviderDetails;
     clonedProjectPath: string;
     generatedProjectPath: string;

app/src/routes/codeOperations.ts

@@ -87,7 +87,7 @@ codeOperationsRouter.post('/generate', requireEmailMiddleware, async (request, r
     }
 
     // create directory hierarchy here itself as creating it after receiving data will not be proper.
-    const originalProjectPath = `${os.tmpdir()}/${projectEntity.display_name}`;
+    const originalProjectPath = `/compage/workdir/${projectEntity.display_name}`;
     // this is a path where the project will be downloaded
     const downloadedProjectPath = `${originalProjectPath}_downloaded`;
     // this is a path where the project will be cloned
@@ -176,6 +176,7 @@ codeOperationsRouter.post('/generate', requireEmailMiddleware, async (request, r
             const existingProjectGitServerRequest: ExistingProjectGitServerRequest = {
                 projectName: projectEntity.display_name,
                 projectVersion: projectEntity.version,
+                repositoryName: projectEntity.repository_name as string,
                 gitProviderDetails: {
                     repositoryBranch: projectEntity.repository_branch as string,
                     repositoryName: projectEntity.repository_name as string,
@@ -192,16 +193,16 @@ codeOperationsRouter.post('/generate', requireEmailMiddleware, async (request, r
 
             let error: string = await cloneExistingProjectFromGitServer(existingProjectGitServerRequest);
             if (error.length > 0) {
-                cleanup(downloadedProjectPath);
+                // cleanup(downloadedProjectPath);
                 // send status back to ui
                 const clonedErrorMessage = `unable to generate code for ${projectEntity.display_name}[${projectEntity.id}] => ${error}.`;
                 Logger.error(clonedErrorMessage);
                 return resource.status(500).json(getGenerateCodeError(clonedErrorMessage));
             }
-
+            Logger.debug(`cloned ${clonedProjectPath} from github.`);
             error = await pushToExistingProjectOnGitServer(existingProjectGitServerRequest);
             if (error.length > 0) {
-                cleanup(downloadedProjectPath);
+                // cleanup(downloadedProjectPath);
                 // send status back to ui
                 const pushErrorMessage = `unable to generate code for ${projectEntity.display_name}[${projectEntity.id}] => ${error}.`;
                 Logger.error(pushErrorMessage);

core/Dockerfile

@@ -55,6 +55,8 @@ RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
 RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
 COPY --from=builder /app/core /
 COPY templates /app/templates
+RUN mkdir -p /compage/workdir
+RUN chmod -R 777 /compage/workdir
 # Application port (optional)
 EXPOSE 8080
 EXPOSE 50051

core/internal/utils/constants.go

@@ -1,7 +1,7 @@
 package utils
 
-// TmpPath Constant for referencing temporary directory to hold generated project.
-const TmpPath = "/tmp"
+// CodeGeneratorPath Constant for referencing temporary directory to hold generated project.
+const CodeGeneratorPath = "/compage/workdir"
 
 // TemplateExtension template's extension.
 const TemplateExtension = ".tmpl"

core/internal/utils/fileUtils.go

@@ -10,15 +10,15 @@ import (
 
 // GetProjectDirectoryName returns tarFile parent path
 func GetProjectDirectoryName(name string) string {
-	return TmpPath + "/" + name
+	return CodeGeneratorPath + "/" + name
 }
 
 // CreateDirectories creates the directory specified and all other directories in the path.
 func CreateDirectories(dirName string) error {
 	return os.MkdirAll(dirName, os.ModePerm)
 }
 
-// CopyFiles copies only files in the srcDirectory to destDirectory, doesn't do it recursively.
+// CopyFiles copies only file in the srcDirectory to destDirectory, doesn't do it recursively.
 func CopyFiles(destDirectory string, srcDirectory string) error {
 	return CopyAllInSrcDirToDestDir(destDirectory, srcDirectory, false)
 }

core/internal/utils/projectPathUtils.go

@@ -12,7 +12,7 @@ var (
 	root = filepath.Join(filepath.Dir(b), "../..")
 )
 
-// GetProjectRootPath returns root path of the language template passed.
+// GetProjectRootPath returns a root path of the language template passed.
 func GetProjectRootPath(templatesPath string) string {
 	return root + "/" + templatesPath
 }