fix: don't use a pointer for comments_count to omit 0 values

saferwall · Oct 11, 2024 · 86e9aaa · 86e9aaa
1 parent e82aa96
commit 86e9aaa
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 18 deletions.
diff --git a/internal/behavior/repostitory.go b/internal/behavior/repostitory.go
@@ -317,7 +317,6 @@ func (r repository) Events(ctx context.Context, id string, offset,
 			}
 
 			i++
-
 		}
 	}
 

diff --git a/internal/comment/service.go b/internal/comment/service.go
@@ -97,11 +97,7 @@ func (s service) Create(ctx context.Context, req CreateCommentRequest) (
 	}
 
 	// Update comments count on file object.
-	commentsCount := 0
-	if file.CommentsCount != nil {
-		commentsCount = *file.CommentsCount + 1
-	}
-	err = s.fileSvc.Patch(ctx, req.SHA256, "comments_count", commentsCount)
+	err = s.fileSvc.Patch(ctx, req.SHA256, "comments_count", file.CommentsCount+1)
 	if err != nil {
 		return Comment{}, err
 	}

diff --git a/internal/entity/file.go b/internal/entity/file.go
@@ -33,7 +33,7 @@ type File struct {
 	Histogram        []int                  `json:"histogram,omitempty"`
 	ByteEntropy      []int                  `json:"byte_entropy,omitempty"`
 	Ml               map[string]interface{} `json:"ml,omitempty"`
-	CommentsCount    *int                   `json:"comments_count,omitempty"`
+	CommentsCount    int                    `json:"comments_count"`
 	Format           string                 `json:"file_format,omitempty"`
 	Extension        string                 `json:"file_extension,omitempty"`
 	DefaultBhvReport interface{}            `json:"default_behavior_report,omitempty"`

diff --git a/internal/file/api.go b/internal/file/api.go
@@ -378,12 +378,7 @@ func (r resource) comments(c echo.Context) error {
 		return err
 	}
 
-	commentsCount := 0
-	if file.CommentsCount != nil {
-		commentsCount = *file.CommentsCount
-	}
-
-	pages := pagination.NewFromRequest(c.Request(), commentsCount)
+	pages := pagination.NewFromRequest(c.Request(), file.CommentsCount)
 	comments, err := r.service.Comments(
 		ctx, c.Param("sha256"), pages.Offset(), pages.Limit())
 	if err != nil {
@@ -461,7 +456,7 @@ func (r resource) rescan(c echo.Context) error {
 		}
 	}
 
-	err := r.service.Rescan(ctx, c.Param("sha256"), scanCfg)
+	err := r.service.ReScan(ctx, c.Param("sha256"), scanCfg)
 	if err != nil {
 		return err
 	}
@@ -538,7 +533,7 @@ func (r resource) generatePresignedURL(c echo.Context) error {
 // @Security Bearer || {}
 func (r resource) metaUI(c echo.Context) error {
 	ctx := c.Request().Context()
-	fileSummary, err := r.service.Summary(ctx, c.Param("sha256"))
+	fileSummary, err := r.service.MetaUI(ctx, c.Param("sha256"))
 	if err != nil {
 		return err
 	}

diff --git a/internal/file/repository.go b/internal/file/repository.go
@@ -260,7 +260,7 @@ func (r repository) MetaUI(ctx context.Context, id string) (
 		params["loggedInUser"] = "_none_"
 	}
 
-	query = r.db.N1QLQuery[dbcontext.FileSummary]
+	query = r.db.N1QLQuery[dbcontext.MetaUI]
 	err := r.db.Query(ctx, query, params, &results)
 	if err != nil {
 		return nil, err

diff --git a/internal/file/service.go b/internal/file/service.go
@@ -41,7 +41,7 @@ type Service interface {
 	Summary(ctx context.Context, id string) (interface{}, error)
 	Like(ctx context.Context, id string) error
 	Unlike(ctx context.Context, id string) error
-	Rescan(ctx context.Context, id string, input FileScanRequest) error
+	ReScan(ctx context.Context, id string, input FileScanRequest) error
 	Comments(ctx context.Context, id string, offset, limit int) (
 		[]interface{}, error)
 	CountStrings(ctx context.Context, id string, queryString string) (int, error)
@@ -411,7 +411,7 @@ func (s service) Unlike(ctx context.Context, sha256 string) error {
 	return s.userSvc.Unlike(ctx, user.ID(), sha256)
 }
 
-func (s service) Rescan(ctx context.Context, sha256 string, input FileScanRequest) error {
+func (s service) ReScan(ctx context.Context, sha256 string, input FileScanRequest) error {
 
 	// Serialize the msg to send to the orchestrator.
 	msg, err := json.Marshal(FileScanCfg{SHA256: sha256, FileScanRequest: input})
-Original file line number
+Diff line change
@@ Expand Up @@
     			}
     			i++
     		}
     	}
@@ Expand Down @@