Implement multi count for objects

core/comment.go

@@ -8,9 +8,6 @@ import (
 )
 
 const (
-	// TypeComment identifies a comment object.
-	TypeComment = "tg_comment"
-
 	attachmentContent = "content"
 )
 
@@ -76,7 +73,7 @@ func CommentCreate(
 			OwnerID:    origin.UserID,
 			Owned:      true,
 			Private:    input.Private,
-			Type:       TypeComment,
+			Type:       object.TypeComment,
 			Visibility: post.Visibility,
 		}
 
@@ -120,7 +117,7 @@ func CommentDelete(
 				origin,
 			},
 			Types: []string{
-				TypeComment,
+				object.TypeComment,
 			},
 			Owned: &defaultOwned,
 		})
@@ -188,7 +185,7 @@ func CommentList(
 				postID,
 			},
 			Types: []string{
-				TypeComment,
+				object.TypeComment,
 			},
 			Owned: &defaultOwned,
 		})
@@ -237,7 +234,7 @@ func CommentRetrieve(
 				origin,
 			},
 			Types: []string{
-				TypeComment,
+				object.TypeComment,
 			},
 			Owned: &defaultOwned,
 		})
@@ -286,7 +283,7 @@ func CommentUpdate(
 			},
 			Owned: &defaultOwned,
 			Types: []string{
-				TypeComment,
+				object.TypeComment,
 			},
 		})
 		if err != nil {
@@ -316,7 +313,7 @@ func CommentUpdate(
 
 // IsComment indicates if Object is a comment.
 func IsComment(o *object.Object) bool {
-	if o.Type != TypeComment {
+	if o.Type != object.TypeComment {
 		return false
 	}
 

core/comment_test.go

@@ -37,7 +37,7 @@ func TestCommentCreate(t *testing.T) {
 		ID:    &created.ID,
 		Owned: &defaultOwned,
 		Types: []string{
-			TypeComment,
+			object.TypeComment,
 		},
 	})
 	if err != nil {
@@ -121,7 +121,7 @@ func TestCommentDelete(t *testing.T) {
 		ID:      &created.ID,
 		Owned:   &defaultOwned,
 		Types: []string{
-			TypeComment,
+			object.TypeComment,
 		},
 	})
 	if err != nil {
@@ -245,7 +245,7 @@ func TestCommentUpdate(t *testing.T) {
 		ID:    &created.ID,
 		Owned: &defaultOwned,
 		Types: []string{
-			TypeComment,
+			object.TypeComment,
 		},
 	})
 	if err != nil {
@@ -303,7 +303,7 @@ func testComment(ownerID uint64, post *object.Object) *object.Object {
 		ObjectID:   post.ID,
 		OwnerID:    ownerID,
 		Owned:      true,
-		Type:       TypeComment,
+		Type:       object.TypeComment,
 		Visibility: post.Visibility,
 	}
 }
@@ -319,7 +319,7 @@ func testCommentSet(ownerID uint64, post *object.Object) []*object.Object {
 			ObjectID:   post.ID,
 			OwnerID:    ownerID,
 			Owned:      true,
-			Type:       TypeComment,
+			Type:       object.TypeComment,
 			Visibility: post.Visibility,
 		},
 		{
@@ -331,7 +331,7 @@ func testCommentSet(ownerID uint64, post *object.Object) []*object.Object {
 			ObjectID:   post.ID,
 			OwnerID:    ownerID + 1,
 			Owned:      true,
-			Type:       TypeComment,
+			Type:       object.TypeComment,
 			Visibility: post.Visibility,
 		},
 		{
@@ -343,7 +343,7 @@ func testCommentSet(ownerID uint64, post *object.Object) []*object.Object {
 			ObjectID:   post.ID,
 			OwnerID:    ownerID - 1,
 			Owned:      true,
-			Type:       TypeComment,
+			Type:       object.TypeComment,
 			Visibility: post.Visibility,
 		},
 		{
@@ -355,7 +355,7 @@ func testCommentSet(ownerID uint64, post *object.Object) []*object.Object {
 			ObjectID:   post.ID,
 			OwnerID:    ownerID,
 			Owned:      true,
-			Type:       TypeComment,
+			Type:       object.TypeComment,
 			Visibility: post.Visibility,
 		},
 		{
@@ -367,7 +367,7 @@ func testCommentSet(ownerID uint64, post *object.Object) []*object.Object {
 			ObjectID:   post.ID,
 			OwnerID:    ownerID,
 			Owned:      true,
-			Type:       TypeComment,
+			Type:       object.TypeComment,
 			Visibility: post.Visibility,
 		},
 	}

core/feed.go

@@ -1053,7 +1053,7 @@ func sourceComment(
 			ObjectIDs: postIDs,
 			Owned:     &defaultOwned,
 			Types: []string{
-				TypeComment,
+				object.TypeComment,
 			},
 		})
 		if err != nil {
@@ -1075,7 +1075,7 @@ func sourceComment(
 				ID:         id,
 				ObjectID:   comment.ObjectID,
 				Owned:      true,
-				Type:       TypeComment,
+				Type:       object.TypeComment,
 				UserID:     comment.OwnerID,
 				Visibility: event.VisibilityPrivate,
 				CreatedAt:  comment.CreatedAt,

core/pipieline_test.go

@@ -539,7 +539,7 @@ func TestPipelineObjectCondObjectOwner(t *testing.T) {
 		Criteria: &rule.CriteriaObject{
 			New: &object.QueryOptions{
 				Owned: &defaultOwned,
-				Types: []string{TypeComment},
+				Types: []string{object.TypeComment},
 			},
 			Old: nil,
 		},
@@ -623,7 +623,7 @@ func TestPipelineObjectCondOwner(t *testing.T) {
 		Criteria: &rule.CriteriaObject{
 			New: &object.QueryOptions{
 				Owned: &defaultOwned,
-				Types: []string{TypeComment},
+				Types: []string{object.TypeComment},
 			},
 			Old: nil,
 		},

core/post.go

@@ -35,7 +35,7 @@ type Post struct {
 
 // PostCounts bundles all connected entity counts.
 type PostCounts struct {
-	Comments       int
+	Comments       uint64
 	Likes          int
 	ReactionCounts reaction.Counts
 }
@@ -555,7 +555,12 @@ func enrichCounts(
 	currentApp *app.App,
 	ps PostList,
 ) error {
-	countsMap, err := reactions.CountMulti(currentApp.Namespace(), reaction.QueryOptions{
+	commentsMap, err := objects.CountMulti(currentApp.Namespace(), ps.objectIDs()...)
+	if err != nil {
+		return err
+	}
+
+	reactionsMap, err := reactions.CountMulti(currentApp.Namespace(), reaction.QueryOptions{
 		Deleted:   &defaultDeleted,
 		ObjectIDs: ps.objectIDs(),
 	})
@@ -564,21 +569,9 @@ func enrichCounts(
 	}
 
 	for _, p := range ps {
-		comments, err := objects.Count(currentApp.Namespace(), object.QueryOptions{
-			ObjectIDs: []uint64{
-				p.ID,
-			},
-			Types: []string{
-				TypeComment,
-			},
-		})
-		if err != nil {
-			return err
-		}
-
 		p.Counts = PostCounts{
-			Comments:       comments,
-			ReactionCounts: countsMap[p.ObjectID],
+			Comments:       commentsMap[p.ObjectID].Comments,
+			ReactionCounts: reactionsMap[p.ObjectID],
 		}
 	}
 

handler/http/post.go

@@ -445,7 +445,7 @@ func (p *payloadPosts) MarshalJSON() ([]byte, error) {
 }
 
 type postCounts struct {
-	Comments  int            `json:"comments"`
+	Comments  uint64         `json:"comments"`
 	Likes     int            `json:"likes"`
 	Reactions reactionCounts `json:"reactions"`
 }

service/object/cache.go

@@ -50,6 +50,10 @@ func (s *cacheService) Count(ns string, opts QueryOptions) (int, error) {
 	return count, err
 }
 
+func (s *cacheService) CountMulti(ns string, objectIDs ...uint64) (m CountsMap, err error) {
+	return s.next.CountMulti(ns, objectIDs...)
+}
+
 func (s *cacheService) Put(ns string, input *Object) (output *Object, err error) {
 	key := cacheCountKey(QueryOptions{
 		Types: []string{

service/object/helper_test.go

@@ -1,6 +1,8 @@
 package object
 
 import (
+	"math/rand"
+	"reflect"
 	"testing"
 	"time"
 )
@@ -279,6 +281,60 @@ func testServiceCount(t *testing.T, p prepareFunc) {
 	}
 }
 
+func testServiceCountMulti(t *testing.T, p prepareFunc) {
+	var (
+		namespace = "service_count_multi"
+		service   = p(namespace, t)
+		objectIDs = []uint64{
+			uint64(rand.Int63()),
+			uint64(rand.Int63()),
+			uint64(rand.Int63()),
+		}
+		ownerID = uint64(rand.Int63())
+		want    = CountsMap{}
+	)
+
+	for _, oid := range objectIDs {
+		article := *testArticle
+
+		article.ObjectID = oid
+		article.OwnerID = ownerID
+
+		_, err := service.Put(namespace, &article)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		it := rand.Intn(12)
+
+		for i := 0; i < it; i++ {
+			_, err = service.Put(namespace, &Object{
+				ObjectID:   oid,
+				Owned:      true,
+				OwnerID:    uint64(rand.Int63()),
+				Type:       TypeComment,
+				Visibility: VisibilityPublic,
+			})
+			if err != nil {
+				t.Fatal(err)
+			}
+		}
+
+		want[oid] = Counts{
+			Comments: uint64(it),
+		}
+	}
+
+	have, err := service.CountMulti(namespace, objectIDs...)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !reflect.DeepEqual(have, want) {
+		t.Errorf("have %v, want %v", have, want)
+	}
+}
+
 func testServiceQuery(t *testing.T, p prepareFunc) {
 	var (
 		namespace  = "service_query"

service/object/instrumentation.go

@@ -48,6 +48,14 @@ func (s *instrumentService) Count(ns string, opts QueryOptions) (count int, err
 	return s.next.Count(ns, opts)
 }
 
+func (s *instrumentService) CountMulti(ns string, objectIDs ...uint64) (m CountsMap, err error) {
+	defer func(begin time.Time) {
+		s.track("CountMulti", ns, begin, err)
+	}(time.Now())
+
+	return s.next.CountMulti(ns, objectIDs...)
+}
+
 func (s *instrumentService) Put(ns string, object *Object) (o *Object, err error) {
 	defer func(begin time.Time) {
 		s.track("put", ns, begin, err)

service/object/logging.go

@@ -30,7 +30,7 @@ func (s *logService) Count(ns string, opts QueryOptions) (count int, err error)
 		ps := []interface{}{
 			"count", count,
 			"duration_ns", time.Since(begin).Nanoseconds(),
-			"method", "Query",
+			"method", "Count",
 			"namespace", ns,
 			"opts", opts,
 		}
@@ -45,6 +45,25 @@ func (s *logService) Count(ns string, opts QueryOptions) (count int, err error)
 	return s.next.Count(ns, opts)
 }
 
+func (s *logService) CountMulti(ns string, objectIDs ...uint64) (m CountsMap, err error) {
+	defer func(begin time.Time) {
+		ps := []interface{}{
+			"duration_ns", time.Since(begin).Nanoseconds(),
+			"ids_count", len(objectIDs),
+			"method", "CountMulti",
+			"namespace", ns,
+		}
+
+		if err != nil {
+			ps = append(ps, "err", err)
+		}
+
+		_ = s.logger.Log(ps...)
+	}(time.Now())
+
+	return s.next.CountMulti(ns, objectIDs...)
+}
+
 func (s *logService) Put(ns string, input *Object) (output *Object, err error) {
 	defer func(begin time.Time) {
 		ps := []interface{}{

service/object/mem.go

@@ -1,6 +1,7 @@
 package object
 
 import (
+	"fmt"
 	"math"
 	"sort"
 	"time"
@@ -32,6 +33,10 @@ func (s *memService) Count(ns string, opts QueryOptions) (int, error) {
 	return len(filterList(listFromMap(bucket), opts)), nil
 }
 
+func (s *memService) CountMulti(ns string, objectIDs ...uint64) (m CountsMap, err error) {
+	return nil, fmt.Errorf("memService.CountMulti not implemented")
+}
+
 func (s *memService) Put(ns string, object *Object) (*Object, error) {
 	if err := object.Validate(); err != nil {
 		return nil, err