Merge branch 'dev'

to support linux_386 change the variable to be defined as int64 to Fix int overflow issue by using int64 for MaxInt64 assignments

2 files changed, 8 insertions, 7 deletions

diff --git a/internal/chore/handler.go b/internal/chore/handler.go
index 333521a..16c80ef 100644
--- a/internal/chore/handler.go
+++ b/internal/chore/handler.go
@@ -1097,12 +1097,12 @@ func checkNextAssignee(chore *chModel.Chore, choresHistory []*chModel.ChoreHisto
 			}
 		}
 
-		minChores := math.MaxInt64
+		var minChores int64 = math.MaxInt64
 		for assignee, numChores := range assigneeChores {
 			// if this is the first assignee or if the number of
 			// chores assigned to this assignee is less than the current minimum
-			if numChores < minChores {
-				minChores = numChores
+			if int64(numChores) < minChores {
+				minChores = int64(numChores)
 				// set the next assignee to this assignee
 				nextAssignee = assignee
 			}
@@ -1119,12 +1119,13 @@ func checkNextAssignee(chore *chModel.Chore, choresHistory []*chModel.ChoreHisto
 		}
 
 		// max Int value
-		minChores := math.MaxInt64
+		var minChores int64 = math.MaxInt64
+
 		for assignee, numChores := range assigneeChores {
 			// if this is the first assignee or if the number of
 			// chores completed by this assignee is less than the current minimum
-			if numChores < minChores {
-				minChores = numChores
+			if int64(numChores) < minChores {
+				minChores = int64(numChores)
 				// set the next assignee to this assignee
 				nextAssignee = assignee
 			}
diff --git a/internal/notifier/repo/repository.go b/internal/notifier/repo/repository.go
index 576a3f0..38d1819 100644
--- a/internal/notifier/repo/repository.go
+++ b/internal/notifier/repo/repository.go
@@ -36,7 +36,7 @@ func (r *NotificationRepository) GetPendingNotificaiton(c context.Context, lookb
 	var notifications []*nModel.Notification
 	start := time.Now().UTC().Add(-lookback)
 	end := time.Now().UTC()
-	if err := r.db.Debug().Where("is_sent = ? AND scheduled_for < ? AND scheduled_for > ?", false, end, start).Find(&notifications).Error; err != nil {
+	if err := r.db.Where("is_sent = ? AND scheduled_for < ? AND scheduled_for > ?", false, end, start).Find(&notifications).Error; err != nil {
 		return nil, err
 	}
 	return notifications, nil