Fix go integration with kotlin - build go-service, build kotlin-service

Author: Rodrigo Dos Santos

go-service/.env

@@ -14,6 +14,8 @@ JAEGER_SERVICE_NAME = go-service
 
 HOSTNAME = localhost
 
-TASKS_API_URL = http://task-api:8084/api/tasks
+TASKS_API_URL = http://localhost:8083/api/tasks
 
-LOAD_DEFAULT_VALUES = true
+LOAD_DEFAULT_VALUES = true
+
+CALL_TASK_API = false

go-service/.env.docker

@@ -18,4 +18,6 @@ HOSTNAME = go-service
 
 TASKS_API_URL = http://task-api:8084/api/tasks
 
-LOAD_DEFAULT_VALUES = true
+LOAD_DEFAULT_VALUES = true
+
+CALL_TASK_API = false

go-service/.env.production

@@ -16,4 +16,6 @@ HOSTNAME = go-service
 
 TASKS_API_URL = https://spendingbetter.com/api/tasks
 
-LOAD_DEFAULT_VALUES = false
+LOAD_DEFAULT_VALUES = false
+
+CALL_TASK_API = false

go-service/go.mod

@@ -3,17 +3,26 @@ module go-service
 go 1.15
 
 require (
+	github.com/aws/aws-sdk-go v1.42.34 // indirect
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-playground/validator/v10 v10.4.0
-	github.com/hashicorp/consul v1.13.1
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/hashicorp/consul/api v1.14.0
+	github.com/hashicorp/consul/sdk v0.11.0 // indirect
+	github.com/hashicorp/serf v0.9.8 // indirect
 	github.com/joho/godotenv v1.3.0
 	github.com/labstack/echo-contrib v0.9.0
 	github.com/labstack/echo/v4 v4.1.17
 	github.com/labstack/gommon v0.3.0
+	github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852
 	github.com/prometheus/client_golang v1.7.1 // indirect
+	github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 // indirect
 	go.mongodb.org/mongo-driver v1.4.1
+	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
 	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
+	google.golang.org/appengine v1.6.6 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/yaml.v2 v2.2.8
 	k8s.io/api v0.20.1 // indirect
 	k8s.io/apimachinery v0.20.1

go-service/go.sum

@@ -179,7 +179,7 @@ func processRestApi(middlewareObj echo.MiddlewareFunc) {
 	e.Logger.SetLevel(log.DEBUG)
 	e.GET("/api/posts", rest.GetAllPosts, middlewareObj, rest.HasValidReadPermission)
 	e.POST("/api/posts", rest.CreatePost, middlewareObj, rest.HasValidCreatePermission)
-	e.GET("/api/posts/:id", rest.GetPost, middlewareObj, rest.HasValidReadPermission)
+	e.GET("/api/posts/:id", rest.GetPostById, middlewareObj, rest.HasValidReadPermission)
 	e.PUT("/api/posts/:id", rest.UpdatePost, middlewareObj, rest.HasValidSavePermission)
 	e.DELETE("/api/posts/:id", rest.DeletePost, middlewareObj, rest.HasValidDeletePermission)
 	e.GET("/actuator/info", healthCheck)

go-service/posts-api/main.go

@@ -2,6 +2,7 @@ package rest
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"github.com/dgrijalva/jwt-go"
 	"github.com/labstack/echo/v4"
@@ -12,15 +13,17 @@ import (
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-	"io/ioutil"
-	"k8s.io/apimachinery/pkg/util/json"
+	"math"
 	"net/http"
+	"strconv"
+	"strings"
 	"time"
 )
 
 var (
 	client     = connectMongo()
 	collection = client.Database(util.GetEnv("MONGODB_DATABASE")).Collection("posts")
+	httpClient = &http.Client{Timeout: 2 * time.Second}
 )
 
 func connectMongo() *mongo.Client {
@@ -129,48 +132,83 @@ func CreateDefaultPosts() {
 	}
 }
 
-func GetTasksApi(c echo.Context) []model.Task {
+func GetTasksApi(c echo.Context, id string) []model.TaskDto {
 	authorizationHeader := c.Request().Header.Get("Authorization")
 
-	req, err := http.NewRequest("GET", util.GetEnv("TASKS_API_URL"), nil)
+	req, err := http.NewRequest("GET", util.GetEnv("TASKS_API_URL")+"?postId="+id, nil)
 	req.Header.Add("Authorization", authorizationHeader)
 
-	client := &http.Client{}
-	resp, err := client.Do(req)
+	resp, err := httpClient.Do(req)
 	if err != nil {
 		log.Warn(fmt.Sprintf("Error Task Api Connection = %v", err))
 		return nil
 	}
 	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+	var taskDto model.PageTaskDto
+	err = json.NewDecoder(resp.Body).Decode(&taskDto)
 	if err != nil {
 		log.Warn(fmt.Sprintf("Error Read Task Api = %v", err))
 		return nil
 	}
-	var tasks []model.Task
-	if err := json.Unmarshal(body, &tasks); err != nil {
-		log.Warn(fmt.Sprintf("Error Parse Task Api Response = %v", err))
-		return nil
-	}
-
-	return tasks
+	return taskDto.Task
 }
 
 func GetAllPosts(c echo.Context) error {
+	page := 0
+	size := 10
+	if c := c.QueryParam("page"); c != "" {
+		page, _ = strconv.Atoi(c)
+	}
+	if c := c.QueryParam("size"); c != "" {
+		size, _ = strconv.Atoi(c)
+	}
+	var searchByText string
+	if strings.Contains(c.QueryString(), "&") {
+		searchByText = c.QueryString()
+		searchByText = searchByText[0:strings.Index(searchByText, "&")]
+	}
+	log.Info(fmt.Sprintf("QueryString = %v", searchByText))
+	pageInt64 := int64(page)
+	sizeInt64 := int64(size)
 	ctx := context.TODO()
-	var posts []*model.Post
+	pagination := new(model.Pagination)
+	pagination.Page = pageInt64
+	pagination.Size = sizeInt64
+	var posts []model.PostDto
 	var cur *mongo.Cursor
-	opts := options.Find().SetSort(bson.D{{"createdDate", 1}})
+	opts := options.Find().SetSort(bson.D{{"createdDate", 1}}).SetSkip(pageInt64).SetLimit(sizeInt64)
 
 	if isAdmin(c) {
-		cursor, err := collection.Find(ctx, bson.D{}, opts)
+		filter := bson.M{}
+		if searchByText != "" {
+			filter = bson.M{
+				"name": bson.D{{"$all", bson.A{searchByText}}},
+			}
+		}
+		count, err2 := collection.CountDocuments(ctx, filter)
+		if err2 != nil {
+			return err2
+		}
+		pagination.TotalElements = count
+		cursor, err := collection.Find(ctx, filter, opts)
 		if err != nil {
 			return err
 		}
 		cur = cursor
 	} else {
 		createdByUser := getAuthUser(c)["sub"].(string)
 		filter := bson.M{"createdByUser": createdByUser}
+		if searchByText != "" {
+			filter = bson.M{
+				"createdByUser": createdByUser,
+				"name":          bson.D{{"$all", bson.A{searchByText}}},
+			}
+		}
+		count, err2 := collection.CountDocuments(ctx, filter)
+		if err2 != nil {
+			return err2
+		}
+		pagination.TotalElements = count
 
 		cursor, err := collection.Find(ctx, filter, opts)
 
@@ -185,12 +223,36 @@ func GetAllPosts(c echo.Context) error {
 		if err := cur.Decode(&post); err != nil {
 			return err
 		}
+		if post.LastModifiedDate != nil && post.LastModifiedDate.IsZero() {
+			post.LastModifiedDate = nil
+		}
+		postDto := model.PostDto{
+			ID:                 post.ID.Hex(),
+			Name:               post.Name,
+			CreatedDate:        post.CreatedDate.String(),
+			CreatedByUser:      post.CreatedByUser,
+			LastModifiedByUser: post.LastModifiedByUser,
+		}
 		if util.GetEnvAsBool("CALL_TASK_API") {
-			post.Tasks = GetTasksApi(c)
+			postDto.Tasks = GetTasksApi(c, postDto.ID)
 		}
-		posts = append(posts, &post)
+		if post.LastModifiedDate != nil && !post.LastModifiedDate.IsZero() {
+			postDto.LastModifiedDate = post.LastModifiedDate.String()
+		}
+		posts = append(posts, postDto)
+	}
+	pagination.Post = append(posts)
+	if pagination.Post == nil {
+		pagination.Post = []model.PostDto{}
 	}
-	return c.JSON(http.StatusOK, posts)
+
+	if pagination.TotalPages > sizeInt64 {
+		pagination.TotalPages = int64(math.Ceil(float64(pagination.TotalElements / sizeInt64)))
+	} else {
+		pagination.TotalPages = 1
+	}
+
+	return c.JSON(http.StatusOK, pagination)
 }
 
 func CreatePost(c echo.Context) error {
@@ -211,7 +273,7 @@ func CreatePost(c echo.Context) error {
 	return c.JSON(http.StatusCreated, u)
 }
 
-func GetPost(c echo.Context) error {
+func GetPostById(c echo.Context) error {
 	id := c.Param("id")
 	if "" == id {
 		panic("Id is mandatory!")
@@ -254,17 +316,22 @@ func UpdatePost(c echo.Context) error {
 		return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Not found ID: %v", id))
 	}
 
-	u := new(model.Post)
+	u := new(model.PostDto)
 	if err := c.Bind(u); err != nil {
 		return err
 	}
 	if err := c.Validate(u); err != nil {
 		return err
 	}
 
-	u.LastModifiedDate = time.Now()
-	u.LastModifiedByUser = getAuthUser(c)["sub"].(string)
-	if _, err := collection.UpdateOne(ctx, filter, u); err != nil {
+	var t = time.Now()
+	post.Name = u.Name
+	post.LastModifiedDate = &t
+	post.LastModifiedByUser = getAuthUser(c)["sub"].(string)
+	update := bson.M{
+		"$set": post,
+	}
+	if _, err := collection.UpdateOne(ctx, filter, update); err != nil {
 		return err
 	}
 	return c.JSON(http.StatusOK, u)

go-service/posts-api/rest/rest.go

@@ -12,6 +12,7 @@ import org.springframework.boot.CommandLineRunner
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.boot.info.BuildProperties
+import org.springframework.boot.info.GitProperties
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Primary
@@ -49,6 +50,12 @@ class ServiceConfiguration {
     @ConditionalOnMissingBean
     fun buildProperties(): BuildProperties = BuildProperties(Properties())
 
+    @ConditionalOnMissingBean
+    @Bean
+    fun gitProperties(): GitProperties? {
+        return GitProperties(Properties())
+    }
+
     @ConditionalOnProperty(prefix = "load.data", name = ["tasks"], havingValue = "true")
     @Bean
     fun runner(

kotlin-service/src/main/kotlin/com/microservice/kotlin/config/ServiceConfiguration.kt

@@ -49,11 +49,15 @@ class TaskController(@Autowired val repository: TaskRepository) {
                 @RequestParam(name = "sort-dir", defaultValue = "desc", required = false) sortDirection: String,
                 @RequestParam(name = "sort-idx", defaultValue = "createdDate", required = false) sortIdx: List<String>,
                 @QuerydslPredicate(root = Task::class, bindings = TaskRepository::class) predicate: Predicate,
-                @Parameter(hidden = true) authentication: Authentication): ResponseEntity<Page<Task>> {
+                @Parameter(hidden = true) authentication: Authentication,
+                @RequestParam(required = false, name = "postId") postId: String?): ResponseEntity<Page<Task>> {
         log.debug("Predicate: {}", predicate)
+        log.debug("PostId: {}", postId)
         val pageRequest = PageRequest.of(page, size, Sort.by(Sort.Direction.fromString(sortDirection), *sortIdx.toTypedArray()))
         return if (authentication.hasAdminAuthority()) {
             ResponseEntity.ok(repository.findAll(predicate, pageRequest))
+        } else if (postId != null) {
+            ResponseEntity.ok(repository.findAllByCreatedByUserAndPostId(authentication.name, postId, pageRequest))
         } else {
             ResponseEntity.ok(repository.findAllByCreatedByUser(authentication.name, pageRequest))
         }

kotlin-service/src/main/kotlin/com/microservice/kotlin/controller/TaskController.kt

@@ -25,5 +25,7 @@ data class Task(
     var lastModifiedByUser: String? = null,
 
     @LastModifiedDate
-    var lastModifiedDate: Instant? = null
+    var lastModifiedDate: Instant? = null,
+
+    var postId: String? = null
 )