replace hard coded string values with global strings

neel1996 · neel1996 · commit 3d2648ae592a · 2020-11-28T17:27:19.000Z
diff --git a/api/fetch_repo.go b/api/fetch_repo.go
@@ -19,6 +19,8 @@ func FetchRepo() *model.FetchRepoParams {
 		timeStamp []*string
 	)
 
+	const defaultDateFormat = "2006-01-02 15:04:05"
+
 	repoData := utils.DataStoreFileReader()
 
 	for _, repo := range repoData {
@@ -27,7 +29,7 @@ func FetchRepo() *model.FetchRepoParams {
 		repoPathStr := repo.RepoPath
 		timeStampStr := repo.TimeStamp
 
-		convTimeStamp, _ := time.Parse("2006-01-02 15:04:05", timeStampStr[:19])
+		convTimeStamp, _ := time.Parse(defaultDateFormat, timeStampStr[:19])
 		timeStampStr = convTimeStamp.String()
 
 		repoId = append(repoId, &repoIdStr)
diff --git a/api/settings_api.go b/api/settings_api.go
@@ -37,15 +37,15 @@ func UpdatePortNumber(newPort string) string {
 		newEnvData.DataBaseFile = envData.DataBaseFile
 
 		cwd, _ := os.Getwd()
-		fileString := cwd + "/env_config.json"
+		fileString := cwd + "/" + global.EnvFileName
 		envContent, _ := json.MarshalIndent(&newEnvData, "", " ")
 		writeErr := ioutil.WriteFile(fileString, envContent, 0755)
 
 		if writeErr != nil {
 			logger.Log(writeErr.Error(), global.StatusError)
 			return global.PortUpdateError
 		} else {
-			return "PORT_UPDATED"
+			return global.PortUpdateSuccess
 		}
 	} else {
 		return global.PortUpdateError
@@ -62,15 +62,15 @@ func UpdateDBFilePath(newFilePath string) string {
 		newEnvData.DataBaseFile = newFilePath
 
 		cwd, _ := os.Getwd()
-		fileString := cwd + "/env_config.json"
+		fileString := cwd + "/" + global.EnvFileName
 		envContent, _ := json.MarshalIndent(&newEnvData, "", " ")
 		writeErr := ioutil.WriteFile(fileString, envContent, 0755)
 
 		if writeErr != nil {
 			logger.Log(writeErr.Error(), global.StatusError)
 			return global.DataFileUpdateError
 		} else {
-			return "DATAFILE_UPDATE_SUCCESS"
+			return global.DataFileUpdateSuccess
 		}
 	} else {
 		return global.DataFileUpdateError
@@ -122,7 +122,7 @@ func DeleteRepo(repoId string) *model.DeleteStatus {
 				return reportError(repoId, "Failed to update DB file", err.Error())
 			}
 			return &model.DeleteStatus{
-				Status: "DELETE_SUCCESS",
+				Status: global.RepoDeleteSuccess,
 				RepoID: repoId,
 			}
 		} else {
diff --git a/git/git_branch_add.go b/git/git_branch_add.go
@@ -26,6 +26,6 @@ func AddBranch(repo *git.Repository, branchName string) string {
 		}
 
 		logger.Log(fmt.Sprintf("Added new branch - %s to the repo", branchName), global.StatusInfo)
-		return "BRANCH_CREATION_SUCCESS"
+		return global.BranchAddSuccess
 	}
 }
diff --git a/git/git_branch_delete.go b/git/git_branch_delete.go
@@ -38,6 +38,6 @@ func DeleteBranch(repo *git.Repository, branchName string, forceFlag bool) *mode
 	}
 
 	return &model.BranchDeleteStatus{
-		Status: "BRANCH_DELETE_SUCCESS",
+		Status: global.BranchDeleteSuccess,
 	}
 }
diff --git a/git/git_commit_changes.go b/git/git_commit_changes.go
@@ -25,7 +25,7 @@ func windowsCommit(repoPath string, msg string) string {
 		return global.CommitChangeError
 	} else {
 		logger.Log(fmt.Sprintf("Changes committed to the repo -> %s", cmdStr), global.StatusInfo)
-		return "COMMIT_DONE"
+		return global.CommitChangeSuccess
 	}
 }
 
@@ -122,7 +122,7 @@ func CommitChanges(repo *git.Repository, commitMessage string) string {
 			return global.CommitChangeError
 		} else {
 			logger.Log(fmt.Sprintf("Staged changes have been comitted - %s", hash.String()), global.StatusInfo)
-			return "COMMIT_DONE"
+			return global.CommitChangeSuccess
 		}
 	}
 }
diff --git a/git/git_fetch.go b/git/git_fetch.go
@@ -100,7 +100,7 @@ func FetchFromRemote(repo *git.Repository, remoteURL string, remoteBranch string
 		if fetchErr.Error() == "already up-to-date" {
 			logger.Log(fetchErr.Error(), global.StatusWarning)
 			return &model.FetchResult{
-				Status:       "NEW CHANGES ABSENT",
+				Status:       global.FetchNoNewChanges,
 				FetchedItems: nil,
 			}
 		} else {
@@ -121,7 +121,7 @@ func FetchFromRemote(repo *git.Repository, remoteURL string, remoteBranch string
 
 		msg := fmt.Sprintf("Changes fetched from remote %v", remoteName)
 		return &model.FetchResult{
-			Status:       "CHANGES FETCHED FROM REMOTE",
+			Status:       global.FetchFromRemoteSuccess,
 			FetchedItems: []*string{&msg},
 		}
 	}
diff --git a/git/git_pull.go b/git/git_pull.go
@@ -35,14 +35,14 @@ func windowsPull(repoPath string, remoteName string, branch string) *model.PullR
 
 			msg := "No changes to pull from " + remoteName
 			return &model.PullResult{
-				Status:      "NEW CHANGES ABSENT",
+				Status:      global.PullNoNewChanges,
 				PulledItems: []*string{&msg},
 			}
 		}
 		msg := "New Items Pulled from remote " + remoteName
 		logger.Log(fmt.Sprintf("Changes pulled from remote -> %s", cmdStr), global.StatusInfo)
 		return &model.PullResult{
-			Status:      "PULL SUCCESS",
+			Status:      global.PullFromRemoteSuccess,
 			PulledItems: []*string{&msg},
 		}
 	}
@@ -105,7 +105,7 @@ func PullFromRemote(repo *git.Repository, remoteURL string, remoteBranch string)
 			logger.Log("Pull failed with error : "+pullErr.Error(), global.StatusWarning)
 			msg := "No changes to pull from " + remoteName
 			return &model.PullResult{
-				Status:      "NEW CHANGES ABSENT",
+				Status:      global.PullNoNewChanges,
 				PulledItems: []*string{&msg},
 			}
 		} else {
@@ -123,7 +123,7 @@ func PullFromRemote(repo *git.Repository, remoteURL string, remoteBranch string)
 		logger.Log("New items pulled from remote", global.StatusInfo)
 		msg := "New Items Pulled from remote " + remoteName
 		return &model.PullResult{
-			Status:      "PULL SUCCESS",
+			Status:      global.PullFromRemoteSuccess,
 			PulledItems: []*string{&msg},
 		}
 	}
diff --git a/git/git_push.go b/git/git_push.go
@@ -25,7 +25,7 @@ func windowsPush(repoPath string, remoteName string, branch string) string {
 		return global.PushToRemoteError
 	} else {
 		logger.Log(fmt.Sprintf("Changes pushed to remote -> %s", cmdStr), global.StatusInfo)
-		return "PUSH_SUCCESS"
+		return global.PushToRemoteSuccess
 	}
 }
 
@@ -73,6 +73,6 @@ func PushToRemote(repo *git.Repository, remoteName string, remoteBranch string)
 		return global.PushToRemoteError
 	} else {
 		logger.Log(fmt.Sprintf("commits pushed to remote -> %s : %s\n%v", remoteName, targetRefPsec, b.String()), global.StatusInfo)
-		return "PUSH_SUCCESS"
+		return global.PushToRemoteSuccess
 	}
 }
diff --git a/git/git_remote_add.go b/git/git_remote_add.go
@@ -16,7 +16,7 @@ func AddRemote(repo *git.Repository, remoteName string, remoteURL string) string
 
 	if err == nil {
 		logger.Log("Remoted addition completed for"+remote.String(), global.StatusInfo)
-		return "REMOTE_ADD_SUCCESS"
+		return global.RemoteAddSuccess
 	} else {
 		logger.Log("Remote addition Failed!", global.StatusError)
 		return global.RemoteAddError
diff --git a/git/git_reset_item.go b/git/git_reset_item.go
@@ -27,7 +27,7 @@ func RemoveItem(repoPath string, fileItem string) string {
 			return removeErr(fileItem, err.Error())
 		} else {
 			logger.Log(fmt.Sprintf("Staged item -> %s removed from the staging area\n%s", fileItem, string(removeMsg)), global.StatusInfo)
-			return "STAGE_REMOVE_SUCCESS"
+			return global.RemoveItemSuccess
 		}
 	}
 }
diff --git a/git/git_resetall_items.go b/git/git_resetall_items.go
@@ -16,7 +16,7 @@ func ResetAllItems(repo *git.Repository) string {
 
 	if wErr != nil {
 		logger.Log(fmt.Sprintf("Error occurred while fetching repo worktree -> %s", wErr.Error()), global.StatusError)
-		return "STAGE_ALL_REMOVE_FAILED"
+		return global.RemoveAllItemsError
 	} else {
 		logger.Log("Proceeding with removing all changes", global.StatusInfo)
 		err := w.Reset(&git.ResetOptions{
@@ -34,11 +34,11 @@ func ResetAllItems(repo *git.Repository) string {
 				return global.RemoveAllItemsError
 			} else {
 				logger.Log("All staged items have been removed from staging area -> "+string(removeMsg), global.StatusInfo)
-				return "STAGE_ALL_REMOVE_SUCCESS"
+				return global.ResetAllSuccess
 			}
 		} else {
 			logger.Log("All staged items have been removed from staging area", global.StatusInfo)
-			return "STAGE_ALL_REMOVE_SUCCESS"
+			return global.ResetAllSuccess
 		}
 	}
 
diff --git a/git/git_stage_item.go b/git/git_stage_item.go
@@ -29,7 +29,7 @@ func StageItem(repo *git.Repository, fileItem string) string {
 			return addError(fileItem, cmdErr.Error())
 		} else {
 			logger.Log(fmt.Sprintf("File -> %s staged \n%s", fileItem, cmdString), global.StatusInfo)
-			return "ADD_ITEM_SUCCESS"
+			return global.StageItemSuccess
 		}
 	}
 }
diff --git a/git/git_stageall_items.go b/git/git_stageall_items.go
@@ -27,7 +27,7 @@ func StageAllItems(repo *git.Repository) string {
 			return global.StageAllItemsError
 		} else {
 			logger.Log(fmt.Sprintf("All changes staged -> %s", cmdStr), global.StatusInfo)
-			return "ALL_STAGED"
+			return global.StageAllSuccess
 		}
 	}
 }
diff --git a/global/common_strings.go b/global/common_strings.go
@@ -0,0 +1,7 @@
+package global
+
+const (
+	EnvFileName      = "gitconvex_env_config.json"
+	DatabaseFilePath = "/gitconvex-database/repo_datastore.json"
+	DefaultPort      = "9001"
+)
diff --git a/global/status_strings.go b/global/status_strings.go
@@ -0,0 +1,20 @@
+package global
+
+const (
+	BranchAddSuccess       = "BRANCH_CREATION_SUCCESS"
+	BranchDeleteSuccess    = "BRANCH_DELETE_SUCCESS"
+	RemoteAddSuccess       = "REMOTE_ADD_SUCCESS"
+	FetchNoNewChanges      = "NEW CHANGES ABSENT"
+	FetchFromRemoteSuccess = "CHANGES FETCHED FROM REMOTE"
+	PullNoNewChanges       = "NEW CHANGES ABSENT"
+	PullFromRemoteSuccess  = "PULL SUCCESS"
+	StageItemSuccess       = "ADD_ITEM_SUCCESS"
+	RemoveItemSuccess      = "STAGE_REMOVE_SUCCESS"
+	ResetAllSuccess        = "STAGE_ALL_REMOVE_SUCCESS"
+	StageAllSuccess        = "ALL_STAGED"
+	CommitChangeSuccess    = "COMMIT_DONE"
+	PushToRemoteSuccess    = "PUSH_SUCCESS"
+	PortUpdateSuccess      = "PORT_UPDATED"
+	DataFileUpdateSuccess  = "DATAFILE_UPDATE_SUCCESS"
+	RepoDeleteSuccess      = "DELETE_SUCCESS"
+)
diff --git a/server.go b/server.go
@@ -18,8 +18,6 @@ import (
 	"strconv"
 )
 
-const defaultPort = "9001"
-
 var (
 	Port int
 )
@@ -100,15 +98,15 @@ func main() {
 		logger.Log(fmt.Sprintf("Setting port received from the command line -> %s", *argFlag), global.StatusInfo)
 		Port, portErr = strconv.Atoi(*argFlag)
 		if portErr != nil {
-			Port = 9001
+			Port, _ = strconv.Atoi(global.DefaultPort)
 		}
 	}
 
 	if Port > 0 {
 		logger.Log(fmt.Sprintf("Gitconvex started on  http://localhost:%v", Port), global.StatusInfo)
 		log.Fatal(http.ListenAndServe(":"+strconv.Itoa(Port), cors.Default().Handler(router)))
 	} else {
-		logger.Log(fmt.Sprintf("Gitconvex started on  http://localhost:%v", defaultPort), global.StatusInfo)
-		log.Fatal(http.ListenAndServe(":"+defaultPort, cors.Default().Handler(router)))
+		logger.Log(fmt.Sprintf("Gitconvex started on  http://localhost:%v", global.DefaultPort), global.StatusInfo)
+		log.Fatal(http.ListenAndServe(":"+global.DefaultPort, cors.Default().Handler(router)))
 	}
 }
diff --git a/utils/env_file_handler.go b/utils/env_file_handler.go
@@ -30,7 +30,7 @@ func EnvConfigValidator() error {
 		return execErr
 	}
 
-	fileString := cwd + "/env_config.json"
+	fileString := cwd + "/" + global.EnvFileName
 	_, openErr := os.Open(fileString)
 
 	if openErr != nil {
@@ -55,7 +55,7 @@ func EnvConfigFileReader() *EnvConfig {
 		return nil
 	}
 
-	fileString := cwd + "/env_config.json"
+	fileString := cwd + "/" + global.EnvFileName
 	envFile, err := os.Open(fileString)
 
 	var envConfig *EnvConfig
@@ -88,11 +88,11 @@ func EnvConfigFileGenerator() error {
 		return types.Error{Msg: execErr.Error()}
 	}
 
-	fileString := cwd + "/env_config.json"
+	fileString := cwd + "/" + global.EnvFileName
 
 	envContent, _ := json.MarshalIndent(&EnvConfig{
-		DataBaseFile: cwd + "/database/repo_datastore.json",
-		Port:         "9001",
+		DataBaseFile: cwd + "/" + global.DatabaseFilePath,
+		Port:         global.DefaultPort,
 	}, "", " ")
 
 	return ioutil.WriteFile(fileString, envContent, 0755)

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,6 @@ func AddBranch(repo *git.Repository, branchName string) string {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`logger.Log(fmt.Sprintf("Added new branch - %s to the repo", branchName), global.StatusInfo)`
`29`		`- return "BRANCH_CREATION_SUCCESS"`
	`29`	`+ return global.BranchAddSuccess`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,6 @@ func DeleteBranch(repo git.Repository, branchName string, forceFlag bool) mode`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`return &model.BranchDeleteStatus{`
`41`		`- Status: "BRANCH_DELETE_SUCCESS",`
	`41`	`+ Status: global.BranchDeleteSuccess,`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func windowsCommit(repoPath string, msg string) string {`
`25`	`25`	`return global.CommitChangeError`
`26`	`26`	`} else {`
`27`	`27`	`logger.Log(fmt.Sprintf("Changes committed to the repo -> %s", cmdStr), global.StatusInfo)`
`28`		`- return "COMMIT_DONE"`
	`28`	`+ return global.CommitChangeSuccess`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`@@ -122,7 +122,7 @@ func CommitChanges(repo *git.Repository, commitMessage string) string {`
`122`	`122`	`return global.CommitChangeError`
`123`	`123`	`} else {`
`124`	`124`	`logger.Log(fmt.Sprintf("Staged changes have been comitted - %s", hash.String()), global.StatusInfo)`
`125`		`- return "COMMIT_DONE"`
	`125`	`+ return global.CommitChangeSuccess`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ func FetchFromRemote(repo *git.Repository, remoteURL string, remoteBranch string`
`100`	`100`	`if fetchErr.Error() == "already up-to-date" {`
`101`	`101`	`logger.Log(fetchErr.Error(), global.StatusWarning)`
`102`	`102`	`return &model.FetchResult{`
`103`		`- Status: "NEW CHANGES ABSENT",`
	`103`	`+ Status: global.FetchNoNewChanges,`
`104`	`104`	`FetchedItems: nil,`
`105`	`105`	`}`
`106`	`106`	`} else {`
`@@ -121,7 +121,7 @@ func FetchFromRemote(repo *git.Repository, remoteURL string, remoteBranch string`
`121`	`121`
`122`	`122`	`msg := fmt.Sprintf("Changes fetched from remote %v", remoteName)`
`123`	`123`	`return &model.FetchResult{`
`124`		`- Status: "CHANGES FETCHED FROM REMOTE",`
	`124`	`+ Status: global.FetchFromRemoteSuccess,`
`125`	`125`	`FetchedItems: []*string{&msg},`
`126`	`126`	`}`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,14 +35,14 @@ func windowsPull(repoPath string, remoteName string, branch string) *model.PullR`
`35`	`35`
`36`	`36`	`msg := "No changes to pull from " + remoteName`
`37`	`37`	`return &model.PullResult{`
`38`		`- Status: "NEW CHANGES ABSENT",`
	`38`	`+ Status: global.PullNoNewChanges,`
`39`	`39`	`PulledItems: []*string{&msg},`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`msg := "New Items Pulled from remote " + remoteName`
`43`	`43`	`logger.Log(fmt.Sprintf("Changes pulled from remote -> %s", cmdStr), global.StatusInfo)`
`44`	`44`	`return &model.PullResult{`
`45`		`- Status: "PULL SUCCESS",`
	`45`	`+ Status: global.PullFromRemoteSuccess,`
`46`	`46`	`PulledItems: []*string{&msg},`
`47`	`47`	`}`
`48`	`48`	`}`
`@@ -105,7 +105,7 @@ func PullFromRemote(repo *git.Repository, remoteURL string, remoteBranch string)`
`105`	`105`	`logger.Log("Pull failed with error : "+pullErr.Error(), global.StatusWarning)`
`106`	`106`	`msg := "No changes to pull from " + remoteName`
`107`	`107`	`return &model.PullResult{`
`108`		`- Status: "NEW CHANGES ABSENT",`
	`108`	`+ Status: global.PullNoNewChanges,`
`109`	`109`	`PulledItems: []*string{&msg},`
`110`	`110`	`}`
`111`	`111`	`} else {`
`@@ -123,7 +123,7 @@ func PullFromRemote(repo *git.Repository, remoteURL string, remoteBranch string)`
`123`	`123`	`logger.Log("New items pulled from remote", global.StatusInfo)`
`124`	`124`	`msg := "New Items Pulled from remote " + remoteName`
`125`	`125`	`return &model.PullResult{`
`126`		`- Status: "PULL SUCCESS",`
	`126`	`+ Status: global.PullFromRemoteSuccess,`
`127`	`127`	`PulledItems: []*string{&msg},`
`128`	`128`	`}`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func windowsPush(repoPath string, remoteName string, branch string) string {`
`25`	`25`	`return global.PushToRemoteError`
`26`	`26`	`} else {`
`27`	`27`	`logger.Log(fmt.Sprintf("Changes pushed to remote -> %s", cmdStr), global.StatusInfo)`
`28`		`- return "PUSH_SUCCESS"`
	`28`	`+ return global.PushToRemoteSuccess`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`@@ -73,6 +73,6 @@ func PushToRemote(repo *git.Repository, remoteName string, remoteBranch string)`
`73`	`73`	`return global.PushToRemoteError`
`74`	`74`	`} else {`
`75`	`75`	`logger.Log(fmt.Sprintf("commits pushed to remote -> %s : %s\n%v", remoteName, targetRefPsec, b.String()), global.StatusInfo)`
`76`		`- return "PUSH_SUCCESS"`
	`76`	`+ return global.PushToRemoteSuccess`
`77`	`77`	`}`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func RemoveItem(repoPath string, fileItem string) string {`
`27`	`27`	`return removeErr(fileItem, err.Error())`
`28`	`28`	`} else {`
`29`	`29`	`logger.Log(fmt.Sprintf("Staged item -> %s removed from the staging area\n%s", fileItem, string(removeMsg)), global.StatusInfo)`
`30`		`- return "STAGE_REMOVE_SUCCESS"`
	`30`	`+ return global.RemoveItemSuccess`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`}`