Skip to content

refactor: this is a big refactor to unify and simplify the codebase. … #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TobiasGleiter merged 1 commit into from
Aug 22, 2026
Merged

refactor: this is a big refactor to unify and simplify the codebase. … #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmd/web/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"time"

gen "github.com/bit8bytes/gearberg/internal/api/gen"
"github.com/bit8bytes/gearberg/internal/equipment"
"github.com/bit8bytes/gearberg/internal/httperr"
"github.com/bit8bytes/gearberg/internal/pagination"
"github.com/bit8bytes/gearberg/internal/templates/pages"
Expand All @@ -47,7 +48,7 @@ func (app *application) ListEquipment(ctx context.Context, params gen.ListEquipm
page := params.Page.Or(1)
f := pagination.Filters{Page: page, PageSize: 25}

items, meta, err := app.services.equipment.GetFiltered(ctx, params.OrgID, params.Q.Or(""), "", f)
items, meta, err := app.services.equipment.List(ctx, equipment.ListParams{OrgID: params.OrgID, Query: params.Q.Or(""), Filters: f})
if err != nil {
return nil, fmt.Errorf("failed to fetch equipment: %w", err)
}
Expand Down
116 changes: 52 additions & 64 deletions cmd/web/handlers:equipment:categories.go → cmd/web/handlers:categories.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,16 @@ import (
"net/http"
"net/url"

"github.com/bit8bytes/gearberg/internal/equipment/categories"
"github.com/bit8bytes/gearberg/internal/categories"
"github.com/bit8bytes/gearberg/internal/httperr"
"github.com/bit8bytes/gearberg/internal/templates/fragments"
"github.com/bit8bytes/gearberg/internal/templates/pages"
"github.com/bit8bytes/gearberg/pkg/htmx"
"github.com/segmentio/ksuid"
)

type equipmentCategoriesData struct {
OrgID string
Categories []categories.EquipmentCategory
Categories []categories.Category
MaxCategories int
SelectedID string
SelectedName string
Expand All @@ -47,19 +46,15 @@ func (app *application) getEquipmentCategories(w http.ResponseWriter, r *http.Re

cats, err := app.services.equipmentcategories.List(ctx, id)
if err != nil {
return &httperr.Error{
Error: err,
Message: "Failed to retrieve equipment categories.",
Code: http.StatusInternalServerError,
}
return httperr.InternalServerError(err)
}

data := app.html.TemplateData(r)
data.Form = categories.NewForm()
data.Data = equipmentCategoriesData{
OrgID: id,
Categories: cats,
MaxCategories: app.services.equipmentcategories.MaxCategories(),
MaxCategories: app.options.Limits.MaxOrgCategories,
}
return app.html.Render(w, r, http.StatusOK, pages.EquipmentCategoriesIndex, data)
}
Expand All @@ -78,40 +73,35 @@ func (app *application) postEquipmentCategoryNew(w http.ResponseWriter, r *http.

form, err := categories.Parse(r)
if err != nil {
return &httperr.Error{Error: err, Message: "Bad request.", Code: http.StatusBadRequest}
return httperr.BadRequest(err)
}

reRender := func(f *categories.Form) *httperr.Error {
fail := func(f *categories.Form) *httperr.Error {
data := app.html.TemplateData(r)
data.Form = f
data.Data = equipmentCategoryData{OrgID: id}
return app.html.Render(w, r, http.StatusUnprocessableEntity, pages.EquipmentCategoriesNew, data)
}

if !form.Validate() {
return reRender(&form)
return fail(&form)
}

_, err = app.services.equipmentcategories.Create(ctx, categories.CreateEquipmentCategory{
ID: ksuid.New().String(),
OrgID: id,
Name: form.Name,
})
if err != nil {
if errors.Is(err, categories.ErrConflict) {
form.AddError("name", "A category with this name already exists.")
return reRender(&form)
return fail(&form)
}
if errors.Is(err, categories.ErrLimitExceeded) {
limit := app.services.equipmentcategories.MaxCategories()
limit := app.options.Limits.MaxOrgCategories
form.AddError("name", fmt.Sprintf("Category limit reached. Only %d categories allowed per org.", limit))
return reRender(&form)
}
return &httperr.Error{
Error: err,
Message: "Failed to create equipment category.",
Code: http.StatusInternalServerError,
return fail(&form)
}
return httperr.InternalServerError(err)
}

http.Redirect(w, r, "/orgs/"+url.PathEscape(id)+"/settings/equipment-categories", http.StatusSeeOther)
Expand All @@ -123,21 +113,20 @@ func (app *application) getEquipmentCategory(w http.ResponseWriter, r *http.Requ
orgID := r.PathValue("org_id")
catID := r.PathValue("id")

category, err := app.services.equipmentcategories.GetByID(ctx, catID)
category, err := app.services.equipmentcategories.Get(ctx, catID)
if err != nil {
if errors.Is(err, categories.ErrNotFound) {
return &httperr.Error{Error: err, Message: "Equipment category not found.", Code: http.StatusNotFound}
}
return &httperr.Error{
Error: err,
Message: "Failed to retrieve equipment category.",
Code: http.StatusInternalServerError,
return httperr.NotFound(err)
}
return httperr.InternalServerError(err)
}

data := app.html.TemplateData(r)
data.Form = &categories.Form{Name: category.Name}
data.Data = equipmentCategoryData{OrgID: orgID, ID: catID}
data.Data = equipmentCategoryData{
OrgID: orgID,
ID: catID,
}
return app.html.Render(w, r, http.StatusOK, pages.EquipmentCategoriesDetail, data)
}

Expand All @@ -148,18 +137,21 @@ func (app *application) postEquipmentCategory(w http.ResponseWriter, r *http.Req

form, err := categories.Parse(r)
if err != nil {
return &httperr.Error{Error: err, Message: "Bad request.", Code: http.StatusBadRequest}
return httperr.BadRequest(err)
}

reRender := func(f *categories.Form) *httperr.Error {
fail := func(f *categories.Form) *httperr.Error {
data := app.html.TemplateData(r)
data.Form = f
data.Data = equipmentCategoryData{OrgID: orgID, ID: catID}
data.Data = equipmentCategoryData{
OrgID: orgID,
ID: catID,
}
return app.html.Render(w, r, http.StatusUnprocessableEntity, pages.EquipmentCategoriesDetail, data)
}

if !form.Validate() {
return reRender(&form)
return fail(&form)
}

_, err = app.services.equipmentcategories.Update(ctx, categories.UpdateEquipmentCategory{
Expand All @@ -169,13 +161,9 @@ func (app *application) postEquipmentCategory(w http.ResponseWriter, r *http.Req
if err != nil {
if errors.Is(err, categories.ErrConflict) {
form.AddError("name", "A category with this name already exists.")
return reRender(&form)
}
return &httperr.Error{
Error: err,
Message: "Failed to update equipment category.",
Code: http.StatusInternalServerError,
return fail(&form)
}
return httperr.InternalServerError(err)
}

http.Redirect(w, r, "/orgs/"+url.PathEscape(orgID)+"/settings/equipment-categories/"+url.PathEscape(catID), http.StatusSeeOther)
Expand All @@ -187,27 +175,26 @@ func (app *application) postDeleteEquipmentCategory(w http.ResponseWriter, r *ht
orgID := r.PathValue("org_id")
catID := r.PathValue("id")

if err := app.services.equipmentcategories.Delete(ctx, catID); err != nil {
if errors.Is(err, categories.ErrInUse) {
category, fetchErr := app.services.equipmentcategories.GetByID(ctx, catID)
if fetchErr != nil {
if errors.Is(fetchErr, categories.ErrNotFound) {
return &httperr.Error{Error: fetchErr, Message: "Equipment category not found.", Code: http.StatusNotFound}
}
return &httperr.Error{Error: fetchErr, Message: "Failed to retrieve equipment category.", Code: http.StatusInternalServerError}
}
f := &categories.Form{Name: category.Name}
f.AddError("delete", "Cannot delete: this category is assigned to one or more equipment items.")
data := app.html.TemplateData(r)
data.Form = f
data.Data = equipmentCategoryData{OrgID: orgID, ID: catID}
return app.html.Render(w, r, http.StatusUnprocessableEntity, pages.EquipmentCategoriesDetail, data)
err := app.services.equipmentcategories.Delete(ctx, catID)
if err != nil {
if !errors.Is(err, categories.ErrInUse) {
return httperr.InternalServerError(err)
}
return &httperr.Error{
Error: err,
Message: "Failed to delete equipment category.",
Code: http.StatusInternalServerError,

category, fetchErr := app.services.equipmentcategories.Get(ctx, catID)
if errors.Is(fetchErr, categories.ErrNotFound) {
return httperr.NotFound(err)
}
if fetchErr != nil {
return httperr.InternalServerError(fetchErr)
}

f := &categories.Form{Name: category.Name}
f.AddError("delete", "Cannot delete: this category is assigned to one or more equipment items.")
data := app.html.TemplateData(r)
data.Form = f
data.Data = equipmentCategoryData{OrgID: orgID, ID: catID}
return app.html.Render(w, r, http.StatusUnprocessableEntity, pages.EquipmentCategoriesDetail, data)
}

http.Redirect(w, r, "/orgs/"+url.PathEscape(orgID)+"/settings/equipment-categories", http.StatusSeeOther)
Expand All @@ -228,14 +215,15 @@ func (app *application) getEquipmentCategoriesFragment(w http.ResponseWriter, r

cats, err := app.services.equipmentcategories.List(ctx, orgID)
if err != nil {
return &httperr.Error{
Error: fmt.Errorf("getEquipmentCategoriesFragment: %w", err),
Message: "Failed to retrieve categories.",
Code: http.StatusInternalServerError,
}
return httperr.InternalServerError(fmt.Errorf("getEquipmentCategoriesFragment: %w", err))
}

tmplData := app.html.TemplateData(r)
tmplData.Data = equipmentCategoriesData{OrgID: orgID, Categories: cats, SelectedID: selected, SelectedName: selectedName}
tmplData.Data = equipmentCategoriesData{
OrgID: orgID,
Categories: cats,
SelectedID: selected,
SelectedName: selectedName,
}
return app.html.RenderFragment(w, r, http.StatusOK, fragments.EquipmentCategories, tmplData)
}
Loading
Loading