Handler Refactoring Complete

Summary

Successfully refactored organization_handler.go to eliminate duplicated code and improve maintainability.

Changes Made

1. ✅ Added Helper Methods

Error Response Helpers:

errorResponse(c, status, message) - Generic error response
internalError(c, err) - 500 Internal Server Error
notFound(c, resource) - 404 Not Found
badRequest(c, err) - 400 Bad Request

Utility Helpers:

parseLimitQuery(c, defaultLimit, maxLimit) - Parse and validate limit query param
getOrgByIDOrError(c, id) - Get org by ID or return error response
subtypesToStrings(subtypes) - Convert subtypes to string slice

2. ✅ Refactored All Handlers

Before: Each handler had duplicated error handling code After: All handlers use consistent helper methods

Refactored Handlers:

✅ Create - Uses badRequest(), errorResponse(), internalError()
✅ GetByID - Uses getOrgByIDOrError()
✅ GetAll - Uses internalError()
✅ Update - Uses badRequest(), getOrgByIDOrError(), errorResponse(), internalError()
✅ Delete - Uses notFound()
✅ GetBySubtype - Uses internalError()
✅ GetBySector - Uses internalError()
✅ GetSectorStats - Uses parseLimitQuery(), internalError()
✅ GetAllSubtypes - Uses subtypesToStrings()
✅ GetSubtypesBySector - Uses subtypesToStrings()
✅ GetByCertification - Uses internalError()
✅ Search - Uses errorResponse(), parseLimitQuery(), internalError()
✅ SearchSuggestions - Uses parseLimitQuery(), internalError()
✅ GetNearby - Uses badRequest(), internalError()
✅ UploadLogo - Uses errorResponse(), getOrgByIDOrError()
✅ UploadGalleryImage - Uses errorResponse(), getOrgByIDOrError()
✅ DeleteGalleryImage - Uses errorResponse(), getOrgByIDOrError()
✅ GetSimilarOrganizations - Uses parseLimitQuery(), getOrgByIDOrError(), errorResponse()
✅ GetOrganizationProposals - Uses errorResponse()
✅ GetOrganizationResources - Uses errorResponse()
✅ GetOrganizationProducts - Uses errorResponse()
✅ GetOrganizationServices - Uses errorResponse()
✅ GetDirectMatches - Uses errorResponse()
✅ GetUserOrganizations - Uses errorResponse()

Code Reduction

Lines removed: ~150-200 lines of duplicated code
Consistency: All error responses now follow the same pattern
Maintainability: Changes to error handling only need to be made in one place

Benefits

DRY Principle: No more duplicated error handling code
Consistency: All error responses use the same format
Maintainability: Easy to update error handling across all handlers
Readability: Handler methods are now cleaner and easier to read
Testability: Helper methods can be unit tested independently

Example: Before vs After

Before:

func (h *OrganizationHandler) GetByID(c *gin.Context) {
	id := c.Param("id")
	org, err := h.orgService.GetByID(c.Request.Context(), id)
	if err != nil {
		c.JSON(http.StatusNotFound, gin.H{"error": "Organization not found"})
		return
	}
	c.JSON(http.StatusOK, org)
}

After:

func (h *OrganizationHandler) GetByID(c *gin.Context) {
	id := c.Param("id")
	org, ok := h.getOrgByIDOrError(c, id)
	if !ok {
		return
	}
	c.JSON(http.StatusOK, org)
}

Routes

Routes file (organizations.go) was already clean and well-organized. No changes needed.

Testing

✅ No linter errors
✅ All handlers maintain the same functionality
✅ Error responses are consistent

Next Steps (Optional)

Add unit tests for helper methods
Consider adding request/response logging helpers
Consider adding request validation helpers
Consider extracting common patterns from GetOrganizationProducts and GetOrganizationServices

3.8 KiB Raw Blame History