Pulling feat/list-content into develop

.gitignore

@@ -1 +1,3 @@
 vendor/
+.plandex
+.aider*

go.mod

@@ -4,7 +4,7 @@ require (
 	github.com/arangodb/go-driver v1.6.2
 	github.com/dictyBase/aphgrpc v1.4.2
 	github.com/dictyBase/arangomanager v0.4.0
-	github.com/dictyBase/go-genproto v0.0.0-20231030202356-522cb6f9976a
+	github.com/dictyBase/go-genproto v0.0.0-20240815171842-0da89d7f57e4
 	github.com/go-playground/validator/v10 v10.22.0
 	github.com/golang/protobuf v1.5.4
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
@@ -19,11 +19,13 @@ require (
 	github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/klauspost/compress v1.17.2 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mwitkow/go-proto-validators v0.2.0 // indirect

go.sum

@@ -26,8 +26,9 @@ github.com/dictyBase/aphgrpc v1.4.2 h1:jkNyIpUBATNVNTM99TfAHln8UEpzyvNNNuM2+UY6t
 github.com/dictyBase/aphgrpc v1.4.2/go.mod h1:rzi2U95QntAuS6XpqespgZmQ8Ujo2Sq2R5FyhW5adA8=
 github.com/dictyBase/arangomanager v0.4.0 h1:+HgmadUY0qXFMLfZocktynbERkX/FgWzC3vd/MMebnU=
 github.com/dictyBase/arangomanager v0.4.0/go.mod h1:SmElsQJN3EbTjfYCkjS7/uyUkNVwaO2qJB9Mqrs0ND8=
-github.com/dictyBase/go-genproto v0.0.0-20231030202356-522cb6f9976a h1:V0xN+gehQLCJrqFPI1nNd8wCIi6Z0ZQgmoZ6dmkPlV0=
-github.com/dictyBase/go-genproto v0.0.0-20231030202356-522cb6f9976a/go.mod h1:KY6iUqXl1lLq81WTW9u5DfZE58xM61PsGLSLwwtePlk=
+github.com/dictyBase/go-genproto v0.0.0-20240815171842-0da89d7f57e4 h1:kxY0rlODJu8qk5jXv9dzeOpOl3hV8r66y1YByPKCDIs=
+github.com/dictyBase/go-genproto v0.0.0-20240815171842-0da89d7f57e4/go.mod h1:KY6iUqXl1lLq81WTW9u5DfZE58xM61PsGLSLwwtePlk=
+github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -84,6 +85,7 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8=
 github.com/grpc-ecosystem/grpc-gateway v1.11.3/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=

internal/app/service/service.go

@@ -6,11 +6,12 @@ import (
 	"strconv"
 
 	"github.com/dictyBase/aphgrpc"
-	"github.com/dictyBase/go-genproto/dictybaseapis/api/jsonapi"
+	"github.com/dictyBase/arangomanager/query"
 	"github.com/dictyBase/go-genproto/dictybaseapis/content"
 	"github.com/dictyBase/modware-content/internal/message"
 	"github.com/dictyBase/modware-content/internal/model"
 	"github.com/dictyBase/modware-content/internal/repository"
+	"github.com/dictyBase/modware-content/internal/repository/arangodb"
 	"github.com/go-playground/validator/v10"
 	"github.com/golang/protobuf/ptypes/empty"
 )
@@ -59,13 +60,6 @@ func NewContentService(srvP *Params) (*ContentService, error) {
 	}, nil
 }
 
-func (srv *ContentService) Healthz(
-	ctx context.Context,
-	rdr *jsonapi.HealthzIdRequest,
-) (*empty.Empty, error) {
-	return &empty.Empty{}, nil
-}
-
 func (srv *ContentService) GetContentBySlug(
 	ctx context.Context,
 	rdr *content.ContentRequest,
@@ -130,7 +124,8 @@ func (srv *ContentService) buildContent(
 				UpdatedAt: aphgrpc.TimestampProto(mcont.UpdatedOn),
 				Content:   mcont.Content,
 			},
-		}}
+		},
+	}
 }
 
 func (srv *ContentService) StoreContent(
@@ -187,3 +182,81 @@ func (srv *ContentService) DeleteContent(
 
 	return &empty.Empty{}, nil
 }
+
+func (srv *ContentService) ListContents(
+	ctx context.Context,
+	req *content.ListParameters,
+) (*content.ContentCollection, error) {
+	limit := int64(10)
+	if req.Limit > 0 {
+		limit = req.Limit
+	}
+	astmt, err := filterStrToQuery(req.Filter)
+	if err != nil {
+		return nil, aphgrpc.HandleInvalidParamError(ctx, err)
+	}
+	cntModel, err := srv.repo.ListContents(req.Cursor, limit, astmt)
+	if err != nil {
+		if repository.IsContentListNotFound(err) {
+			return nil, aphgrpc.HandleNotFoundError(ctx, err)
+		}
+		return nil, aphgrpc.HandleGetError(ctx, err)
+	}
+	cntDataSlice := make([]*content.ContentCollection_Data, 0)
+	for _, cntD := range cntModel {
+		cntDataSlice = append(cntDataSlice, &content.ContentCollection_Data{
+			Id: cntD.Key,
+			Attributes: &content.ContentAttributes{
+				Name:      cntD.Name,
+				Namespace: cntD.Namespace,
+				Slug:      cntD.Slug,
+				CreatedBy: cntD.CreatedBy,
+				UpdatedBy: cntD.UpdatedBy,
+				Content:   cntD.Content,
+				CreatedAt: aphgrpc.TimestampProto(cntD.CreatedOn),
+				UpdatedAt: aphgrpc.TimestampProto(cntD.UpdatedOn),
+			},
+		})
+	}
+
+	cnt := &content.ContentCollection{}
+	if len(cntDataSlice) == int(limit)+1 {
+		cnt.Data = cntDataSlice[:len(cntDataSlice)-1]
+		cnt.Meta = &content.Meta{
+			Limit:      limit,
+			NextCursor: cntModel[len(cntModel)-1].CreatedOn.UnixMilli(),
+		}
+		return cnt, nil
+	}
+	cnt.Data = cntDataSlice
+	cnt.Meta = &content.Meta{Limit: req.Limit}
+	return cnt, nil
+}
+
+func filterStrToQuery(filter string) (string, error) {
+	var empty string
+	if len(filter) == 0 {
+		return empty, nil
+	}
+	parsedStr, err := query.ParseFilterString(filter)
+	if err != nil {
+		return empty, fmt.Errorf(
+			"error in parsing filter string '%s': %w",
+			filter,
+			err,
+		)
+	}
+	queryStr, err := query.GenQualifiedAQLFilterStatement(
+		arangodb.FilterMap(),
+		parsedStr,
+	)
+	if err != nil {
+		return empty, fmt.Errorf(
+			"error in generating AQL statement for filter '%s': %w",
+			filter,
+			err,
+		)
+	}
+
+	return queryStr, nil
+}