refactor: error codes and mailman

Author: ItsNotGoodName

internal/app/app.go

@@ -75,7 +75,7 @@ func (a App) DatabaseVacuum(ctx context.Context) error {
 
 func (a App) RuleEndpointsGet(ctx context.Context, id int64) (models.RuleEndpoints, error) {
 	res, err := repo.RuleEndpointsGet(ctx, a.db, id)
-	return res, checkErr(err)
+	return res, convertErr(err)
 }
 
 func (a App) EnvelopeCount(ctx context.Context) (int, error) {
@@ -85,15 +85,15 @@ func (a App) EnvelopeCount(ctx context.Context) (int, error) {
 func (a App) RuleDelete(ctx context.Context, id int64) error {
 	r, err := repo.RuleGet(ctx, a.db, id)
 	if err != nil {
-		return checkErr(err)
+		return convertErr(err)
 	}
 
 	err = rule.Delete(r)
 	if err != nil {
 		return err
 	}
 
-	return checkErr(repo.RuleDelete(ctx, a.db, id))
+	return convertErr(repo.RuleDelete(ctx, a.db, id))
 }
 
 func (App) RuleExpressionCheck(ctx context.Context, expression string) error {
@@ -112,18 +112,18 @@ func (App) RuleExpressionCheck(ctx context.Context, expression string) error {
 
 func (a App) AttachmentGet(ctx context.Context, id int64) (models.Attachment, error) {
 	res, err := repo.AttachmentGet(ctx, a.db, id)
-	return res, checkErr(err)
+	return res, convertErr(err)
 }
 
 func (a App) EnvelopeSend(ctx context.Context, envelopeID int64, endpointID int64) error {
 	env, err := repo.EnvelopeGet(ctx, a.db, envelopeID)
 	if err != nil {
-		return checkErr(err)
+		return convertErr(err)
 	}
 
 	endModel, err := repo.EndpointGet(ctx, a.db, endpointID)
 	if err != nil {
-		return checkErr(err)
+		return convertErr(err)
 	}
 
 	end, err := a.endpointFactory.Build(endModel)
@@ -201,7 +201,7 @@ func (a App) EnvelopeCreate(ctx context.Context, dtoMsg models.DTOMessageCreate,
 
 func (a App) EnvelopeDelete(ctx context.Context, id int64) error {
 	if err := repo.EnvelopeDelete(ctx, a.db, id); err != nil {
-		return checkErr(err)
+		return convertErr(err)
 	}
 
 	a.bus.EnvelopeDeleted(ctx)
@@ -211,7 +211,7 @@ func (a App) EnvelopeDelete(ctx context.Context, id int64) error {
 
 func (a App) EnvelopeGet(ctx context.Context, id int64) (models.Envelope, error) {
 	res, err := repo.EnvelopeGet(ctx, a.db, id)
-	return res, checkErr(err)
+	return res, convertErr(err)
 }
 
 func (a App) EnvelopeList(ctx context.Context, page pagination.Page, req models.DTOEnvelopeListRequest) (models.DTOEnvelopeListResult, error) {
@@ -233,7 +233,7 @@ func (a App) EnvelopeDrop(ctx context.Context) error {
 
 func (a App) MessageHTMLGet(ctx context.Context, id int64) (string, error) {
 	res, err := repo.MessageHTMLGet(ctx, a.db, id)
-	return res, checkErr(err)
+	return res, convertErr(err)
 }
 
 func (a App) AttachmentList(ctx context.Context, page pagination.Page, req models.DTOAttachmentListRequest) (models.DTOAttachmentListResult, error) {
@@ -285,7 +285,7 @@ func (a App) RuleCreate(ctx context.Context, req models.DTORuleCreate) (int64, e
 func (a App) RuleUpdate(ctx context.Context, req models.DTORuleUpdate) error {
 	r, err := repo.RuleGet(ctx, a.db, req.ID)
 	if err != nil {
-		return checkErr(err)
+		return convertErr(err)
 	}
 
 	r, err = rule.Update(r, req)
@@ -295,13 +295,13 @@ func (a App) RuleUpdate(ctx context.Context, req models.DTORuleUpdate) error {
 
 	err = repo.RuleUpdate(ctx, a.db, r)
 	if err != nil {
-		return checkErr(err)
+		return convertErr(err)
 	}
 
 	if req.Endpoints != nil {
 		err := repo.RuleEndpointsSet(ctx, a.db, r.ID, *req.Endpoints)
 		if err != nil {
-			return checkErr(err)
+			return convertErr(err)
 		}
 	}
 
@@ -310,7 +310,7 @@ func (a App) RuleUpdate(ctx context.Context, req models.DTORuleUpdate) error {
 
 func (a App) RuleGet(ctx context.Context, id int64) (models.Rule, error) {
 	res, err := repo.RuleGet(ctx, a.db, id)
-	return res, checkErr(err)
+	return res, convertErr(err)
 }
 
 func (a App) RuleList(ctx context.Context) ([]models.Rule, error) {
@@ -324,7 +324,7 @@ func (a App) RuleEndpointsList(ctx context.Context) ([]models.RuleEndpoints, err
 func (a App) EndpointTest(ctx context.Context, id int64) error {
 	e, err := repo.EndpointGet(ctx, a.db, id)
 	if err != nil {
-		return checkErr(err)
+		return convertErr(err)
 	}
 
 	end, err := a.endpointFactory.Build(e)

internal/app/error.go

@@ -7,7 +7,7 @@ import (
 	"github.com/ItsNotGoodName/smtpbridge/internal/repo"
 )
 
-func checkErr(err error) error {
+func convertErr(err error) error {
 	if err == nil {
 		return nil
 	}

internal/mailman/mailman.go

@@ -47,14 +47,17 @@ func (m Mailman) Serve(ctx context.Context) error {
 		case <-ctx.Done():
 			return nil
 		case <-checkC:
-			for {
-				tracer := m.app.
-					Tracer(trace.SourceMailman).
-					Sticky(trace.WithKV("mailman", m.id))
+			tracer := m.app.
+				Tracer(trace.SourceMailman).
+				Sticky(trace.WithKV("mailman", m.id))
+
+			tracer.Trace(ctx, "mailman.wake")
 
+			for {
 				maybeEnv, err := m.app.MailmanDequeue(ctx)
 				if err != nil {
 					tracer.Trace(ctx, "mailman.dequeue", trace.WithError(err))
+					log.Err(err).Msg("Mailman failed to dequeue envelope")
 					break
 				}
 				if maybeEnv == nil {
@@ -64,13 +67,13 @@ func (m Mailman) Serve(ctx context.Context) error {
 
 				tracer = tracer.Sticky(trace.WithEnvelope(env.Message.ID))
 
-				tracer.Trace(ctx, "mailman.wake")
 				if err := m.send(ctx, tracer, env); err != nil {
 					tracer.Trace(ctx, "mailman.error", trace.WithError(err))
-					log.Err(err).Int64("envelope-id", env.Message.ID).Msg("Failed to send envelope")
+					log.Err(err).Int64("envelope-id", env.Message.ID).Msg("Mailman failed to send envelope")
 				}
-				tracer.Trace(ctx, "mailman.sleep")
 			}
+
+			tracer.Trace(ctx, "mailman.sleep")
 		}
 	}
 }

internal/models/dto.go

@@ -26,12 +26,12 @@ type DTOEnvelopeListRequest struct {
 	SearchSubject bool
 	SearchText    bool
 	Ascending     bool
-	Order         DTOEnvelopeField
+	Order         dtoEnvelopeField
 }
 
-type DTOEnvelopeField string
+type dtoEnvelopeField string
 
-func NewDTOEnvelopeField(s string) DTOEnvelopeField {
+func NewDTOEnvelopeField(s string) dtoEnvelopeField {
 	switch s {
 	case DTOEnvelopeFieldFrom:
 		return DTOEnvelopeFieldFrom

pkg/pagination/page.go

@@ -51,6 +51,10 @@ func NewPageResult(p Page, totalItems int) PageResult {
 	}
 }
 
+func (p PageResult) Overflow() bool {
+	return p.Page > p.TotalPages
+}
+
 func (p PageResult) HasNext() bool {
 	return p.Page < p.TotalPages
 }

web/helpers/helpers.go

@@ -133,3 +133,7 @@ func DecodeForm(w http.ResponseWriter, r *http.Request, form any) error {
 
 	return nil
 }
+
+func ParseMultipartForm(r *http.Request) error {
+	return r.ParseMultipartForm(32 << 20)
+}