fix: envelope pagination page count w/ search

Author: ItsNotGoodName

internal/repo/envelope.go

@@ -88,24 +88,36 @@ func EnvelopeList(ctx context.Context, db database.Querier, page pagination.Page
 	var res []models.Envelope
 
 	subQuery := Messages.SELECT(Messages.ID)
-	// This is what peak performance looks like
-	if req.Ascending {
-		if req.Order == models.DTOEnvelopeFieldSubject {
-			subQuery = subQuery.ORDER_BY(Messages.Subject.ASC())
-		} else if req.Order == models.DTOEnvelopeFieldFrom {
-			subQuery = subQuery.ORDER_BY(Messages.From.ASC())
-		} else {
-			subQuery = subQuery.ORDER_BY(Messages.ID.ASC())
-		}
-	} else {
-		if req.Order == models.DTOEnvelopeFieldSubject {
-			subQuery = subQuery.ORDER_BY(Messages.Subject.DESC())
-		} else if req.Order == models.DTOEnvelopeFieldFrom {
-			subQuery = subQuery.ORDER_BY(Messages.From.DESC())
-		} else {
-			subQuery = subQuery.ORDER_BY(Messages.ID.DESC())
-		}
+	subQuery = envelopeListOrder(subQuery, req)
+	subQuery = envelopeListWhere(subQuery, req)
+
+	query := SELECT(messagePJ, attachmentPJ).
+		FROM(Messages.LEFT_JOIN(Attachments, Attachments.MessageID.EQ(Messages.ID))).
+		WHERE(Messages.ID.IN(subQuery.LIMIT(int64(page.Limit())).OFFSET(int64(page.Offset()))))
+	query = envelopeListOrder(query, req)
+
+	err := query.QueryContext(ctx, db, &res)
+	if err != nil {
+		return models.DTOEnvelopeListResult{}, err
+	}
+
+	countQuery := Messages.SELECT(COUNT(Raw("*")).AS("count"))
+	countQuery = envelopeListWhere(countQuery, req)
+
+	var resCount struct{ Count int }
+	err = countQuery.QueryContext(ctx, db, &resCount)
+	if err != nil {
+		return models.DTOEnvelopeListResult{}, err
 	}
+	pageResult := pagination.NewPageResult(page, resCount.Count)
+
+	return models.DTOEnvelopeListResult{
+		PageResult: pageResult,
+		Envelopes:  res,
+	}, nil
+}
+
+func envelopeListWhere(s SelectStatement, req models.DTOEnvelopeListRequest) SelectStatement {
 	if req.Search != "" {
 		var exp []BoolExpression
 		if req.SearchText {
@@ -115,53 +127,37 @@ func EnvelopeList(ctx context.Context, db database.Querier, page pagination.Page
 			exp = append(exp, Messages.Subject.LIKE(RawString("?", map[string]interface{}{"?": "%" + req.Search + "%"})))
 		}
 		if len(exp) > 0 {
-			subQuery = subQuery.WHERE(OR(exp...))
+			s = s.WHERE(OR(exp...))
 		} else {
 			// Invalid state where the caller wants to search but has defined no fields to search
-			subQuery = subQuery.WHERE(RawBool("1=0"))
+			s = s.WHERE(RawBool("1=0"))
 		}
 	}
 
-	query := SELECT(messagePJ, attachmentPJ).
-		FROM(Messages.LEFT_JOIN(Attachments, Attachments.MessageID.EQ(Messages.ID))).
-		WHERE(Messages.ID.IN(subQuery.LIMIT(int64(page.Limit())).OFFSET(int64(page.Offset()))))
-	// s/subQuery/query/g
+	return s
+}
+
+func envelopeListOrder(s SelectStatement, req models.DTOEnvelopeListRequest) SelectStatement {
+	// This is what peak performance looks like
 	if req.Ascending {
 		if req.Order == models.DTOEnvelopeFieldSubject {
-			query = query.ORDER_BY(Messages.Subject.ASC())
+			s = s.ORDER_BY(Messages.Subject.ASC())
 		} else if req.Order == models.DTOEnvelopeFieldFrom {
-			query = query.ORDER_BY(Messages.From.ASC())
+			s = s.ORDER_BY(Messages.From.ASC())
 		} else {
-			query = query.ORDER_BY(Messages.ID.ASC())
+			s = s.ORDER_BY(Messages.ID.ASC())
 		}
 	} else {
 		if req.Order == models.DTOEnvelopeFieldSubject {
-			query = query.ORDER_BY(Messages.Subject.DESC())
+			s = s.ORDER_BY(Messages.Subject.DESC())
 		} else if req.Order == models.DTOEnvelopeFieldFrom {
-			query = query.ORDER_BY(Messages.From.DESC())
+			s = s.ORDER_BY(Messages.From.DESC())
 		} else {
-			query = query.ORDER_BY(Messages.ID.DESC())
+			s = s.ORDER_BY(Messages.ID.DESC())
 		}
 	}
 
-	err := query.QueryContext(ctx, db, &res)
-	if err != nil {
-		return models.DTOEnvelopeListResult{}, err
-	}
-
-	var resCount struct{ Count int }
-	err = Messages.
-		SELECT(COUNT(Raw("*")).AS("count")).
-		QueryContext(ctx, db, &resCount)
-	if err != nil {
-		return models.DTOEnvelopeListResult{}, err
-	}
-	pageResult := pagination.NewPageResult(page, resCount.Count)
-
-	return models.DTOEnvelopeListResult{
-		PageResult: pageResult,
-		Envelopes:  res,
-	}, nil
+	return s
 }
 
 func EnvelopeGet(ctx context.Context, db database.Querier, id int64) (models.Envelope, error) {