diff --git a/backend/Makefile b/backend/Makefile index c83321b..94a2c16 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -5,7 +5,7 @@ test: go test -p=1 -count=1 -failfast -timeout 10m ./internal/... lint: - golangci-lint fmt ./internal/... ./cmd/... && golangci-lint run ./internal/... ./cmd/... + golangci-lint fmt && golangci-lint run migration-create: goose create $(name) sql diff --git a/backend/internal/features/intervals/model.go b/backend/internal/features/intervals/model.go index 2f248e2..921aa96 100644 --- a/backend/internal/features/intervals/model.go +++ b/backend/internal/features/intervals/model.go @@ -13,11 +13,11 @@ type Interval struct { ID uuid.UUID `json:"id" gorm:"primaryKey;type:uuid;default:gen_random_uuid()"` Interval IntervalType `json:"interval" gorm:"type:text;not null"` - TimeOfDay *string `json:"timeOfDay" gorm:"type:text;"` + TimeOfDay *string `json:"timeOfDay" gorm:"type:text;"` // only for WEEKLY - Weekday *int `json:"weekday,omitempty" gorm:"type:int"` + Weekday *int `json:"weekday,omitempty" gorm:"type:int"` // only for MONTHLY - DayOfMonth *int `json:"dayOfMonth,omitempty" gorm:"type:int"` + DayOfMonth *int `json:"dayOfMonth,omitempty" gorm:"type:int"` // only for CRON CronExpression *string `json:"cronExpression,omitempty" gorm:"type:text"` } diff --git a/backend/internal/features/users/models/users_settings.go b/backend/internal/features/users/models/users_settings.go index 23c882a..5e75d8a 100644 --- a/backend/internal/features/users/models/users_settings.go +++ b/backend/internal/features/users/models/users_settings.go @@ -3,11 +3,11 @@ package users_models import "github.com/google/uuid" type UsersSettings struct { - ID uuid.UUID `json:"id" gorm:"type:uuid;primary_key;default:gen_random_uuid()"` + ID uuid.UUID `json:"id" gorm:"type:uuid;primary_key;default:gen_random_uuid()"` // means that any user can register via sign up form without invitation - IsAllowExternalRegistrations bool `json:"isAllowExternalRegistrations" gorm:"column:is_allow_external_registrations"` + IsAllowExternalRegistrations bool `json:"isAllowExternalRegistrations" gorm:"column:is_allow_external_registrations"` // means that any user with role MEMBER can invite other users - IsAllowMemberInvitations bool `json:"isAllowMemberInvitations" gorm:"column:is_allow_member_invitations"` + IsAllowMemberInvitations bool `json:"isAllowMemberInvitations" gorm:"column:is_allow_member_invitations"` // means that any user with role MEMBER can create their own workspaces IsMemberAllowedToCreateWorkspaces bool `json:"isMemberAllowedToCreateWorkspaces" gorm:"column:is_member_allowed_to_create_workspaces"` }