b5cd9498b1
This is a long pending refactor. All the DB, query, CRUD, and related logic scattered across HTTP handlers are now moved into a central `core` package with clean, abstracted methods, decoupling HTTP handlers from executing direct DB queries and other business logic. eg: `core.CreateList()`, `core.GetLists()` etc. - Remove obsolete subscriber methods. - Move optin hook queries to core. - Move campaign methods to `core`. - Move all campaign methods to `core`. - Move public page functions to `core`. - Move all template functions to `core`. - Move media and settings function to `core`. - Move handler middleware functions to `core`. - Move all bounce functions to `core`. - Move all dashboard functions to `core`. - Fix GetLists() not honouring type - Fix unwrapped JSON responses. - Clean up obsolete pre-core util function. - Replace SQL array null check with cardinality check. - Fix missing validations in `core` queries. - Remove superfluous deps on internal `subimporter`. - Add dashboard functions to `core`. - Fix broken domain ban check. - Fix broken subscriber check middleware. - Remove redundant error handling. - Remove obsolete functions. - Remove obsolete structs. - Remove obsolete queries and DB functions. - Document the `core` package.
66 lines
2.1 KiB
Go
66 lines
2.1 KiB
Go
package core
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
|
|
"github.com/knadh/listmonk/models"
|
|
"github.com/labstack/echo/v4"
|
|
"github.com/lib/pq"
|
|
)
|
|
|
|
var bounceQuerySortFields = []string{"email", "campaign_name", "source", "created_at"}
|
|
|
|
// QueryBounces retrieves bounce entries based on the given params.
|
|
func (c *Core) QueryBounces(campID, subID int, source, orderBy, order string, offset, limit int) ([]models.Bounce, error) {
|
|
if !strSliceContains(orderBy, bounceQuerySortFields) {
|
|
orderBy = "created_at"
|
|
}
|
|
if order != SortAsc && order != SortDesc {
|
|
order = SortDesc
|
|
}
|
|
|
|
out := []models.Bounce{}
|
|
stmt := fmt.Sprintf(c.q.QueryBounces, orderBy, order)
|
|
if err := c.db.Select(&out, stmt, 0, campID, subID, source, offset, limit); err != nil {
|
|
c.log.Printf("error fetching bounces: %v", err)
|
|
return nil, echo.NewHTTPError(http.StatusInternalServerError,
|
|
c.i18n.Ts("globals.messages.errorFetching", "name", "{globals.terms.bounce}", "error", pqErrMsg(err)))
|
|
}
|
|
|
|
return out, nil
|
|
}
|
|
|
|
// GetBounce retrieves bounce entries based on the given params.
|
|
func (c *Core) GetBounce(id int) (models.Bounce, error) {
|
|
var out []models.Bounce
|
|
stmt := fmt.Sprintf(c.q.QueryBounces, "id", SortAsc)
|
|
if err := c.db.Select(&out, stmt, id, 0, 0, "", 0, 1); err != nil {
|
|
c.log.Printf("error fetching bounces: %v", err)
|
|
return models.Bounce{}, echo.NewHTTPError(http.StatusInternalServerError,
|
|
c.i18n.Ts("globals.messages.errorFetching", "name", "{globals.terms.bounce}", "error", pqErrMsg(err)))
|
|
}
|
|
|
|
if len(out) == 0 {
|
|
return models.Bounce{}, echo.NewHTTPError(http.StatusBadRequest,
|
|
c.i18n.Ts("globals.messages.notFound", "name", "{globals.terms.bounce}"))
|
|
|
|
}
|
|
|
|
return out[0], nil
|
|
}
|
|
|
|
// DeleteBounce deletes a list.
|
|
func (c *Core) DeleteBounce(id int) error {
|
|
return c.DeleteBounces([]int{id})
|
|
}
|
|
|
|
// DeleteBounces deletes multiple lists.
|
|
func (c *Core) DeleteBounces(ids []int) error {
|
|
if _, err := c.q.DeleteBounces.Exec(pq.Array(ids)); err != nil {
|
|
c.log.Printf("error deleting lists: %v", err)
|
|
return echo.NewHTTPError(http.StatusInternalServerError,
|
|
c.i18n.Ts("globals.messages.errorDeleting", "name", "{globals.terms.list}", "error", pqErrMsg(err)))
|
|
}
|
|
return nil
|
|
}
|