Merge pull request #21 from decentralized-cloud/code-refactoring

Code refactoring

docker/Dockerfile.buildGrpcContract

@@ -1,11 +1,12 @@
 FROM microbusiness/protobuf-builder:latest
 LABEL maintainer="morteza.alizadeh@gmail.com"
 
-ADD . /src
-WORKDIR /src/contract/grpc/proto
+ADD ./contract/grpc /src
+WORKDIR /src/proto
+RUN mkdir -p ../go
 RUN protoc \
-    --go_opt=Mcommons.proto=/src/contract/grpc/proto \
-    --go_opt=Muser-messages.proto=/src/contract/grpc/proto \
-    --go_opt=Moperations.proto=/src/contract/grpc/proto \
+    --go_opt=Mcommons.proto=./ \
+    --go_opt=Muser-messages.proto=./ \
+    --go_opt=Moperations.proto=./ \
     *.proto \
     --go_out=plugins=grpc:../go

pkg/util/start.go

@@ -33,7 +33,7 @@ func StartService() {
 	}()
 
 	if err = setupDependencies(logger); err != nil {
-		logger.Fatal("Failed to setup dependecies", zap.Error(err))
+		logger.Fatal("failed to setup dependecies", zap.Error(err))
 	}
 
 	grpcTransportService, err := grpc.NewTransportService(
@@ -42,14 +42,14 @@ func StartService() {
 		endpointCreatorService,
 		middlewareProviderService)
 	if err != nil {
-		logger.Fatal("Failed to create gRPC transport service", zap.Error(err))
+		logger.Fatal("failed to create gRPC transport service", zap.Error(err))
 	}
 
 	httpsTansportService, err := https.NewTransportService(
 		logger,
 		configurationService)
 	if err != nil {
-		logger.Fatal("Failed to create HTTPS transport service", zap.Error(err))
+		logger.Fatal("failed to create HTTPS transport service", zap.Error(err))
 	}
 
 	signalChan := make(chan os.Signal, 1)
@@ -58,13 +58,13 @@ func StartService() {
 
 	go func() {
 		if serviceErr := grpcTransportService.Start(); serviceErr != nil {
-			logger.Fatal("Failed to start gRPC transport service", zap.Error(serviceErr))
+			logger.Fatal("failed to start gRPC transport service", zap.Error(serviceErr))
 		}
 	}()
 
 	go func() {
 		if serviceErr := httpsTansportService.Start(); serviceErr != nil {
-			logger.Fatal("Failed to start HTTPS transport service", zap.Error(serviceErr))
+			logger.Fatal("failed to start HTTPS transport service", zap.Error(serviceErr))
 		}
 	}()
 
@@ -73,11 +73,11 @@ func StartService() {
 		logger.Info("Received an interrupt, stopping services...")
 
 		if err := grpcTransportService.Stop(); err != nil {
-			logger.Error("Failed to stop gRPC transport service", zap.Error(err))
+			logger.Error("failed to stop gRPC transport service", zap.Error(err))
 		}
 
 		if err := httpsTansportService.Stop(); err != nil {
-			logger.Error("Failed to stop HTTPS transport service", zap.Error(err))
+			logger.Error("failed to stop HTTPS transport service", zap.Error(err))
 		}
 
 		close(cleanupDone)

scripts/compile-grpc.sh

@@ -19,4 +19,4 @@ cd "$current_directory"/..
 
 docker build -f docker/Dockerfile.buildGrpcContract -t contract-grpc-builder .
 docker create --name extract-contract-grpc-builder contract-grpc-builder
-docker cp extract-contract-grpc-builder:/src/contract/grpc/go ./contract/grpc/
+docker cp extract-contract-grpc-builder:/src/go ./contract/grpc/

services/configuration/env-service.go

@@ -34,7 +34,7 @@ func (service *envConfigurationService) GetGrpcPort() (int, error) {
 
 	portNumber, err := strconv.Atoi(portNumberString)
 	if err != nil {
-		return 0, commonErrors.NewUnknownErrorWithError("Failed to convert GRPC_PORT to integer", err)
+		return 0, commonErrors.NewUnknownErrorWithError("failed to convert GRPC_PORT to integer", err)
 	}
 
 	return portNumber, nil
@@ -56,7 +56,7 @@ func (service *envConfigurationService) GetHttpPort() (int, error) {
 
 	portNumber, err := strconv.Atoi(portNumberString)
 	if err != nil {
-		return 0, commonErrors.NewUnknownErrorWithError("Failed to convert HTTP_PORT to integer", err)
+		return 0, commonErrors.NewUnknownErrorWithError("failed to convert HTTP_PORT to integer", err)
 	}
 
 	return portNumber, nil

services/repository/mongodb/service.go

@@ -34,17 +34,17 @@ func NewMongodbRepositoryService(
 
 	connectionString, err := configurationService.GetDatabaseConnectionString()
 	if err != nil {
-		return nil, commonErrors.NewUnknownErrorWithError("Failed to get connection string to mongodb", err)
+		return nil, commonErrors.NewUnknownErrorWithError("failed to get connection string to mongodb", err)
 	}
 
 	databaseName, err := configurationService.GetDatabaseName()
 	if err != nil {
-		return nil, commonErrors.NewUnknownErrorWithError("Failed to get the database name", err)
+		return nil, commonErrors.NewUnknownErrorWithError("failed to get the database name", err)
 	}
 
 	databaseCollectionName, err := configurationService.GetDatabaseCollectionName()
 	if err != nil {
-		return nil, commonErrors.NewUnknownErrorWithError("Failed to get the database collection name", err)
+		return nil, commonErrors.NewUnknownErrorWithError("failed to get the database collection name", err)
 	}
 
 	return &mongodbRepositoryService{
@@ -70,7 +70,7 @@ func (service *mongodbRepositoryService) CreateUser(
 
 	insertResult, err := collection.InsertOne(ctx, user{request.Email})
 	if err != nil {
-		return nil, commonErrors.NewUnknownErrorWithError("User creation failed.", err)
+		return nil, commonErrors.NewUnknownErrorWithError("failed to create user", err)
 	}
 
 	userID := insertResult.InsertedID.(primitive.ObjectID).Hex()
@@ -113,7 +113,7 @@ func (service *mongodbRepositoryService) UpdateUser(
 	response, err := collection.UpdateOne(ctx, filter, newUser)
 
 	if err != nil {
-		return nil, commonErrors.NewUnknownErrorWithError("Update user failed.", err)
+		return nil, commonErrors.NewUnknownErrorWithError("failed to update user", err)
 	}
 
 	if response.MatchedCount == 0 {
@@ -148,7 +148,7 @@ func (service *mongodbRepositoryService) DeleteUser(
 	filter := bson.D{{Key: "email", Value: request.Email}}
 	response, err := collection.DeleteOne(ctx, filter)
 	if err != nil {
-		return nil, commonErrors.NewUnknownErrorWithError("Delete user failed.", err)
+		return nil, commonErrors.NewUnknownErrorWithError("failed to delete user", err)
 	}
 
 	if response.DeletedCount == 0 {
@@ -177,15 +177,17 @@ func (service *mongodbRepositoryService) readUser(
 
 	result := collection.FindOne(ctx, filter)
 	err = result.Decode(&user)
-	if err != nil {
+	if err == mongo.ErrNoDocuments {
 		return nil, "", commonErrors.NewNotFoundError()
+	} else if err != nil {
+		return nil, "", commonErrors.NewUnknownErrorWithError("failed to retrieve user", err)
 	}
 
 	var userBson bson.M
 
 	err = result.Decode(&userBson)
 	if err != nil {
-		return nil, "", commonErrors.NewUnknownErrorWithError("Failed to load user bson data", err)
+		return nil, "", commonErrors.NewUnknownErrorWithError("failed to load user bson data", err)
 	}
 
 	userID := userBson["_id"].(primitive.ObjectID).Hex()
@@ -199,7 +201,7 @@ func (service *mongodbRepositoryService) createClientAndCollection(ctx context.C
 	clientOptions := options.Client().ApplyURI(service.connectionString)
 	client, err := mongo.Connect(ctx, clientOptions)
 	if err != nil {
-		return nil, nil, commonErrors.NewUnknownErrorWithError("Could not connect to mongodb database.", err)
+		return nil, nil, commonErrors.NewUnknownErrorWithError("could not connect to mongodb database", err)
 	}
 
 	return client, client.Database(service.databaseName).Collection(service.databaseCollectionName), nil

services/transport/grpc/encoder-decoder.go

@@ -168,5 +168,5 @@ func mapError(err error) userGRPCContract.Error {
 		return userGRPCContract.Error_BAD_REQUEST
 	}
 
-	panic("Error type undefined.")
+	return userGRPCContract.Error_UNKNOWN
 }