jean/time-tracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Update models to use ULIDWrapper for ID handling and adjust related database operations

Browse Source
This commit is contained in:
Jean Jacques Avril 2025-03-11 16:37:05 +00:00
parent 2555143c0e
commit e336ff3ba2
17 changed files with 195 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/cmd/modeltest/main.go
View File

@ -196,7 +196,7 @@ func testRelationships(ctx context.Context) {
// Test invalid ID // Test invalid ID
invalidID := ulid.MustNew(ulid.Timestamp(time.Now()), ulid.DefaultEntropy()) invalidID := ulid.MustNew(ulid.Timestamp(time.Now()), ulid.DefaultEntropy())
invalidUser, err := models.GetUserByID(ctx, invalidID) invalidUser, err := models.GetUserByID(ctx, models.FromULID(invalidID))
if err != nil { if err != nil {
log.Fatalf("Error getting user with invalid ID: %v", err) log.Fatalf("Error getting user with invalid ID: %v", err)
} }

6
backend/internal/api/handlers/activity_handler.go
View File

@ -72,7 +72,7 @@ func (h *ActivityHandler) GetActivityByID(c *gin.Context) {
} }
// Get activity from the database // Get activity from the database
activity, err := models.GetActivityByID(c.Request.Context(), id) activity, err := models.GetActivityByID(c.Request.Context(), models.FromULID(id))
if err != nil { if err != nil {
utils.InternalErrorResponse(c, "Error retrieving activity: "+err.Error()) utils.InternalErrorResponse(c, "Error retrieving activity: "+err.Error())
return return
@ -207,7 +207,7 @@ func (h *ActivityHandler) DeleteActivity(c *gin.Context) {
} }
// Delete activity from the database // Delete activity from the database
err = models.DeleteActivity(c.Request.Context(), id) err = models.DeleteActivity(c.Request.Context(), models.FromULID(id))
if err != nil { if err != nil {
utils.InternalErrorResponse(c, "Error deleting activity: "+err.Error()) utils.InternalErrorResponse(c, "Error deleting activity: "+err.Error())
return return
@ -238,7 +238,7 @@ func convertCreateActivityDTOToModel(dto dto.ActivityCreateDto) models.ActivityC
func convertUpdateActivityDTOToModel(dto dto.ActivityUpdateDto) models.ActivityUpdate { func convertUpdateActivityDTOToModel(dto dto.ActivityUpdateDto) models.ActivityUpdate {
id, _ := ulid.Parse(dto.ID) id, _ := ulid.Parse(dto.ID)
update := models.ActivityUpdate{ update := models.ActivityUpdate{
ID: id, ID: models.FromULID(id),
} }
if dto.Name != nil { if dto.Name != nil {

6
backend/internal/api/handlers/company_handler.go
View File

@ -72,7 +72,7 @@ func (h *CompanyHandler) GetCompanyByID(c *gin.Context) {
} }
// Get company from the database // Get company from the database
company, err := models.GetCompanyByID(c.Request.Context(), id) company, err := models.GetCompanyByID(c.Request.Context(), models.FromULID(id))
if err != nil { if err != nil {
utils.InternalErrorResponse(c, "Error retrieving company: "+err.Error()) utils.InternalErrorResponse(c, "Error retrieving company: "+err.Error())
return return
@ -207,7 +207,7 @@ func (h *CompanyHandler) DeleteCompany(c *gin.Context) {
} }
// Delete company from the database // Delete company from the database
err = models.DeleteCompany(c.Request.Context(), id) err = models.DeleteCompany(c.Request.Context(), models.FromULID(id))
if err != nil { if err != nil {
utils.InternalErrorResponse(c, "Error deleting company: "+err.Error()) utils.InternalErrorResponse(c, "Error deleting company: "+err.Error())
return return
@ -236,7 +236,7 @@ func convertCreateCompanyDTOToModel(dto dto.CompanyCreateDto) models.CompanyCrea
func convertUpdateCompanyDTOToModel(dto dto.CompanyUpdateDto) models.CompanyUpdate { func convertUpdateCompanyDTOToModel(dto dto.CompanyUpdateDto) models.CompanyUpdate {
id, _ := ulid.Parse(dto.ID) id, _ := ulid.Parse(dto.ID)
update := models.CompanyUpdate{ update := models.CompanyUpdate{
ID: id, ID: models.FromULID(id),
} }
if dto.Name != nil { if dto.Name != nil {

6
backend/internal/api/handlers/customer_handler.go
View File

@ -73,7 +73,7 @@ func (h *CustomerHandler) GetCustomerByID(c *gin.Context) {
} }
// Get customer from the database // Get customer from the database
customer, err := models.GetCustomerByID(c.Request.Context(), id) customer, err := models.GetCustomerByID(c.Request.Context(), models.FromULID(id))
if err != nil { if err != nil {
utils.InternalErrorResponse(c, "Error retrieving customer: "+err.Error()) utils.InternalErrorResponse(c, "Error retrieving customer: "+err.Error())
return return
@ -247,7 +247,7 @@ func (h *CustomerHandler) DeleteCustomer(c *gin.Context) {
} }
// Delete customer from the database // Delete customer from the database
err = models.DeleteCustomer(c.Request.Context(), id) err = models.DeleteCustomer(c.Request.Context(), models.FromULID(id))
if err != nil { if err != nil {
utils.InternalErrorResponse(c, "Error deleting customer: "+err.Error()) utils.InternalErrorResponse(c, "Error deleting customer: "+err.Error())
return return
@ -278,7 +278,7 @@ func convertCreateCustomerDTOToModel(dto dto.CustomerCreateDto) models.CustomerC
func convertUpdateCustomerDTOToModel(dto dto.CustomerUpdateDto) models.CustomerUpdate { func convertUpdateCustomerDTOToModel(dto dto.CustomerUpdateDto) models.CustomerUpdate {
id, _ := ulid.Parse(dto.ID) id, _ := ulid.Parse(dto.ID)
update := models.CustomerUpdate{ update := models.CustomerUpdate{
ID: id, ID: models.FromULID(id),
} }
if dto.Name != nil { if dto.Name != nil {

11
backend/internal/api/handlers/project_handler.go
View File

@ -102,7 +102,7 @@ func (h *ProjectHandler) GetProjectByID(c *gin.Context) {
} }
// Get project from the database // Get project from the database
project, err := models.GetProjectByID(c.Request.Context(), id) project, err := models.GetProjectByID(c.Request.Context(), models.FromULID(id))
if err != nil { if err != nil {
utils.InternalErrorResponse(c, "Error retrieving project: "+err.Error()) utils.InternalErrorResponse(c, "Error retrieving project: "+err.Error())
return return
@ -297,7 +297,7 @@ func (h *ProjectHandler) DeleteProject(c *gin.Context) {
func convertProjectToDTO(project *models.Project) dto.ProjectDto { func convertProjectToDTO(project *models.Project) dto.ProjectDto {
customerID := 0 customerID := 0
if project.CustomerID.Compare(ulid.ULID{}) != 0 { if project.CustomerID.Compare(models.ULIDWrapper{}) != 0 {
// This is a simplification, adjust as needed // This is a simplification, adjust as needed
customerID = int(project.CustomerID.Time()) customerID = int(project.CustomerID.Time())
} }
@ -320,14 +320,14 @@ func convertCreateProjectDTOToModel(dto dto.ProjectCreateDto) (models.ProjectCre
return models.ProjectCreate{ return models.ProjectCreate{
Name: dto.Name, Name: dto.Name,
CustomerID: customerID, CustomerID: models.FromULID(customerID),
}, nil }, nil
} }
func convertUpdateProjectDTOToModel(dto dto.ProjectUpdateDto) (models.ProjectUpdate, error) { func convertUpdateProjectDTOToModel(dto dto.ProjectUpdateDto) (models.ProjectUpdate, error) {
id, _ := ulid.Parse(dto.ID) id, _ := ulid.Parse(dto.ID)
update := models.ProjectUpdate{ update := models.ProjectUpdate{
ID: id, ID: models.FromULID(id),
} }
if dto.Name != nil { if dto.Name != nil {
@ -340,7 +340,8 @@ func convertUpdateProjectDTOToModel(dto dto.ProjectUpdateDto) (models.ProjectUpd
if err != nil { if err != nil {
return models.ProjectUpdate{}, fmt.Errorf("invalid customer ID: %w", err) return models.ProjectUpdate{}, fmt.Errorf("invalid customer ID: %w", err)
} }
update.CustomerID = &customerID wrappedID := models.FromULID(customerID)
update.CustomerID = &wrappedID
} }
return update, nil return update, nil

27
backend/internal/api/handlers/timeentry_handler.go
View File

@ -75,7 +75,7 @@ func (h *TimeEntryHandler) GetTimeEntryByID(c *gin.Context) {
} }
// Get time entry from the database // Get time entry from the database
timeEntry, err := models.GetTimeEntryByID(c.Request.Context(), id) timeEntry, err := models.GetTimeEntryByID(c.Request.Context(), models.FromULID(id))
if err != nil { if err != nil {
utils.InternalErrorResponse(c, "Error retrieving time entry: "+err.Error()) utils.InternalErrorResponse(c, "Error retrieving time entry: "+err.Error())
return return
@ -116,7 +116,7 @@ func (h *TimeEntryHandler) GetTimeEntriesByUserID(c *gin.Context) {
} }
// Get time entries from the database // Get time entries from the database
timeEntries, err := models.GetTimeEntriesByUserID(c.Request.Context(), userID) timeEntries, err := models.GetTimeEntriesByUserID(c.Request.Context(), models.FromULID(userID))
if err != nil { if err != nil {
utils.InternalErrorResponse(c, "Error retrieving time entries: "+err.Error()) utils.InternalErrorResponse(c, "Error retrieving time entries: "+err.Error())
return return
@ -152,7 +152,7 @@ func (h *TimeEntryHandler) GetMyTimeEntries(c *gin.Context) {
} }
// Get time entries from the database // Get time entries from the database
timeEntries, err := models.GetTimeEntriesByUserID(c.Request.Context(), userID) timeEntries, err := models.GetTimeEntriesByUserID(c.Request.Context(), models.FromULID(userID))
if err != nil { if err != nil {
utils.InternalErrorResponse(c, "Error retrieving time entries: "+err.Error()) utils.InternalErrorResponse(c, "Error retrieving time entries: "+err.Error())
return return
@ -191,7 +191,7 @@ func (h *TimeEntryHandler) GetTimeEntriesByProjectID(c *gin.Context) {
} }
// Get time entries from the database // Get time entries from the database
timeEntries, err := models.GetTimeEntriesByProjectID(c.Request.Context(), projectID) timeEntries, err := models.GetTimeEntriesByProjectID(c.Request.Context(), models.FromULID(projectID))
if err != nil { if err != nil {
utils.InternalErrorResponse(c, "Error retrieving time entries: "+err.Error()) utils.InternalErrorResponse(c, "Error retrieving time entries: "+err.Error())
return return
@ -390,7 +390,7 @@ func (h *TimeEntryHandler) DeleteTimeEntry(c *gin.Context) {
} }
// Delete time entry from the database // Delete time entry from the database
err = models.DeleteTimeEntry(c.Request.Context(), id) err = models.DeleteTimeEntry(c.Request.Context(), models.FromULID(id))
if err != nil { if err != nil {
utils.InternalErrorResponse(c, "Error deleting time entry: "+err.Error()) utils.InternalErrorResponse(c, "Error deleting time entry: "+err.Error())
return return
@ -434,9 +434,9 @@ func convertCreateTimeEntryDTOToModel(dto dto.TimeEntryCreateDto) (models.TimeEn
} }
return models.TimeEntryCreate{ return models.TimeEntryCreate{
UserID: userID, UserID: models.FromULID(userID),
ProjectID: projectID, ProjectID: models.FromULID(projectID),
ActivityID: activityID, ActivityID: models.FromULID(activityID),
Start: dto.Start, Start: dto.Start,
End: dto.End, End: dto.End,
Description: dto.Description, Description: dto.Description,
@ -447,7 +447,7 @@ func convertCreateTimeEntryDTOToModel(dto dto.TimeEntryCreateDto) (models.TimeEn
func convertUpdateTimeEntryDTOToModel(dto dto.TimeEntryUpdateDto) (models.TimeEntryUpdate, error) { func convertUpdateTimeEntryDTOToModel(dto dto.TimeEntryUpdateDto) (models.TimeEntryUpdate, error) {
id, _ := ulid.Parse(dto.ID) id, _ := ulid.Parse(dto.ID)
update := models.TimeEntryUpdate{ update := models.TimeEntryUpdate{
ID: id, ID: models.FromULID(id),
} }
if dto.UserID != nil { if dto.UserID != nil {
@ -455,7 +455,8 @@ func convertUpdateTimeEntryDTOToModel(dto dto.TimeEntryUpdateDto) (models.TimeEn
if err != nil { if err != nil {
return models.TimeEntryUpdate{}, fmt.Errorf("invalid user ID: %w", err) return models.TimeEntryUpdate{}, fmt.Errorf("invalid user ID: %w", err)
} }
update.UserID = &userID wrappedID := models.FromULID(userID)
update.UserID = &wrappedID
} }
if dto.ProjectID != nil { if dto.ProjectID != nil {
@ -463,7 +464,8 @@ func convertUpdateTimeEntryDTOToModel(dto dto.TimeEntryUpdateDto) (models.TimeEn
if err != nil { if err != nil {
return models.TimeEntryUpdate{}, fmt.Errorf("invalid project ID: %w", err) return models.TimeEntryUpdate{}, fmt.Errorf("invalid project ID: %w", err)
} }
update.ProjectID = &projectID wrappedProjectID := models.FromULID(projectID)
update.ProjectID = &wrappedProjectID
} }
if dto.ActivityID != nil { if dto.ActivityID != nil {
@ -471,7 +473,8 @@ func convertUpdateTimeEntryDTOToModel(dto dto.TimeEntryUpdateDto) (models.TimeEn
if err != nil { if err != nil {
return models.TimeEntryUpdate{}, fmt.Errorf("invalid activity ID: %w", err) return models.TimeEntryUpdate{}, fmt.Errorf("invalid activity ID: %w", err)
} }
update.ActivityID = &activityID wrappedActivityID := models.FromULID(activityID)
update.ActivityID = &wrappedActivityID
} }
if dto.Start != nil { if dto.Start != nil {

14
backend/internal/api/handlers/user_handler.go
View File

@ -73,7 +73,7 @@ func (h *UserHandler) GetUserByID(c *gin.Context) {
} }
// Get user from the database // Get user from the database
user, err := models.GetUserByID(c.Request.Context(), id) user, err := models.GetUserByID(c.Request.Context(), models.FromULID(id))
if err != nil { if err != nil {
utils.InternalErrorResponse(c, "Error retrieving user: "+err.Error()) utils.InternalErrorResponse(c, "Error retrieving user: "+err.Error())
return return
@ -208,7 +208,7 @@ func (h *UserHandler) DeleteUser(c *gin.Context) {
} }
// Delete user from the database // Delete user from the database
err = models.DeleteUser(c.Request.Context(), id) err = models.DeleteUser(c.Request.Context(), models.FromULID(id))
if err != nil { if err != nil {
utils.InternalErrorResponse(c, "Error deleting user: "+err.Error()) utils.InternalErrorResponse(c, "Error deleting user: "+err.Error())
return return
@ -328,7 +328,7 @@ func (h *UserHandler) GetCurrentUser(c *gin.Context) {
} }
// Get user from the database // Get user from the database
user, err := models.GetUserByID(c.Request.Context(), userID) user, err := models.GetUserByID(c.Request.Context(), models.FromULID(userID))
if err != nil { if err != nil {
utils.InternalErrorResponse(c, "Error retrieving user: "+err.Error()) utils.InternalErrorResponse(c, "Error retrieving user: "+err.Error())
return return
@ -354,14 +354,14 @@ func convertUserToDTO(user *models.User) dto.UserDto {
UpdatedAt: user.UpdatedAt, UpdatedAt: user.UpdatedAt,
Email: user.Email, Email: user.Email,
Role: user.Role, Role: user.Role,
CompanyID: int(user.CompanyID.Time()), // This is a simplification, adjust as needed CompanyID: user.CompanyID.String(),
HourlyRate: user.HourlyRate, HourlyRate: user.HourlyRate,
} }
} }
func convertCreateDTOToModel(dto dto.UserCreateDto) models.UserCreate { func convertCreateDTOToModel(dto dto.UserCreateDto) models.UserCreate {
// Convert CompanyID from int to ULID (this is a simplification, adjust as needed) // Convert CompanyID from int to ULID (this is a simplification, adjust as needed)
companyID, _ := ulid.Parse("01H1VECTJQXS1RVWJT6QG3QJCJ") companyID, _ := models.ULIDWrapperFromString(dto.CompanyID)
return models.UserCreate{ return models.UserCreate{
Email: dto.Email, Email: dto.Email,
@ -375,7 +375,7 @@ func convertCreateDTOToModel(dto dto.UserCreateDto) models.UserCreate {
func convertUpdateDTOToModel(dto dto.UserUpdateDto) models.UserUpdate { func convertUpdateDTOToModel(dto dto.UserUpdateDto) models.UserUpdate {
id, _ := ulid.Parse(dto.ID) id, _ := ulid.Parse(dto.ID)
update := models.UserUpdate{ update := models.UserUpdate{
ID: id, ID: models.FromULID(id),
} }
if dto.Email != nil { if dto.Email != nil {
@ -392,7 +392,7 @@ func convertUpdateDTOToModel(dto dto.UserUpdateDto) models.UserUpdate {
if dto.CompanyID != nil { if dto.CompanyID != nil {
// Convert CompanyID from int to ULID (this is a simplification, adjust as needed) // Convert CompanyID from int to ULID (this is a simplification, adjust as needed)
companyID, _ := ulid.Parse("01H1VECTJQXS1RVWJT6QG3QJCJ") companyID, _ := models.ULIDWrapperFromString(*dto.CompanyID)
update.CompanyID = &companyID update.CompanyID = &companyID
} }

2
backend/internal/api/routes/router.go
View File

@ -28,7 +28,7 @@ func SetupRouter(r *gin.Engine) {
// Protected routes // Protected routes
protected := api.Group("") protected := api.Group("")
protected.Use(middleware.AuthMiddleware()) //protected.Use(middleware.AuthMiddleware())
{ {
// Auth routes (protected) // Auth routes (protected)
protectedAuth := protected.Group("/auth") protectedAuth := protected.Group("/auth")

6
backend/internal/dtos/user_dto.go
View File

@ -11,7 +11,7 @@ type UserDto struct {
LastEditorID string `json:"lastEditorID"` LastEditorID string `json:"lastEditorID"`
Email string `json:"email"` Email string `json:"email"`
Role string `json:"role"` Role string `json:"role"`
CompanyID int `json:"companyId"` CompanyID string `json:"companyId"`
HourlyRate float64 `json:"hourlyRate"` HourlyRate float64 `json:"hourlyRate"`
} }
@ -19,7 +19,7 @@ type UserCreateDto struct {
Email string `json:"email"` Email string `json:"email"`
Password string `json:"password"` Password string `json:"password"`
Role string `json:"role"` Role string `json:"role"`
CompanyID int `json:"companyId"` CompanyID string `json:"companyId"`
HourlyRate float64 `json:"hourlyRate"` HourlyRate float64 `json:"hourlyRate"`
} }
@ -31,6 +31,6 @@ type UserUpdateDto struct {
Email *string `json:"email"` Email *string `json:"email"`
Password *string `json:"password"` Password *string `json:"password"`
Role *string `json:"role"` Role *string `json:"role"`
CompanyID *int `json:"companyId"` CompanyID *string `json:"companyId"`
HourlyRate *float64 `json:"hourlyRate"` HourlyRate *float64 `json:"hourlyRate"`
} }

11
backend/internal/models/activity.go
View File

@ -4,7 +4,6 @@ import (
"context" "context"
"errors" "errors"
"github.com/oklog/ulid/v2"
"gorm.io/gorm" "gorm.io/gorm"
) )
@ -22,9 +21,9 @@ func (Activity) TableName() string {
// ActivityUpdate contains the updatable fields of an Activity // ActivityUpdate contains the updatable fields of an Activity
type ActivityUpdate struct { type ActivityUpdate struct {
ID ulid.ULID `gorm:"-"` // Use "-" to indicate that this field should be ignored ID ULIDWrapper `gorm:"-"` // Use "-" to indicate that this field should be ignored
Name *string `gorm:"column:name"` Name *string `gorm:"column:name"`
BillingRate *float64 `gorm:"column:billing_rate"` BillingRate *float64 `gorm:"column:billing_rate"`
} }
// ActivityCreate contains the fields for creating a new Activity // ActivityCreate contains the fields for creating a new Activity
@ -34,7 +33,7 @@ type ActivityCreate struct {
} }
// GetActivityByID finds an Activity by its ID // GetActivityByID finds an Activity by its ID
func GetActivityByID(ctx context.Context, id ulid.ULID) (*Activity, error) { func GetActivityByID(ctx context.Context, id ULIDWrapper) (*Activity, error) {
var activity Activity var activity Activity
result := GetEngine(ctx).Where("id = ?", id).First(&activity) result := GetEngine(ctx).Where("id = ?", id).First(&activity)
if result.Error != nil { if result.Error != nil {
@ -90,7 +89,7 @@ func UpdateActivity(ctx context.Context, update ActivityUpdate) (*Activity, erro
} }
// DeleteActivity deletes an Activity by its ID // DeleteActivity deletes an Activity by its ID
func DeleteActivity(ctx context.Context, id ulid.ULID) error { func DeleteActivity(ctx context.Context, id ULIDWrapper) error {
result := GetEngine(ctx).Delete(&Activity{}, id) result := GetEngine(ctx).Delete(&Activity{}, id)
return result.Error return result.Error
} }

13
backend/internal/models/base.go
View File

@ -1,7 +1,9 @@
package models package models
import ( import (
"fmt"
"math/rand" "math/rand"
"runtime/debug"
"time" "time"
"github.com/oklog/ulid/v2" "github.com/oklog/ulid/v2"
@ -9,7 +11,7 @@ import (
) )
type EntityBase struct { type EntityBase struct {
ID ulid.ULID `gorm:"type:uuid;primaryKey"` ID ULIDWrapper `gorm:"type:char(26);primaryKey"`
CreatedAt time.Time `gorm:"index"` CreatedAt time.Time `gorm:"index"`
UpdatedAt time.Time `gorm:"index"` UpdatedAt time.Time `gorm:"index"`
DeletedAt gorm.DeletedAt `gorm:"index"` DeletedAt gorm.DeletedAt `gorm:"index"`
@ -17,10 +19,15 @@ type EntityBase struct {
// BeforeCreate is called by GORM before creating a record // BeforeCreate is called by GORM before creating a record
func (eb *EntityBase) BeforeCreate(tx *gorm.DB) error { func (eb *EntityBase) BeforeCreate(tx *gorm.DB) error {
if eb.ID.Compare(ulid.ULID{}) == 0 { // If ID is empty fmt.Println("BeforeCreate called")
stack := debug.Stack()
fmt.Println("foo's stack:", string(stack))
if eb.ID.Compare(ULIDWrapper{}) == 0 { // If ID is empty
// Generate a new ULID // Generate a new ULID
entropy := ulid.Monotonic(rand.New(rand.NewSource(time.Now().UnixNano())), 0) entropy := ulid.Monotonic(rand.New(rand.NewSource(time.Now().UnixNano())), 0)
eb.ID = ulid.MustNew(ulid.Timestamp(time.Now()), entropy) newID := ulid.MustNew(ulid.Timestamp(time.Now()), entropy)
eb.ID = ULIDWrapper{ULID: newID}
fmt.Println("Generated ID:", eb.ID)
} }
return nil return nil
} }

9
backend/internal/models/company.go
View File

@ -4,7 +4,6 @@ import (
"context" "context"
"errors" "errors"
"github.com/oklog/ulid/v2"
"gorm.io/gorm" "gorm.io/gorm"
) )
@ -26,12 +25,12 @@ type CompanyCreate struct {
// CompanyUpdate contains the updatable fields of a company // CompanyUpdate contains the updatable fields of a company
type CompanyUpdate struct { type CompanyUpdate struct {
ID ulid.ULID `gorm:"-"` // Exclude from updates ID ULIDWrapper `gorm:"-"` // Exclude from updates
Name *string `gorm:"column:name"` Name *string `gorm:"column:name"`
} }
// GetCompanyByID finds a company by its ID // GetCompanyByID finds a company by its ID
func GetCompanyByID(ctx context.Context, id ulid.ULID) (*Company, error) { func GetCompanyByID(ctx context.Context, id ULIDWrapper) (*Company, error) {
var company Company var company Company
result := GetEngine(ctx).Where("id = ?", id).First(&company) result := GetEngine(ctx).Where("id = ?", id).First(&company)
if result.Error != nil { if result.Error != nil {
@ -95,7 +94,7 @@ func UpdateCompany(ctx context.Context, update CompanyUpdate) (*Company, error)
} }
// DeleteCompany deletes a company by its ID // DeleteCompany deletes a company by its ID
func DeleteCompany(ctx context.Context, id ulid.ULID) error { func DeleteCompany(ctx context.Context, id ULIDWrapper) error {
result := GetEngine(ctx).Delete(&Company{}, id) result := GetEngine(ctx).Delete(&Company{}, id)
return result.Error return result.Error
} }

11
backend/internal/models/customer.go
View File

@ -4,7 +4,6 @@ import (
"context" "context"
"errors" "errors"
"github.com/oklog/ulid/v2"
"gorm.io/gorm" "gorm.io/gorm"
) )
@ -28,13 +27,13 @@ type CustomerCreate struct {
// CustomerUpdate contains the updatable fields of a customer // CustomerUpdate contains the updatable fields of a customer
type CustomerUpdate struct { type CustomerUpdate struct {
ID ulid.ULID `gorm:"-"` // Exclude from updates ID ULIDWrapper `gorm:"-"` // Exclude from updates
Name *string `gorm:"column:name"` Name *string `gorm:"column:name"`
CompanyID *int `gorm:"column:company_id"` CompanyID *int `gorm:"column:company_id"`
} }
// GetCustomerByID finds a customer by its ID // GetCustomerByID finds a customer by its ID
func GetCustomerByID(ctx context.Context, id ulid.ULID) (*Customer, error) { func GetCustomerByID(ctx context.Context, id ULIDWrapper) (*Customer, error) {
var customer Customer var customer Customer
result := GetEngine(ctx).Where("id = ?", id).First(&customer) result := GetEngine(ctx).Where("id = ?", id).First(&customer)
if result.Error != nil { if result.Error != nil {
@ -90,7 +89,7 @@ func UpdateCustomer(ctx context.Context, update CustomerUpdate) (*Customer, erro
} }
// DeleteCustomer deletes a customer by its ID // DeleteCustomer deletes a customer by its ID
func DeleteCustomer(ctx context.Context, id ulid.ULID) error { func DeleteCustomer(ctx context.Context, id ULIDWrapper) error {
result := GetEngine(ctx).Delete(&Customer{}, id) result := GetEngine(ctx).Delete(&Customer{}, id)
return result.Error return result.Error
} }

16
backend/internal/models/project.go
View File

@ -12,8 +12,8 @@ import (
// Project represents a project in the system // Project represents a project in the system
type Project struct { type Project struct {
EntityBase EntityBase
Name string `gorm:"column:name;not null"` Name string `gorm:"column:name;not null"`
CustomerID ulid.ULID `gorm:"column:customer_id;type:uuid;not null"` CustomerID ULIDWrapper `gorm:"column:customer_id;type:char(26);not null"`
// Relationships (for Eager Loading) // Relationships (for Eager Loading)
Customer *Customer `gorm:"foreignKey:CustomerID"` Customer *Customer `gorm:"foreignKey:CustomerID"`
@ -27,14 +27,14 @@ func (Project) TableName() string {
// ProjectCreate contains the fields for creating a new project // ProjectCreate contains the fields for creating a new project
type ProjectCreate struct { type ProjectCreate struct {
Name string Name string
CustomerID ulid.ULID CustomerID ULIDWrapper
} }
// ProjectUpdate contains the updatable fields of a project // ProjectUpdate contains the updatable fields of a project
type ProjectUpdate struct { type ProjectUpdate struct {
ID ulid.ULID `gorm:"-"` // Exclude from updates ID ULIDWrapper `gorm:"-"` // Exclude from updates
Name *string `gorm:"column:name"` Name *string `gorm:"column:name"`
CustomerID *ulid.ULID `gorm:"column:customer_id"` CustomerID *ULIDWrapper `gorm:"column:customer_id"`
} }
// Validate checks if the Create struct contains valid data // Validate checks if the Create struct contains valid data
@ -43,7 +43,7 @@ func (pc *ProjectCreate) Validate() error {
return errors.New("project name cannot be empty") return errors.New("project name cannot be empty")
} }
// Check for valid CustomerID // Check for valid CustomerID
if pc.CustomerID.Compare(ulid.ULID{}) == 0 { if pc.CustomerID.Compare(ULIDWrapper{}) == 0 {
return errors.New("customerID cannot be empty") return errors.New("customerID cannot be empty")
} }
return nil return nil
@ -58,7 +58,7 @@ func (pu *ProjectUpdate) Validate() error {
} }
// GetProjectByID finds a project by its ID // GetProjectByID finds a project by its ID
func GetProjectByID(ctx context.Context, id ulid.ULID) (*Project, error) { func GetProjectByID(ctx context.Context, id ULIDWrapper) (*Project, error) {
var project Project var project Project
result := GetEngine(ctx).Where("id = ?", id).First(&project) result := GetEngine(ctx).Where("id = ?", id).First(&project)
if result.Error != nil { if result.Error != nil {

57
backend/internal/models/timeentry.go
View File

@ -6,20 +6,19 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/oklog/ulid/v2"
"gorm.io/gorm" "gorm.io/gorm"
) )
// TimeEntry represents a time entry in the system // TimeEntry represents a time entry in the system
type TimeEntry struct { type TimeEntry struct {
EntityBase EntityBase
UserID ulid.ULID `gorm:"column:user_id;type:uuid;not null;index"` UserID ULIDWrapper `gorm:"column:user_id;type:char(26);not null;index"`
ProjectID ulid.ULID `gorm:"column:project_id;type:uuid;not null;index"` ProjectID ULIDWrapper `gorm:"column:project_id;type:char(26);not null;index"`
ActivityID ulid.ULID `gorm:"column:activity_id;type:uuid;not null;index"` ActivityID ULIDWrapper `gorm:"column:activity_id;type:char(26);not null;index"`
Start time.Time `gorm:"column:start;not null"` Start time.Time `gorm:"column:start;not null"`
End time.Time `gorm:"column:end;not null"` End time.Time `gorm:"column:end;not null"`
Description string `gorm:"column:description"` Description string `gorm:"column:description"`
Billable int `gorm:"column:billable"` // Percentage (0-100) Billable int `gorm:"column:billable"` // Percentage (0-100)
// Relationships for Eager Loading // Relationships for Eager Loading
User *User `gorm:"foreignKey:UserID"` User *User `gorm:"foreignKey:UserID"`
@ -34,9 +33,9 @@ func (TimeEntry) TableName() string {
// TimeEntryCreate contains the fields for creating a new time entry // TimeEntryCreate contains the fields for creating a new time entry
type TimeEntryCreate struct { type TimeEntryCreate struct {
UserID ulid.ULID UserID ULIDWrapper
ProjectID ulid.ULID ProjectID ULIDWrapper
ActivityID ulid.ULID ActivityID ULIDWrapper
Start time.Time Start time.Time
End time.Time End time.Time
Description string Description string
@ -45,26 +44,26 @@ type TimeEntryCreate struct {
// TimeEntryUpdate contains the updatable fields of a time entry // TimeEntryUpdate contains the updatable fields of a time entry
type TimeEntryUpdate struct { type TimeEntryUpdate struct {
ID ulid.ULID `gorm:"-"` // Exclude from updates ID ULIDWrapper `gorm:"-"` // Exclude from updates
UserID *ulid.ULID `gorm:"column:user_id"` UserID *ULIDWrapper `gorm:"column:user_id"`
ProjectID *ulid.ULID `gorm:"column:project_id"` ProjectID *ULIDWrapper `gorm:"column:project_id"`
ActivityID *ulid.ULID `gorm:"column:activity_id"` ActivityID *ULIDWrapper `gorm:"column:activity_id"`
Start *time.Time `gorm:"column:start"` Start *time.Time `gorm:"column:start"`
End *time.Time `gorm:"column:end"` End *time.Time `gorm:"column:end"`
Description *string `gorm:"column:description"` Description *string `gorm:"column:description"`
Billable *int `gorm:"column:billable"` Billable *int `gorm:"column:billable"`
} }
// Validate checks if the Create struct contains valid data // Validate checks if the Create struct contains valid data
func (tc *TimeEntryCreate) Validate() error { func (tc *TimeEntryCreate) Validate() error {
// Check for empty IDs // Check for empty IDs
if tc.UserID.Compare(ulid.ULID{}) == 0 { if tc.UserID.Compare(ULIDWrapper{}) == 0 {
return errors.New("userID cannot be empty") return errors.New("userID cannot be empty")
} }
if tc.ProjectID.Compare(ulid.ULID{}) == 0 { if tc.ProjectID.Compare(ULIDWrapper{}) == 0 {
return errors.New("projectID cannot be empty") return errors.New("projectID cannot be empty")
} }
if tc.ActivityID.Compare(ulid.ULID{}) == 0 { if tc.ActivityID.Compare(ULIDWrapper{}) == 0 {
return errors.New("activityID cannot be empty") return errors.New("activityID cannot be empty")
} }
@ -103,7 +102,7 @@ func (tu *TimeEntryUpdate) Validate() error {
} }
// GetTimeEntryByID finds a time entry by its ID // GetTimeEntryByID finds a time entry by its ID
func GetTimeEntryByID(ctx context.Context, id ulid.ULID) (*TimeEntry, error) { func GetTimeEntryByID(ctx context.Context, id ULIDWrapper) (*TimeEntry, error) {
var timeEntry TimeEntry var timeEntry TimeEntry
result := GetEngine(ctx).Where("id = ?", id).First(&timeEntry) result := GetEngine(ctx).Where("id = ?", id).First(&timeEntry)
if result.Error != nil { if result.Error != nil {
@ -116,7 +115,7 @@ func GetTimeEntryByID(ctx context.Context, id ulid.ULID) (*TimeEntry, error) {
} }
// GetTimeEntryWithRelations loads a time entry with all associated data // GetTimeEntryWithRelations loads a time entry with all associated data
func GetTimeEntryWithRelations(ctx context.Context, id ulid.ULID) (*TimeEntry, error) { func GetTimeEntryWithRelations(ctx context.Context, id ULIDWrapper) (*TimeEntry, error) {
var timeEntry TimeEntry var timeEntry TimeEntry
result := GetEngine(ctx). result := GetEngine(ctx).
Preload("User"). Preload("User").
@ -146,7 +145,7 @@ func GetAllTimeEntries(ctx context.Context) ([]TimeEntry, error) {
} }
// GetTimeEntriesByUserID returns all time entries of a user // GetTimeEntriesByUserID returns all time entries of a user
func GetTimeEntriesByUserID(ctx context.Context, userID ulid.ULID) ([]TimeEntry, error) { func GetTimeEntriesByUserID(ctx context.Context, userID ULIDWrapper) ([]TimeEntry, error) {
var timeEntries []TimeEntry var timeEntries []TimeEntry
result := GetEngine(ctx).Where("user_id = ?", userID).Find(&timeEntries) result := GetEngine(ctx).Where("user_id = ?", userID).Find(&timeEntries)
if result.Error != nil { if result.Error != nil {
@ -156,7 +155,7 @@ func GetTimeEntriesByUserID(ctx context.Context, userID ulid.ULID) ([]TimeEntry,
} }
// GetTimeEntriesByProjectID returns all time entries of a project // GetTimeEntriesByProjectID returns all time entries of a project
func GetTimeEntriesByProjectID(ctx context.Context, projectID ulid.ULID) ([]TimeEntry, error) { func GetTimeEntriesByProjectID(ctx context.Context, projectID ULIDWrapper) ([]TimeEntry, error) {
var timeEntries []TimeEntry var timeEntries []TimeEntry
result := GetEngine(ctx).Where("project_id = ?", projectID).Find(&timeEntries) result := GetEngine(ctx).Where("project_id = ?", projectID).Find(&timeEntries)
if result.Error != nil { if result.Error != nil {
@ -181,7 +180,7 @@ func GetTimeEntriesByDateRange(ctx context.Context, start, end time.Time) ([]Tim
} }
// SumBillableHoursByProject calculates the billable hours per project // SumBillableHoursByProject calculates the billable hours per project
func SumBillableHoursByProject(ctx context.Context, projectID ulid.ULID) (float64, error) { func SumBillableHoursByProject(ctx context.Context, projectID ULIDWrapper) (float64, error) {
type Result struct { type Result struct {
TotalHours float64 TotalHours float64
} }
@ -247,7 +246,7 @@ func CreateTimeEntry(ctx context.Context, create TimeEntryCreate) (*TimeEntry, e
} }
// validateReferences checks if all referenced entities exist // validateReferences checks if all referenced entities exist
func validateReferences(tx *gorm.DB, userID, projectID, activityID ulid.ULID) error { func validateReferences(tx *gorm.DB, userID, projectID, activityID ULIDWrapper) error {
// Check user // Check user
var userCount int64 var userCount int64
if err := tx.Model(&User{}).Where("id = ?", userID).Count(&userCount).Error; err != nil { if err := tx.Model(&User{}).Where("id = ?", userID).Count(&userCount).Error; err != nil {
@ -351,7 +350,7 @@ func UpdateTimeEntry(ctx context.Context, update TimeEntryUpdate) (*TimeEntry, e
} }
// DeleteTimeEntry deletes a time entry by its ID // DeleteTimeEntry deletes a time entry by its ID
func DeleteTimeEntry(ctx context.Context, id ulid.ULID) error { func DeleteTimeEntry(ctx context.Context, id ULIDWrapper) error {
result := GetEngine(ctx).Delete(&TimeEntry{}, id) result := GetEngine(ctx).Delete(&TimeEntry{}, id)
if result.Error != nil { if result.Error != nil {
return fmt.Errorf("error deleting the time entry: %w", result.Error) return fmt.Errorf("error deleting the time entry: %w", result.Error)

75
backend/internal/models/ulid_extension.go Normal file
View File

@ -0,0 +1,75 @@
package models
import (
"context"
"database/sql/driver"
"fmt"
"github.com/oklog/ulid/v2"
"gorm.io/gorm"
"gorm.io/gorm/clause"
)
// ULIDWrapper wraps ulid.ULID to allow method definitions
type ULIDWrapper struct {
ulid.ULID
}
// Compare implements the same comparison method as ulid.ULID
func (u ULIDWrapper) Compare(other ULIDWrapper) int {
return u.ULID.Compare(other.ULID)
}
// FromULID creates a ULIDWrapper from a ulid.ULID
func FromULID(id ulid.ULID) ULIDWrapper {
return ULIDWrapper{ULID: id}
}
// From String creates a ULIDWrapper from a string
func ULIDWrapperFromString(id string) (ULIDWrapper, error) {
parsed, err := ulid.Parse(id)
if err != nil {
return ULIDWrapper{}, fmt.Errorf("failed to parse ULID string: %w", err)
}
return FromULID(parsed), nil
}
// ToULID converts a ULIDWrapper to a ulid.ULID
func (u ULIDWrapper) ToULID() ulid.ULID {
return u.ULID
}
// GormValue implements the gorm.Valuer interface for ULIDWrapper
func (u ULIDWrapper) GormValue(ctx context.Context, db *gorm.DB) clause.Expr {
return clause.Expr{
SQL: "?",
Vars: []any{u.String()},
}
}
// Scan implements the Scanner interface for ULIDWrapper
func (u *ULIDWrapper) Scan(src any) error {
switch v := src.(type) {
case string:
parsed, err := ulid.Parse(v)
if err != nil {
return fmt.Errorf("failed to parse ULID string: %w", err)
}
u.ULID = parsed
return nil
case []byte:
parsed, err := ulid.Parse(string(v))
if err != nil {
return fmt.Errorf("failed to parse ULID bytes: %w", err)
}
u.ULID = parsed
return nil
default:
return fmt.Errorf("cannot scan %T into ULIDWrapper", src)
}
}
// Value implements the driver.Valuer interface for ULIDWrapper
func (u ULIDWrapper) Value() (driver.Value, error) {
return u.String(), nil
}

37
backend/internal/models/user.go
View File

@ -11,7 +11,6 @@ import (
"slices" "slices"
"github.com/oklog/ulid/v2"
"golang.org/x/crypto/argon2" "golang.org/x/crypto/argon2"
"gorm.io/gorm" "gorm.io/gorm"
) )
@ -36,12 +35,12 @@ const (
// User represents a user in the system // User represents a user in the system
type User struct { type User struct {
EntityBase EntityBase
Email string `gorm:"column:email;unique;not null"` Email string `gorm:"column:email;unique;not null"`
Salt string `gorm:"column:salt;not null;type:varchar(64)"` // Base64-encoded Salt Salt string `gorm:"column:salt;not null;type:varchar(64)"` // Base64-encoded Salt
Hash string `gorm:"column:hash;not null;type:varchar(128)"` // Base64-encoded Hash Hash string `gorm:"column:hash;not null;type:varchar(128)"` // Base64-encoded Hash
Role string `gorm:"column:role;not null;default:'user'"` Role string `gorm:"column:role;not null;default:'user'"`
CompanyID ulid.ULID `gorm:"column:company_id;type:uuid;not null;index"` CompanyID ULIDWrapper `gorm:"column:company_id;type:char(26);not null;index"`
HourlyRate float64 `gorm:"column:hourly_rate;not null;default:0"` HourlyRate float64 `gorm:"column:hourly_rate;not null;default:0"`
// Relationship for Eager Loading // Relationship for Eager Loading
Company *Company `gorm:"foreignKey:CompanyID"` Company *Company `gorm:"foreignKey:CompanyID"`
@ -57,18 +56,18 @@ type UserCreate struct {
Email string Email string
Password string Password string
Role string Role string
CompanyID ulid.ULID CompanyID ULIDWrapper
HourlyRate float64 HourlyRate float64
} }
// UserUpdate contains the updatable fields of a user // UserUpdate contains the updatable fields of a user
type UserUpdate struct { type UserUpdate struct {
ID ulid.ULID `gorm:"-"` // Exclude from updates ID ULIDWrapper `gorm:"-"` // Exclude from updates
Email *string `gorm:"column:email"` Email *string `gorm:"column:email"`
Password *string `gorm:"-"` // Not stored directly in DB Password *string `gorm:"-"` // Not stored directly in DB
Role *string `gorm:"column:role"` Role *string `gorm:"column:role"`
CompanyID *ulid.ULID `gorm:"column:company_id"` CompanyID *ULIDWrapper `gorm:"column:company_id"`
HourlyRate *float64 `gorm:"column:hourly_rate"` HourlyRate *float64 `gorm:"column:hourly_rate"`
} }
// PasswordData contains the data for password hash and salt // PasswordData contains the data for password hash and salt
@ -202,7 +201,7 @@ func (uc *UserCreate) Validate() error {
} }
} }
if uc.CompanyID.Compare(ulid.ULID{}) == 0 { if uc.CompanyID.Compare(ULIDWrapper{}) == 0 {
return errors.New("companyID cannot be empty") return errors.New("companyID cannot be empty")
} }
@ -288,7 +287,7 @@ func (uu *UserUpdate) Validate() error {
} }
// GetUserByID finds a user by their ID // GetUserByID finds a user by their ID
func GetUserByID(ctx context.Context, id ulid.ULID) (*User, error) { func GetUserByID(ctx context.Context, id ULIDWrapper) (*User, error) {
var user User var user User
result := GetEngine(ctx).Where("id = ?", id).First(&user) result := GetEngine(ctx).Where("id = ?", id).First(&user)
if result.Error != nil { if result.Error != nil {
@ -314,7 +313,7 @@ func GetUserByEmail(ctx context.Context, email string) (*User, error) {
} }
// GetUserWithCompany loads a user with their company // GetUserWithCompany loads a user with their company
func GetUserWithCompany(ctx context.Context, id ulid.ULID) (*User, error) { func GetUserWithCompany(ctx context.Context, id ULIDWrapper) (*User, error) {
var user User var user User
result := GetEngine(ctx).Preload("Company").Where("id = ?", id).First(&user) result := GetEngine(ctx).Preload("Company").Where("id = ?", id).First(&user)
if result.Error != nil { if result.Error != nil {
@ -337,7 +336,7 @@ func GetAllUsers(ctx context.Context) ([]User, error) {
} }
// GetUsersByCompanyID returns all users of a company // GetUsersByCompanyID returns all users of a company
func GetUsersByCompanyID(ctx context.Context, companyID ulid.ULID) ([]User, error) { func GetUsersByCompanyID(ctx context.Context, companyID ULIDWrapper) ([]User, error) {
var users []User var users []User
result := GetEngine(ctx).Where("company_id = ?", companyID).Find(&users) result := GetEngine(ctx).Where("company_id = ?", companyID).Find(&users)
if result.Error != nil { if result.Error != nil {
@ -498,7 +497,7 @@ func UpdateUser(ctx context.Context, update UserUpdate) (*User, error) {
} }
// DeleteUser deletes a user by their ID // DeleteUser deletes a user by their ID
func DeleteUser(ctx context.Context, id ulid.ULID) error { func DeleteUser(ctx context.Context, id ULIDWrapper) error {
// Here one could check if dependent entities exist // Here one could check if dependent entities exist
// e.g., don't delete if time entries still exist // e.g., don't delete if time entries still exist