admin/honeyDueAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make contractor residence optional with visibility rules

Browse Source 
- Make residence_id nullable in contractor model
- Add created_by_id field to track contractor creator
- Update access control: personal contractors visible only to creator,
  residence contractors visible to all residence users
- Add database migration for schema changes
- Update admin panel DTOs and handlers for optional residence
- Fix test utilities for new model structure

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Trey t
2025-11-29 18:42:11 -06:00
parent 9e91e274e8
commit 4e9b31377b
13 changed files with 123 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/admin/dto/requests.go
View File

@@ -279,7 +279,7 @@ type CreateTaskRequest struct {
// CreateContractorRequest for creating a new contractor
type CreateContractorRequest struct {
ResidenceID uint `json:"residence_id" binding:"required"`
ResidenceID *uint `json:"residence_id"`
CreatedByID uint `json:"created_by_id" binding:"required"`
Name string `json:"name" binding:"required,max=200"`
Company string `json:"company" binding:"max=200"`

4
internal/admin/dto/responses.go
View File

@@ -151,8 +151,8 @@ type TaskDetailResponse struct {
// ContractorResponse represents a contractor in admin responses
type ContractorResponse struct {
ID uint `json:"id"`
ResidenceID uint `json:"residence_id"`
ResidenceName string `json:"residence_name"`
ResidenceID *uint `json:"residence_id,omitempty"`
ResidenceName string `json:"residence_name,omitempty"`
CreatedByID uint `json:"created_by_id"`
CreatedByName string `json:"created_by_name"`
Name string `json:"name"`

16
internal/admin/handlers/contractor_handler.go
View File

@@ -149,7 +149,7 @@ func (h *AdminContractorHandler) Update(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": "Residence not found"})
return
}
contractor.ResidenceID = *req.ResidenceID
contractor.ResidenceID = req.ResidenceID
}
// Verify created_by if changing
if req.CreatedByID != nil {
@@ -229,11 +229,13 @@ func (h *AdminContractorHandler) Create(c *gin.Context) {
return
}
// Verify residence exists
var residence models.Residence
if err := h.db.First(&residence, req.ResidenceID).Error; err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "Residence not found"})
return
// Verify residence exists if provided
if req.ResidenceID != nil {
var residence models.Residence
if err := h.db.First(&residence, *req.ResidenceID).Error; err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "Residence not found"})
return
}
}
// Verify created_by user exists
@@ -342,7 +344,7 @@ func (h *AdminContractorHandler) toContractorResponse(contractor *models.Contrac
UpdatedAt: contractor.UpdatedAt.Format("2006-01-02T15:04:05Z"),
}
if contractor.Residence.ID != 0 {
if contractor.Residence != nil && contractor.Residence.ID != 0 {
response.ResidenceName = contractor.Residence.Name
}
if contractor.CreatedBy.ID != 0 {