fix: build error

penguin-statistics · Nov 23, 2023 · a6feddc · a6feddc
1 parent 3c15676
commit a6feddc
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 11 deletions.
diff --git a/internal/controller/meta/admin.go b/internal/controller/meta/admin.go
@@ -37,6 +37,7 @@ import (
 type AdminController struct {
 	fx.In
 
+	DB                       *bun.DB
 	PatternRepo              *repo.DropPattern
 	PatternElementRepo       *repo.DropPatternElement
 	RecognitionDefectRepo    *repo.RecognitionDefect
@@ -475,7 +476,8 @@ func (c *AdminController) RejectRulesReevaluationApply(ctx *fiber.Ctx) error {
 	changeSet := evaluation.ChangeSet()
 
 	err = c.DB.RunInTx(ctx.UserContext(), nil, func(ictx context.Context, tx bun.Tx) error {
-		for _, change := range changeSet {
+		chunks := lo.Chunk(changeSet, 100)
+		for _, changeChunk := range chunks {
 			log.Debug().
 				Str("evt.name", "admin.reject_rules.reevaluation.apply_chunk").
 				Int("chunk_size", len(changeChunk)).

diff --git a/internal/repo/activity.go b/internal/repo/activity.go
@@ -2,7 +2,9 @@ package repo
 
 import (
 	"context"
+	"database/sql"
 
+	"github.com/pkg/errors"
 	"github.com/uptrace/bun"
 
 	"exusiai.dev/backend-next/internal/model"
@@ -24,9 +26,9 @@ func (r *Activity) GetActivities(ctx context.Context) ([]*model.Activity, error)
 	})
 }
 
-func (c *Activity) GetActivityById(ctx context.Context, activityId int) (*model.Activity, error) {
+func (r *Activity) GetActivityById(ctx context.Context, activityId int) (*model.Activity, error) {
 	var activity model.Activity
-	err := c.DB.NewSelect().
+	err := r.db.NewSelect().
 		Model(&activity).
 		Where("activity_id = ?", activityId).
 		Scan(ctx)

diff --git a/internal/repo/drop_info.go b/internal/repo/drop_info.go
@@ -166,9 +166,9 @@ func (r *DropInfo) GetDropInfosWithFilters(ctx context.Context, server string, t
 	return results, nil
 }
 
-func (s *DropInfo) GetDropInfosByServerAndRangeId(ctx context.Context, server string, rangeId int) ([]*model.DropInfo, error) {
+func (r *DropInfo) GetDropInfosByServerAndRangeId(ctx context.Context, server string, rangeId int) ([]*model.DropInfo, error) {
 	var dropInfo []*model.DropInfo
-	err := s.DB.NewSelect().
+	err := r.db.NewSelect().
 		Model(&dropInfo).
 		Where("server = ?", server).
 		Where("range_id = ?", rangeId).
@@ -193,7 +193,7 @@ func (s *DropInfo) CloneDropInfosFromCN(ctx context.Context, originRangeId int,
 		dropInfo.RangeID = destRangeId
 		dropInfo.Server = server
 	}
-	_, err = s.DB.NewInsert().Model(&dropInfos).Exec(ctx)
+	_, err = s.db.NewInsert().Model(&dropInfos).Exec(ctx)
 	if err != nil {
 		return err
 	}

diff --git a/internal/repo/drop_pattern_element.go b/internal/repo/drop_pattern_element.go
@@ -2,7 +2,9 @@ package repo
 
 import (
 	"context"
+	"database/sql"
 
+	"github.com/pkg/errors"
 	"github.com/uptrace/bun"
 
 	"exusiai.dev/backend-next/internal/model"
@@ -71,7 +73,7 @@ func (r *DropPatternElement) GetDropPatternElementsByPatternId(ctx context.Conte
 
 func (r *DropPatternElement) GetDropPatternElementsByPatternIds(ctx context.Context, patternIds []int) ([]*model.DropPatternElement, error) {
 	var elements []*model.DropPatternElement
-	err := r.DB.NewSelect().
+	err := r.db.NewSelect().
 		Model(&elements).
 		Where("drop_pattern_id IN (?)", bun.In(patternIds)).
 		Order("drop_pattern_id", "quantity DESC", "item_id").

diff --git a/internal/repo/property.go b/internal/repo/property.go
@@ -2,10 +2,13 @@ package repo
 
 import (
 	"context"
+	"database/sql"
 
+	"github.com/pkg/errors"
 	"github.com/uptrace/bun"
 
 	"exusiai.dev/backend-next/internal/model"
+	"exusiai.dev/backend-next/internal/pkg/pgerr"
 	"exusiai.dev/backend-next/internal/repo/selector"
 )
 
@@ -30,9 +33,9 @@ func (r *Property) GetPropertyByKey(ctx context.Context, key string) (*model.Pro
 	})
 }
 
-func (c *Property) UpdatePropertyByKey(ctx context.Context, key string, value string) (*model.Property, error) {
+func (r *Property) UpdatePropertyByKey(ctx context.Context, key string, value string) (*model.Property, error) {
 	var property model.Property
-	err := c.db.NewSelect().
+	err := r.db.NewSelect().
 		Model(&property).
 		Where("key = ?", key).
 		Scan(ctx)
@@ -44,7 +47,7 @@ func (c *Property) UpdatePropertyByKey(ctx context.Context, key string, value st
 	}
 
 	property.Value = value
-	_, err = c.db.NewUpdate().
+	_, err = r.db.NewUpdate().
 		Model(&property).
 		Where("key = ?", key).
 		Exec(ctx)

diff --git a/internal/repo/recognition_defect.go b/internal/repo/recognition_defect.go
@@ -21,7 +21,7 @@ func NewRecognitionDefect(db *bun.DB) *RecognitionDefect {
 	return &RecognitionDefect{db: db, sel: selector.New[model.RecognitionDefect](db)}
 }
 
-func (s *RecognitionDefect) CreateDefectReportDraft(ctx context.Context, defectReport *model.RecognitionDefect) error {
+func (r *RecognitionDefect) CreateDefectReportDraft(ctx context.Context, defectReport *model.RecognitionDefect) error {
 	defectReport.DefectID = strings.ToLower(ulid.Make().String())
 
 	_, err := r.db.NewInsert().