浏览代码

refact: implements new VO changes into presentation CLI controllers

Matheus Marques Polillo 1 年之前
父节点
当前提交
0e34bd048a

+ 4 - 1
src/presentation/cli/controller/marketplace.go

@@ -61,9 +61,12 @@ func (controller *MarketplaceController) parseDataFields(
 			return dataFields, errors.New(errPrefix + "InvalidDataFieldValue")
 		}
 
-		dataField := valueObject.NewMarketplaceInstallableItemDataFieldPanic(
+		dataField, err := valueObject.NewMarketplaceInstallableItemDataField(
 			fieldName, fieldValue,
 		)
+		if err != nil {
+			return dataFields, errors.New(errPrefix + "InvalidDataField")
+		}
 
 		dataFields = append(dataFields, dataField)
 	}

+ 45 - 10
src/presentation/cli/controller/runtimeController.go

@@ -37,7 +37,10 @@ func getHostname(hostnameStr string) (valueObject.Fqdn, error) {
 
 	hostname := primaryVhost
 	if hostnameStr != "" {
-		hostname = valueObject.NewFqdnPanic(hostnameStr)
+		hostname, err = valueObject.NewFqdn(hostnameStr)
+		if err != nil {
+			cliHelper.ResponseWrapper(false, err.Error())
+		}
 	}
 
 	return hostname, nil
@@ -85,7 +88,10 @@ func (controller *RuntimeController) UpdatePhpConfig() *cobra.Command {
 			serviceName, _ := valueObject.NewServiceName("php-webserver")
 			sharedHelper.StopIfServiceUnavailable(controller.persistentDbSvc, serviceName)
 
-			phpVersion := valueObject.NewPhpVersionPanic(phpVersionStr)
+			phpVersion, err := valueObject.NewPhpVersion(phpVersionStr)
+			if err != nil {
+				cliHelper.ResponseWrapper(false, err.Error())
+			}
 
 			hostname, err := getHostname(hostnameStr)
 			if err != nil {
@@ -100,7 +106,10 @@ func (controller *RuntimeController) UpdatePhpConfig() *cobra.Command {
 					continue
 				}
 
-				moduleName := valueObject.NewPhpModuleNamePanic(moduleParts[0])
+				moduleName, err := valueObject.NewPhpModuleName(moduleParts[0])
+				if err != nil {
+					cliHelper.ResponseWrapper(false, err.Error())
+				}
 				moduleStatus := true
 				if modulePartsLength > 1 {
 					moduleStatus, err = sharedHelper.ParseBoolParam(moduleParts[1])
@@ -122,8 +131,16 @@ func (controller *RuntimeController) UpdatePhpConfig() *cobra.Command {
 					continue
 				}
 
-				settingName := valueObject.NewPhpSettingNamePanic(settingParts[0])
-				settingValue := valueObject.NewPhpSettingValuePanic(settingParts[1])
+				settingName, err := valueObject.NewPhpSettingName(settingParts[0])
+				if err != nil {
+					cliHelper.ResponseWrapper(false, err.Error())
+				}
+
+				settingValue, err := valueObject.NewPhpSettingValue(settingParts[1])
+				if err != nil {
+					cliHelper.ResponseWrapper(false, err.Error())
+				}
+
 				phpSettings = append(
 					phpSettings,
 					entity.NewPhpSetting(settingName, settingValue, nil),
@@ -185,11 +202,22 @@ func (controller *RuntimeController) UpdatePhpSetting() *cobra.Command {
 				cliHelper.ResponseWrapper(false, err.Error())
 			}
 
-			phpVersion := valueObject.NewPhpVersionPanic(phpVersionStr)
+			phpVersion, err := valueObject.NewPhpVersion(phpVersionStr)
+			if err != nil {
+				cliHelper.ResponseWrapper(false, err.Error())
+			}
 
 			phpSettings := []entity.PhpSetting{}
-			settingName := valueObject.NewPhpSettingNamePanic(settingNameStr)
-			settingValue := valueObject.NewPhpSettingValuePanic(settingValueStr)
+			settingName, err := valueObject.NewPhpSettingName(settingNameStr)
+			if err != nil {
+				cliHelper.ResponseWrapper(false, err.Error())
+			}
+
+			settingValue, err := valueObject.NewPhpSettingValue(settingValueStr)
+			if err != nil {
+				cliHelper.ResponseWrapper(false, err.Error())
+			}
+
 			phpSettings = append(
 				phpSettings,
 				entity.NewPhpSetting(settingName, settingValue, nil),
@@ -248,10 +276,17 @@ func (controller *RuntimeController) UpdatePhpModule() *cobra.Command {
 				cliHelper.ResponseWrapper(false, err.Error())
 			}
 
-			phpVersion := valueObject.NewPhpVersionPanic(phpVersionStr)
+			phpVersion, err := valueObject.NewPhpVersion(phpVersionStr)
+			if err != nil {
+				cliHelper.ResponseWrapper(false, err.Error())
+			}
 
 			phpModules := []entity.PhpModule{}
-			moduleName := valueObject.NewPhpModuleNamePanic(moduleNameStr)
+			moduleName, err := valueObject.NewPhpModuleName(moduleNameStr)
+			if err != nil {
+				cliHelper.ResponseWrapper(false, err.Error())
+			}
+
 			phpModules = append(
 				phpModules,
 				entity.NewPhpModule(moduleName, moduleStatusBool),

+ 4 - 1
src/presentation/cli/controller/servicesController.go

@@ -265,7 +265,10 @@ func (controller *ServicesController) Update() *cobra.Command {
 
 			var svcStatusPtr *valueObject.ServiceStatus
 			if statusStr != "" {
-				svcStatus := valueObject.NewServiceStatusPanic(statusStr)
+				svcStatus, err := valueObject.NewServiceStatus(statusStr)
+				if err != nil {
+					cliHelper.ResponseWrapper(false, err.Error())
+				}
 				svcStatusPtr = &svcStatus
 			}
 

+ 18 - 4
src/presentation/cli/controller/sslController.go

@@ -57,7 +57,11 @@ func (controller *SslController) Create() *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			var virtualHosts []valueObject.Fqdn
 			for _, vhost := range virtualHostsSlice {
-				virtualHosts = append(virtualHosts, valueObject.NewFqdnPanic(vhost))
+				virtualHost, err := valueObject.NewFqdn(vhost)
+				if err != nil {
+					continue
+				}
+				virtualHosts = append(virtualHosts, virtualHost)
 			}
 
 			certificateFilePath, err := valueObject.NewUnixFilePath(certificateFilePathStr)
@@ -71,7 +75,10 @@ func (controller *SslController) Create() *cobra.Command {
 			if err != nil {
 				cliHelper.ResponseWrapper(false, "OpenSslCertificateFileError")
 			}
-			sslCertificateContent := valueObject.NewSslCertificateContentPanic(certificateContentStr)
+			sslCertificateContent, err := valueObject.NewSslCertificateContent(certificateContentStr)
+			if err != nil {
+				cliHelper.ResponseWrapper(false, err.Error())
+			}
 
 			privateKeyContentStr, err := infraHelper.GetFileContent(keyFilePathStr)
 			if err != nil {
@@ -79,7 +86,10 @@ func (controller *SslController) Create() *cobra.Command {
 			}
 
 			sslCertificate := entity.NewSslCertificatePanic(sslCertificateContent)
-			sslPrivateKey := valueObject.NewSslPrivateKeyPanic(privateKeyContentStr)
+			sslPrivateKey, err := valueObject.NewSslPrivateKey(privateKeyContentStr)
+			if err != nil {
+				cliHelper.ResponseWrapper(false, err.Error())
+			}
 
 			createSslDto := dto.NewCreateSslPair(
 				virtualHosts,
@@ -158,7 +168,11 @@ func (controller *SslController) DeleteVhosts() *cobra.Command {
 
 			var virtualHosts []valueObject.Fqdn
 			for _, vhost := range virtualHostsSlice {
-				virtualHosts = append(virtualHosts, valueObject.NewFqdnPanic(vhost))
+				virtualHost, err := valueObject.NewFqdn(vhost)
+				if err != nil {
+					continue
+				}
+				virtualHosts = append(virtualHosts, virtualHost)
 			}
 
 			dto := dto.NewDeleteSslPairVhosts(sslPairId, virtualHosts)

+ 51 - 15
src/presentation/cli/controller/virtualHostController.go

@@ -52,17 +52,26 @@ func (controller *VirtualHostController) Create() *cobra.Command {
 		Use:   "create",
 		Short: "CreateVirtualHost",
 		Run: func(cmd *cobra.Command, args []string) {
-			hostname := valueObject.NewFqdnPanic(hostnameStr)
+			hostname, err := valueObject.NewFqdn(hostnameStr)
+			if err != nil {
+				cliHelper.ResponseWrapper(false, err.Error())
+			}
 
 			vhostTypeStr := "top-level"
 			if typeStr != "" {
 				vhostTypeStr = typeStr
 			}
-			vhostType := valueObject.NewVirtualHostTypePanic(vhostTypeStr)
+			vhostType, err := valueObject.NewVirtualHostType(vhostTypeStr)
+			if err != nil {
+				cliHelper.ResponseWrapper(false, err.Error())
+			}
 
 			var parentHostnamePtr *valueObject.Fqdn
 			if parentHostnameStr != "" {
-				parentHostname := valueObject.NewFqdnPanic(parentHostnameStr)
+				parentHostname, err := valueObject.NewFqdn(parentHostnameStr)
+				if err != nil {
+					cliHelper.ResponseWrapper(false, err.Error())
+				}
 				parentHostnamePtr = &parentHostname
 			}
 
@@ -75,7 +84,7 @@ func (controller *VirtualHostController) Create() *cobra.Command {
 			vhostQueryRepo := vhostInfra.NewVirtualHostQueryRepo(controller.persistentDbSvc)
 			vhostCmdRepo := vhostInfra.NewVirtualHostCmdRepo(controller.persistentDbSvc)
 
-			err := useCase.CreateVirtualHost(
+			err = useCase.CreateVirtualHost(
 				vhostQueryRepo,
 				vhostCmdRepo,
 				createVirtualHostDto,
@@ -106,7 +115,10 @@ func (controller *VirtualHostController) Delete() *cobra.Command {
 		Use:   "delete",
 		Short: "DeleteVirtualHost",
 		Run: func(cmd *cobra.Command, args []string) {
-			hostname := valueObject.NewFqdnPanic(hostnameStr)
+			hostname, err := valueObject.NewFqdn(hostnameStr)
+			if err != nil {
+				cliHelper.ResponseWrapper(false, err.Error())
+			}
 
 			vhostQueryRepo := vhostInfra.NewVirtualHostQueryRepo(controller.persistentDbSvc)
 			vhostCmdRepo := vhostInfra.NewVirtualHostCmdRepo(controller.persistentDbSvc)
@@ -170,29 +182,50 @@ func (controller *VirtualHostController) CreateMapping() *cobra.Command {
 		Use:   "create",
 		Short: "CreateVirtualHostMapping",
 		Run: func(cmd *cobra.Command, args []string) {
-			hostname := valueObject.NewFqdnPanic(hostnameStr)
-			path := valueObject.NewMappingPathPanic(pathStr)
+			hostname, err := valueObject.NewFqdn(hostnameStr)
+			if err != nil {
+				cliHelper.ResponseWrapper(false, err.Error())
+			}
+			path, err := valueObject.NewMappingPath(pathStr)
+			if err != nil {
+				cliHelper.ResponseWrapper(false, err.Error())
+			}
 
-			matchPattern := valueObject.NewMappingMatchPatternPanic("begins-with")
+			matchPattern, err := valueObject.NewMappingMatchPattern("begins-with")
+			if err != nil {
+				cliHelper.ResponseWrapper(false, err.Error())
+			}
 			if matchPatternStr != "" {
-				matchPattern = valueObject.NewMappingMatchPatternPanic(matchPatternStr)
+				matchPattern, err = valueObject.NewMappingMatchPattern(matchPatternStr)
+				if err != nil {
+					cliHelper.ResponseWrapper(false, err.Error())
+				}
 			}
 
-			targetType := valueObject.NewMappingTargetTypePanic(targetTypeStr)
+			targetType, err := valueObject.NewMappingTargetType(targetTypeStr)
+			if err != nil {
+				cliHelper.ResponseWrapper(false, err.Error())
+			}
 
 			var targetValuePtr *valueObject.MappingTargetValue
 			if targetValueStr != "" {
-				targetValue := valueObject.NewMappingTargetValuePanic(
+				targetValue, err := valueObject.NewMappingTargetValue(
 					targetValueStr, targetType,
 				)
+				if err != nil {
+					cliHelper.ResponseWrapper(false, err.Error())
+				}
 				targetValuePtr = &targetValue
 			}
 
 			var targetHttpResponseCodePtr *valueObject.HttpResponseCode
 			if targetHttpResponseCodeUint != 0 {
-				targetHttpResponseCode := valueObject.NewHttpResponseCodePanic(
+				targetHttpResponseCode, err := valueObject.NewHttpResponseCode(
 					targetHttpResponseCodeUint,
 				)
+				if err != nil {
+					cliHelper.ResponseWrapper(false, err.Error())
+				}
 				targetHttpResponseCodePtr = &targetHttpResponseCode
 			}
 
@@ -210,7 +243,7 @@ func (controller *VirtualHostController) CreateMapping() *cobra.Command {
 			vhostQueryRepo := vhostInfra.NewVirtualHostQueryRepo(controller.persistentDbSvc)
 			servicesQueryRepo := servicesInfra.NewServicesQueryRepo(controller.persistentDbSvc)
 
-			err := useCase.CreateMapping(
+			err = useCase.CreateMapping(
 				mappingQueryRepo,
 				mappingCmdRepo,
 				vhostQueryRepo,
@@ -252,12 +285,15 @@ func (controller *VirtualHostController) DeleteMapping() *cobra.Command {
 		Use:   "delete",
 		Short: "DeleteVirtualHostMapping",
 		Run: func(cmd *cobra.Command, args []string) {
-			mappingId := valueObject.NewMappingIdPanic(mappingIdUint)
+			mappingId, err := valueObject.NewMappingId(mappingIdUint)
+			if err != nil {
+				cliHelper.ResponseWrapper(false, err.Error())
+			}
 
 			mappingQueryRepo := mappingInfra.NewMappingQueryRepo(controller.persistentDbSvc)
 			mappingCmdRepo := mappingInfra.NewMappingCmdRepo(controller.persistentDbSvc)
 
-			err := useCase.DeleteMapping(
+			err = useCase.DeleteMapping(
 				mappingQueryRepo,
 				mappingCmdRepo,
 				mappingId,