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

Compare commits

base: jean:0379ea4ae4e9b22ec86ae034e9c15b6fb5836e3f
Branches Tags
jean:main
jean:ja/feat/init
jean:docu
..
compare: jean:c3162756ad9b0cea1253bd1864d84d2163abae7e
Branches Tags
jean:main
jean:ja/feat/init
jean:docu

No commits in common. "0379ea4ae4e9b22ec86ae034e9c15b6fb5836e3f" and "c3162756ad9b0cea1253bd1864d84d2163abae7e" have entirely different histories.
0379ea4ae4 ... c3162756ad

14 changed files with 396 additions and 713 deletions
Show Stats Expand all files Collapse all files

32
backend/Makefile
View File

@ -1,6 +1,6 @@
# Time Tracker Backend Makefile
.PHONY: db-start db-stop db-test model-test run build clean migrate seed swagger help
.PHONY: db-start db-stop db-test model-test run build clean migrate seed help
# Default target
.DEFAULT_GOAL := help
@ -25,9 +25,7 @@ help:
@echo " make seed - Seed the database with initial data"
@echo " make db-drop-users - Drop the users table"
@echo " make db-reinit - Re-initialize the database"
@echo " make swagger - Generate swagger documentation"
@echo " make help - Show this help message"
@echo "" make generate-ts - Generate TypeScript types
# Start the database
db-start:
@ -90,15 +88,21 @@ db-drop-users:
db-reinit:
@echo "Re-initializing the database..."
@PG_HOST=$(DB_HOST) PG_PORT=$(DB_PORT) PG_USER=$(DB_USER) PG_PASSWORD=$(DB_PASSWORD) PG_DBNAME=$(DB_NAME) go run cmd/migrate/main.go -create_db -drop_db
# Generate swagger documentation
swagger:
@echo "Generating swagger documentation..."
@swag init -g cmd/api/main.go
@echo "Swagger documentation generated"
# Generate TypeScript types
generate-ts:
@echo "Generating TypeScript types..."
@tygo generate
@echo "TypeScript types generated"
@echo "Database re-initialized"
help:
@echo "Time Tracker Backend Makefile"
@echo ""
@echo "Usage:"
@echo " make db-start - Start the PostgreSQL database container"
@echo " make db-stop - Stop the PostgreSQL database container"
@echo " make db-test - Test the database connection"
@echo " make model-test - Test the database models"
@echo " make run - Run the application"
@echo " make build - Build the application"
@echo " make clean - Remove build artifacts"
@echo " make migrate - Run database migrations"
@echo " make seed - Seed the database with initial data"
@echo " make db-drop-users - Drop the users table"
@echo " make db-reinit - Re-initialize the database"
@echo " make help - Show this help message"

321
backend/docs/docs.go
View File

@ -4112,12 +4112,10 @@ const docTemplate = `{
"type": "object",
"properties": {
"billingRate": {
"type": "number",
"example": 100
"type": "number"
},
"name": {
"type": "string",
"example": "Development"
"type": "string"
}
}
},
@ -4125,28 +4123,22 @@ const docTemplate = `{
"type": "object",
"properties": {
"billingRate": {
"type": "number",
"example": 100
"type": "number"
},
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"id": {
"type": "string",
"example": "a1b2c3d4e5f6"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "u1v2w3x4y5z6"
"type": "string"
},
"name": {
"type": "string",
"example": "Development"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4154,28 +4146,22 @@ const docTemplate = `{
"type": "object",
"properties": {
"billingRate": {
"type": "number",
"example": 100
"type": "number"
},
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"id": {
"type": "string",
"example": "a1b2c3d4e5f6"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "u1v2w3x4y5z6"
"type": "string"
},
"name": {
"type": "string",
"example": "Development"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4183,8 +4169,7 @@ const docTemplate = `{
"type": "object",
"properties": {
"name": {
"type": "string",
"example": "Acme Corp"
"type": "string"
}
}
},
@ -4192,24 +4177,19 @@ const docTemplate = `{
"type": "object",
"properties": {
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"name": {
"type": "string",
"example": "Acme Corp"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4217,24 +4197,19 @@ const docTemplate = `{
"type": "object",
"properties": {
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"name": {
"type": "string",
"example": "Acme Corp"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4242,12 +4217,10 @@ const docTemplate = `{
"type": "object",
"properties": {
"companyId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"name": {
"type": "string",
"example": "John Doe"
"type": "string"
}
}
},
@ -4255,28 +4228,22 @@ const docTemplate = `{
"type": "object",
"properties": {
"companyId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"name": {
"type": "string",
"example": "John Doe"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4284,28 +4251,22 @@ const docTemplate = `{
"type": "object",
"properties": {
"companyId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"name": {
"type": "string",
"example": "John Doe"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4313,12 +4274,10 @@ const docTemplate = `{
"type": "object",
"properties": {
"email": {
"type": "string",
"example": "admin@example.com"
"type": "string"
},
"password": {
"type": "string",
"example": "Admin@123456"
"type": "string"
}
}
},
@ -4326,12 +4285,10 @@ const docTemplate = `{
"type": "object",
"properties": {
"customerId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"name": {
"type": "string",
"example": "Time Tracking App"
"type": "string"
}
}
},
@ -4339,28 +4296,22 @@ const docTemplate = `{
"type": "object",
"properties": {
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"customerId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"name": {
"type": "string",
"example": "Time Tracking App"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4368,28 +4319,22 @@ const docTemplate = `{
"type": "object",
"properties": {
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"customerId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"name": {
"type": "string",
"example": "Time Tracking App"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4397,33 +4342,26 @@ const docTemplate = `{
"type": "object",
"properties": {
"activityId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"billable": {
"description": "Percentage (0-100)",
"type": "integer",
"example": 100
"type": "integer"
},
"description": {
"type": "string",
"example": "Working on the Time Tracking App"
"type": "string"
},
"end": {
"type": "string",
"example": "2024-01-01T17:00:00Z"
"type": "string"
},
"projectId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"start": {
"type": "string",
"example": "2024-01-01T08:00:00Z"
"type": "string"
},
"userId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
}
}
},
@ -4431,49 +4369,38 @@ const docTemplate = `{
"type": "object",
"properties": {
"activityId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"billable": {
"description": "Percentage (0-100)",
"type": "integer",
"example": 100
"type": "integer"
},
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"description": {
"type": "string",
"example": "Working on the Time Tracking App"
"type": "string"
},
"end": {
"type": "string",
"example": "2024-01-01T17:00:00Z"
"type": "string"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"projectId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"start": {
"type": "string",
"example": "2024-01-01T08:00:00Z"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"userId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
}
}
},
@ -4481,49 +4408,38 @@ const docTemplate = `{
"type": "object",
"properties": {
"activityId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"billable": {
"description": "Percentage (0-100)",
"type": "integer",
"example": 100
"type": "integer"
},
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"description": {
"type": "string",
"example": "Working on the Time Tracking App"
"type": "string"
},
"end": {
"type": "string",
"example": "2024-01-01T17:00:00Z"
"type": "string"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"projectId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"start": {
"type": "string",
"example": "2024-01-01T08:00:00Z"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"userId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
}
}
},
@ -4531,8 +4447,7 @@ const docTemplate = `{
"type": "object",
"properties": {
"token": {
"type": "string",
"example": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"
"type": "string"
},
"user": {
"$ref": "#/definitions/dto.UserDto"
@ -4543,24 +4458,19 @@ const docTemplate = `{
"type": "object",
"properties": {
"companyId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"email": {
"type": "string",
"example": "test@example.com"
"type": "string"
},
"hourlyRate": {
"type": "number",
"example": 50
"type": "number"
},
"password": {
"type": "string",
"example": "password123"
"type": "string"
},
"role": {
"type": "string",
"example": "admin"
"type": "string"
}
}
},
@ -4568,36 +4478,28 @@ const docTemplate = `{
"type": "object",
"properties": {
"companyId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"email": {
"type": "string",
"example": "test@example.com"
"type": "string"
},
"hourlyRate": {
"type": "number",
"example": 50
"type": "number"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"role": {
"type": "string",
"example": "admin"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4605,40 +4507,31 @@ const docTemplate = `{
"type": "object",
"properties": {
"companyId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"email": {
"type": "string",
"example": "test@example.com"
"type": "string"
},
"hourlyRate": {
"type": "number",
"example": 50
"type": "number"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"password": {
"type": "string",
"example": "password123"
"type": "string"
},
"role": {
"type": "string",
"example": "admin"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},

321
backend/docs/swagger.json
View File

@ -4106,12 +4106,10 @@
"type": "object",
"properties": {
"billingRate": {
"type": "number",
"example": 100
"type": "number"
},
"name": {
"type": "string",
"example": "Development"
"type": "string"
}
}
},
@ -4119,28 +4117,22 @@
"type": "object",
"properties": {
"billingRate": {
"type": "number",
"example": 100
"type": "number"
},
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"id": {
"type": "string",
"example": "a1b2c3d4e5f6"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "u1v2w3x4y5z6"
"type": "string"
},
"name": {
"type": "string",
"example": "Development"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4148,28 +4140,22 @@
"type": "object",
"properties": {
"billingRate": {
"type": "number",
"example": 100
"type": "number"
},
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"id": {
"type": "string",
"example": "a1b2c3d4e5f6"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "u1v2w3x4y5z6"
"type": "string"
},
"name": {
"type": "string",
"example": "Development"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4177,8 +4163,7 @@
"type": "object",
"properties": {
"name": {
"type": "string",
"example": "Acme Corp"
"type": "string"
}
}
},
@ -4186,24 +4171,19 @@
"type": "object",
"properties": {
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"name": {
"type": "string",
"example": "Acme Corp"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4211,24 +4191,19 @@
"type": "object",
"properties": {
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"name": {
"type": "string",
"example": "Acme Corp"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4236,12 +4211,10 @@
"type": "object",
"properties": {
"companyId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"name": {
"type": "string",
"example": "John Doe"
"type": "string"
}
}
},
@ -4249,28 +4222,22 @@
"type": "object",
"properties": {
"companyId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"name": {
"type": "string",
"example": "John Doe"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4278,28 +4245,22 @@
"type": "object",
"properties": {
"companyId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"name": {
"type": "string",
"example": "John Doe"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4307,12 +4268,10 @@
"type": "object",
"properties": {
"email": {
"type": "string",
"example": "admin@example.com"
"type": "string"
},
"password": {
"type": "string",
"example": "Admin@123456"
"type": "string"
}
}
},
@ -4320,12 +4279,10 @@
"type": "object",
"properties": {
"customerId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"name": {
"type": "string",
"example": "Time Tracking App"
"type": "string"
}
}
},
@ -4333,28 +4290,22 @@
"type": "object",
"properties": {
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"customerId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"name": {
"type": "string",
"example": "Time Tracking App"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4362,28 +4313,22 @@
"type": "object",
"properties": {
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"customerId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"name": {
"type": "string",
"example": "Time Tracking App"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4391,33 +4336,26 @@
"type": "object",
"properties": {
"activityId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"billable": {
"description": "Percentage (0-100)",
"type": "integer",
"example": 100
"type": "integer"
},
"description": {
"type": "string",
"example": "Working on the Time Tracking App"
"type": "string"
},
"end": {
"type": "string",
"example": "2024-01-01T17:00:00Z"
"type": "string"
},
"projectId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"start": {
"type": "string",
"example": "2024-01-01T08:00:00Z"
"type": "string"
},
"userId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
}
}
},
@ -4425,49 +4363,38 @@
"type": "object",
"properties": {
"activityId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"billable": {
"description": "Percentage (0-100)",
"type": "integer",
"example": 100
"type": "integer"
},
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"description": {
"type": "string",
"example": "Working on the Time Tracking App"
"type": "string"
},
"end": {
"type": "string",
"example": "2024-01-01T17:00:00Z"
"type": "string"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"projectId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"start": {
"type": "string",
"example": "2024-01-01T08:00:00Z"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"userId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
}
}
},
@ -4475,49 +4402,38 @@
"type": "object",
"properties": {
"activityId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"billable": {
"description": "Percentage (0-100)",
"type": "integer",
"example": 100
"type": "integer"
},
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"description": {
"type": "string",
"example": "Working on the Time Tracking App"
"type": "string"
},
"end": {
"type": "string",
"example": "2024-01-01T17:00:00Z"
"type": "string"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"projectId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"start": {
"type": "string",
"example": "2024-01-01T08:00:00Z"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"userId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
}
}
},
@ -4525,8 +4441,7 @@
"type": "object",
"properties": {
"token": {
"type": "string",
"example": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"
"type": "string"
},
"user": {
"$ref": "#/definitions/dto.UserDto"
@ -4537,24 +4452,19 @@
"type": "object",
"properties": {
"companyId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"email": {
"type": "string",
"example": "test@example.com"
"type": "string"
},
"hourlyRate": {
"type": "number",
"example": 50
"type": "number"
},
"password": {
"type": "string",
"example": "password123"
"type": "string"
},
"role": {
"type": "string",
"example": "admin"
"type": "string"
}
}
},
@ -4562,36 +4472,28 @@
"type": "object",
"properties": {
"companyId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"email": {
"type": "string",
"example": "test@example.com"
"type": "string"
},
"hourlyRate": {
"type": "number",
"example": 50
"type": "number"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"role": {
"type": "string",
"example": "admin"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},
@ -4599,40 +4501,31 @@
"type": "object",
"properties": {
"companyId": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "integer"
},
"createdAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
},
"email": {
"type": "string",
"example": "test@example.com"
"type": "string"
},
"hourlyRate": {
"type": "number",
"example": 50
"type": "number"
},
"id": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"lastEditorID": {
"type": "string",
"example": "01HGW2BBG0000000000000000"
"type": "string"
},
"password": {
"type": "string",
"example": "password123"
"type": "string"
},
"role": {
"type": "string",
"example": "admin"
"type": "string"
},
"updatedAt": {
"type": "string",
"example": "2024-01-01T00:00:00Z"
"type": "string"
}
}
},

143
backend/docs/swagger.yaml
View File

@ -3,310 +3,225 @@ definitions:
dto.ActivityCreateDto:
properties:
billingRate:
example: 100
type: number
name:
example: Development
type: string
type: object
dto.ActivityDto:
properties:
billingRate:
example: 100
type: number
createdAt:
example: "2024-01-01T00:00:00Z"
type: string
id:
example: a1b2c3d4e5f6
type: string
lastEditorID:
example: u1v2w3x4y5z6
type: string
name:
example: Development
type: string
updatedAt:
example: "2024-01-01T00:00:00Z"
type: string
type: object
dto.ActivityUpdateDto:
properties:
billingRate:
example: 100
type: number
createdAt:
example: "2024-01-01T00:00:00Z"
type: string
id:
example: a1b2c3d4e5f6
type: string
lastEditorID:
example: u1v2w3x4y5z6
type: string
name:
example: Development
type: string
updatedAt:
example: "2024-01-01T00:00:00Z"
type: string
type: object
dto.CompanyCreateDto:
properties:
name:
example: Acme Corp
type: string
type: object
dto.CompanyDto:
properties:
createdAt:
example: "2024-01-01T00:00:00Z"
type: string
id:
example: 01HGW2BBG0000000000000000
type: string
lastEditorID:
example: 01HGW2BBG0000000000000000
type: string
name:
example: Acme Corp
type: string
updatedAt:
example: "2024-01-01T00:00:00Z"
type: string
type: object
dto.CompanyUpdateDto:
properties:
createdAt:
example: "2024-01-01T00:00:00Z"
type: string
id:
example: 01HGW2BBG0000000000000000
type: string
lastEditorID:
example: 01HGW2BBG0000000000000000
type: string
name:
example: Acme Corp
type: string
updatedAt:
example: "2024-01-01T00:00:00Z"
type: string
type: object
dto.CustomerCreateDto:
properties:
companyId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
name:
example: John Doe
type: string
type: object
dto.CustomerDto:
properties:
companyId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
createdAt:
example: "2024-01-01T00:00:00Z"
type: string
id:
example: 01HGW2BBG0000000000000000
type: string
lastEditorID:
example: 01HGW2BBG0000000000000000
type: string
name:
example: John Doe
type: string
updatedAt:
example: "2024-01-01T00:00:00Z"
type: string
type: object
dto.CustomerUpdateDto:
properties:
companyId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
createdAt:
example: "2024-01-01T00:00:00Z"
type: string
id:
example: 01HGW2BBG0000000000000000
type: string
lastEditorID:
example: 01HGW2BBG0000000000000000
type: string
name:
example: John Doe
type: string
updatedAt:
example: "2024-01-01T00:00:00Z"
type: string
type: object
dto.LoginDto:
properties:
email:
example: admin@example.com
type: string
password:
example: Admin@123456
type: string
type: object
dto.ProjectCreateDto:
properties:
customerId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
name:
example: Time Tracking App
type: string
type: object
dto.ProjectDto:
properties:
createdAt:
example: "2024-01-01T00:00:00Z"
type: string
customerId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
id:
example: 01HGW2BBG0000000000000000
type: string
lastEditorID:
example: 01HGW2BBG0000000000000000
type: string
name:
example: Time Tracking App
type: string
updatedAt:
example: "2024-01-01T00:00:00Z"
type: string
type: object
dto.ProjectUpdateDto:
properties:
createdAt:
example: "2024-01-01T00:00:00Z"
type: string
customerId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
id:
example: 01HGW2BBG0000000000000000
type: string
lastEditorID:
example: 01HGW2BBG0000000000000000
type: string
name:
example: Time Tracking App
type: string
updatedAt:
example: "2024-01-01T00:00:00Z"
type: string
type: object
dto.TimeEntryCreateDto:
properties:
activityId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
billable:
description: Percentage (0-100)
example: 100
type: integer
description:
example: Working on the Time Tracking App
type: string
end:
example: "2024-01-01T17:00:00Z"
type: string
projectId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
start:
example: "2024-01-01T08:00:00Z"
type: string
userId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
type: object
dto.TimeEntryDto:
properties:
activityId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
billable:
description: Percentage (0-100)
example: 100
type: integer
createdAt:
example: "2024-01-01T00:00:00Z"
type: string
description:
example: Working on the Time Tracking App
type: string
end:
example: "2024-01-01T17:00:00Z"
type: string
id:
example: 01HGW2BBG0000000000000000
type: string
lastEditorID:
example: 01HGW2BBG0000000000000000
type: string
projectId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
start:
example: "2024-01-01T08:00:00Z"
type: string
updatedAt:
example: "2024-01-01T00:00:00Z"
type: string
userId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
type: object
dto.TimeEntryUpdateDto:
properties:
activityId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
billable:
description: Percentage (0-100)
example: 100
type: integer
createdAt:
example: "2024-01-01T00:00:00Z"
type: string
description:
example: Working on the Time Tracking App
type: string
end:
example: "2024-01-01T17:00:00Z"
type: string
id:
example: 01HGW2BBG0000000000000000
type: string
lastEditorID:
example: 01HGW2BBG0000000000000000
type: string
projectId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
start:
example: "2024-01-01T08:00:00Z"
type: string
updatedAt:
example: "2024-01-01T00:00:00Z"
type: string
userId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
type: object
dto.TokenDto:
properties:
token:
example: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c
type: string
user:
$ref: '#/definitions/dto.UserDto'
@ -314,76 +229,54 @@ definitions:
dto.UserCreateDto:
properties:
companyId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
email:
example: test@example.com
type: string
hourlyRate:
example: 50
type: number
password:
example: password123
type: string
role:
example: admin
type: string
type: object
dto.UserDto:
properties:
companyId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
createdAt:
example: "2024-01-01T00:00:00Z"
type: string
email:
example: test@example.com
type: string
hourlyRate:
example: 50
type: number
id:
example: 01HGW2BBG0000000000000000
type: string
lastEditorID:
example: 01HGW2BBG0000000000000000
type: string
role:
example: admin
type: string
updatedAt:
example: "2024-01-01T00:00:00Z"
type: string
type: object
dto.UserUpdateDto:
properties:
companyId:
example: 01HGW2BBG0000000000000000
type: string
type: integer
createdAt:
example: "2024-01-01T00:00:00Z"
type: string
email:
example: test@example.com
type: string
hourlyRate:
example: 50
type: number
id:
example: 01HGW2BBG0000000000000000
type: string
lastEditorID:
example: 01HGW2BBG0000000000000000
type: string
password:
example: password123
type: string
role:
example: admin
type: string
updatedAt:
example: "2024-01-01T00:00:00Z"
type: string
type: object
utils.ErrorInfo:

28
backend/internal/dtos/activity_dto.go
View File

@ -5,24 +5,24 @@ import (
)
type ActivityDto struct {
ID string `json:"id" example:"a1b2c3d4e5f6"`
CreatedAt time.Time `json:"createdAt" example:"2024-01-01T00:00:00Z"`
UpdatedAt time.Time `json:"updatedAt" example:"2024-01-01T00:00:00Z"`
LastEditorID string `json:"lastEditorID" example:"u1v2w3x4y5z6"`
Name string `json:"name" example:"Development"`
BillingRate float64 `json:"billingRate" example:"100.00"`
ID string `json:"id"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
LastEditorID string `json:"lastEditorID"`
Name string `json:"name"`
BillingRate float64 `json:"billingRate"`
}
type ActivityCreateDto struct {
Name string `json:"name" example:"Development"`
BillingRate float64 `json:"billingRate" example:"100.00"`
Name string `json:"name"`
BillingRate float64 `json:"billingRate"`
}
type ActivityUpdateDto struct {
ID string `json:"id" example:"a1b2c3d4e5f6"`
CreatedAt *time.Time `json:"createdAt" example:"2024-01-01T00:00:00Z"`
UpdatedAt *time.Time `json:"updatedAt" example:"2024-01-01T00:00:00Z"`
LastEditorID *string `json:"lastEditorID" example:"u1v2w3x4y5z6"`
Name *string `json:"name" example:"Development"`
BillingRate *float64 `json:"billingRate" example:"100.00"`
ID string `json:"id"`
CreatedAt *time.Time `json:"createdAt"`
UpdatedAt *time.Time `json:"updatedAt"`
LastEditorID *string `json:"lastEditorID"`
Name *string `json:"name"`
BillingRate *float64 `json:"billingRate"`
}

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

@ -2,12 +2,12 @@ package dto
// LoginDto represents the login request
type LoginDto struct {
Email string `json:"email" example:"admin@example.com"`
Password string `json:"password" example:"Admin@123456"`
Email string `json:"email"`
Password string `json:"password"`
}
// TokenDto represents the response after successful authentication
type TokenDto struct {
Token string `json:"token" example:"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"`
Token string `json:"token"`
User UserDto `json:"user"`
}

22
backend/internal/dtos/company_dto.go
View File

@ -5,21 +5,21 @@ import (
)
type CompanyDto struct {
ID string `json:"id" example:"01HGW2BBG0000000000000000"`
CreatedAt time.Time `json:"createdAt" example:"2024-01-01T00:00:00Z"`
UpdatedAt time.Time `json:"updatedAt" example:"2024-01-01T00:00:00Z"`
LastEditorID string `json:"lastEditorID" example:"01HGW2BBG0000000000000000"`
Name string `json:"name" example:"Acme Corp"`
ID string `json:"id"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
LastEditorID string `json:"lastEditorID"`
Name string `json:"name"`
}
type CompanyCreateDto struct {
Name string `json:"name" example:"Acme Corp"`
Name string `json:"name"`
}
type CompanyUpdateDto struct {
ID string `json:"id" example:"01HGW2BBG0000000000000000"`
CreatedAt *time.Time `json:"createdAt" example:"2024-01-01T00:00:00Z"`
UpdatedAt *time.Time `json:"updatedAt" example:"2024-01-01T00:00:00Z"`
LastEditorID *string `json:"lastEditorID" example:"01HGW2BBG0000000000000000"`
Name *string `json:"name" example:"Acme Corp"`
ID string `json:"id"`
CreatedAt *time.Time `json:"createdAt"`
UpdatedAt *time.Time `json:"updatedAt"`
LastEditorID *string `json:"lastEditorID"`
Name *string `json:"name"`
}

28
backend/internal/dtos/customer_dto.go
View File

@ -5,24 +5,24 @@ import (
)
type CustomerDto struct {
ID string `json:"id" example:"01HGW2BBG0000000000000000"`
CreatedAt time.Time `json:"createdAt" example:"2024-01-01T00:00:00Z"`
UpdatedAt time.Time `json:"updatedAt" example:"2024-01-01T00:00:00Z"`
LastEditorID string `json:"lastEditorID" example:"01HGW2BBG0000000000000000"`
Name string `json:"name" example:"John Doe"`
CompanyID string `json:"companyId" example:"01HGW2BBG0000000000000000"`
ID string `json:"id"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
LastEditorID string `json:"lastEditorID"`
Name string `json:"name"`
CompanyID string `json:"companyId"`
}
type CustomerCreateDto struct {
Name string `json:"name" example:"John Doe"`
CompanyID string `json:"companyId" example:"01HGW2BBG0000000000000000"`
Name string `json:"name"`
CompanyID string `json:"companyId"`
}
type CustomerUpdateDto struct {
ID string `json:"id" example:"01HGW2BBG0000000000000000"`
CreatedAt *time.Time `json:"createdAt" example:"2024-01-01T00:00:00Z"`
UpdatedAt *time.Time `json:"updatedAt" example:"2024-01-01T00:00:00Z"`
LastEditorID *string `json:"lastEditorID" example:"01HGW2BBG0000000000000000"`
Name *string `json:"name" example:"John Doe"`
CompanyID *string `json:"companyId" example:"01HGW2BBG0000000000000000"`
ID string `json:"id"`
CreatedAt *time.Time `json:"createdAt"`
UpdatedAt *time.Time `json:"updatedAt"`
LastEditorID *string `json:"lastEditorID"`
Name *string `json:"name"`
CompanyID *string `json:"companyId"`
}

28
backend/internal/dtos/project_dto.go
View File

@ -5,24 +5,24 @@ import (
)
type ProjectDto struct {
ID string `json:"id" example:"01HGW2BBG0000000000000000"`
CreatedAt time.Time `json:"createdAt" example:"2024-01-01T00:00:00Z"`
UpdatedAt time.Time `json:"updatedAt" example:"2024-01-01T00:00:00Z"`
LastEditorID string `json:"lastEditorID" example:"01HGW2BBG0000000000000000"`
Name string `json:"name" example:"Time Tracking App"`
CustomerID string `json:"customerId" example:"01HGW2BBG0000000000000000"`
ID string `json:"id"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
LastEditorID string `json:"lastEditorID"`
Name string `json:"name"`
CustomerID string `json:"customerId"`
}
type ProjectCreateDto struct {
Name string `json:"name" example:"Time Tracking App"`
CustomerID string `json:"customerId" example:"01HGW2BBG0000000000000000"`
Name string `json:"name"`
CustomerID string `json:"customerId"`
}
type ProjectUpdateDto struct {
ID string `json:"id" example:"01HGW2BBG0000000000000000"`
CreatedAt *time.Time `json:"createdAt" example:"2024-01-01T00:00:00Z"`
UpdatedAt *time.Time `json:"updatedAt" example:"2024-01-01T00:00:00Z"`
LastEditorID *string `json:"lastEditorID" example:"01HGW2BBG0000000000000000"`
Name *string `json:"name" example:"Time Tracking App"`
CustomerID *string `json:"customerId" example:"01HGW2BBG0000000000000000"`
ID string `json:"id"`
CreatedAt *time.Time `json:"createdAt"`
UpdatedAt *time.Time `json:"updatedAt"`
LastEditorID *string `json:"lastEditorID"`
Name *string `json:"name"`
CustomerID *string `json:"customerId"`
}

58
backend/internal/dtos/timeentry_dto.go
View File

@ -5,39 +5,39 @@ import (
)
type TimeEntryDto struct {
ID string `json:"id" example:"01HGW2BBG0000000000000000"`
CreatedAt time.Time `json:"createdAt" example:"2024-01-01T00:00:00Z"`
UpdatedAt time.Time `json:"updatedAt" example:"2024-01-01T00:00:00Z"`
LastEditorID string `json:"lastEditorID" example:"01HGW2BBG0000000000000000"`
UserID string `json:"userId" example:"01HGW2BBG0000000000000000"`
ProjectID string `json:"projectId" example:"01HGW2BBG0000000000000000"`
ActivityID string `json:"activityId" example:"01HGW2BBG0000000000000000"`
Start time.Time `json:"start" example:"2024-01-01T08:00:00Z"`
End time.Time `json:"end" example:"2024-01-01T17:00:00Z"`
Description string `json:"description" example:"Working on the Time Tracking App"`
Billable int `json:"billable" example:"100"` // Percentage (0-100)
ID string `json:"id"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
LastEditorID string `json:"lastEditorID"`
UserID string `json:"userId"`
ProjectID string `json:"projectId"`
ActivityID string `json:"activityId"`
Start time.Time `json:"start"`
End time.Time `json:"end"`
Description string `json:"description"`
Billable int `json:"billable"` // Percentage (0-100)
}
type TimeEntryCreateDto struct {
UserID string `json:"userId" example:"01HGW2BBG0000000000000000"`
ProjectID string `json:"projectId" example:"01HGW2BBG0000000000000000"`
ActivityID string `json:"activityId" example:"01HGW2BBG0000000000000000"`
Start time.Time `json:"start" example:"2024-01-01T08:00:00Z"`
End time.Time `json:"end" example:"2024-01-01T17:00:00Z"`
Description string `json:"description" example:"Working on the Time Tracking App"`
Billable int `json:"billable" example:"100"` // Percentage (0-100)
UserID string `json:"userId"`
ProjectID string `json:"projectId"`
ActivityID string `json:"activityId"`
Start time.Time `json:"start"`
End time.Time `json:"end"`
Description string `json:"description"`
Billable int `json:"billable"` // Percentage (0-100)
}
type TimeEntryUpdateDto struct {
ID string `json:"id" example:"01HGW2BBG0000000000000000"`
CreatedAt *time.Time `json:"createdAt" example:"2024-01-01T00:00:00Z"`
UpdatedAt *time.Time `json:"updatedAt" example:"2024-01-01T00:00:00Z"`
LastEditorID *string `json:"lastEditorID" example:"01HGW2BBG0000000000000000"`
UserID *string `json:"userId" example:"01HGW2BBG0000000000000000"`
ProjectID *string `json:"projectId" example:"01HGW2BBG0000000000000000"`
ActivityID *string `json:"activityId" example:"01HGW2BBG0000000000000000"`
Start *time.Time `json:"start" example:"2024-01-01T08:00:00Z"`
End *time.Time `json:"end" example:"2024-01-01T17:00:00Z"`
Description *string `json:"description" example:"Working on the Time Tracking App"`
Billable *int `json:"billable" example:"100"` // Percentage (0-100)
ID string `json:"id"`
CreatedAt *time.Time `json:"createdAt"`
UpdatedAt *time.Time `json:"updatedAt"`
LastEditorID *string `json:"lastEditorID"`
UserID *string `json:"userId"`
ProjectID *string `json:"projectId"`
ActivityID *string `json:"activityId"`
Start *time.Time `json:"start"`
End *time.Time `json:"end"`
Description *string `json:"description"`
Billable *int `json:"billable"` // Percentage (0-100)
}

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

@ -5,32 +5,32 @@ import (
)
type UserDto struct {
ID string `json:"id" example:"01HGW2BBG0000000000000000"`
CreatedAt time.Time `json:"createdAt" example:"2024-01-01T00:00:00Z"`
UpdatedAt time.Time `json:"updatedAt" example:"2024-01-01T00:00:00Z"`
LastEditorID string `json:"lastEditorID" example:"01HGW2BBG0000000000000000"`
Email string `json:"email" example:"test@example.com"`
Role string `json:"role" example:"admin"`
CompanyID string `json:"companyId" example:"01HGW2BBG0000000000000000"`
HourlyRate float64 `json:"hourlyRate" example:"50.00"`
ID string `json:"id"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
LastEditorID string `json:"lastEditorID"`
Email string `json:"email"`
Role string `json:"role"`
CompanyID string `json:"companyId"`
HourlyRate float64 `json:"hourlyRate"`
}
type UserCreateDto struct {
Email string `json:"email" example:"test@example.com"`
Password string `json:"password" example:"password123"`
Role string `json:"role" example:"admin"`
CompanyID string `json:"companyId" example:"01HGW2BBG0000000000000000"`
HourlyRate float64 `json:"hourlyRate" example:"50.00"`
Email string `json:"email"`
Password string `json:"password"`
Role string `json:"role"`
CompanyID string `json:"companyId"`
HourlyRate float64 `json:"hourlyRate"`
}
type UserUpdateDto struct {
ID string `json:"id" example:"01HGW2BBG0000000000000000"`
CreatedAt *time.Time `json:"createdAt" example:"2024-01-01T00:00:00Z"`
UpdatedAt *time.Time `json:"updatedAt" example:"2024-01-01T00:00:00Z"`
LastEditorID *string `json:"lastEditorID" example:"01HGW2BBG0000000000000000"`
Email *string `json:"email" example:"test@example.com"`
Password *string `json:"password" example:"password123"`
Role *string `json:"role" example:"admin"`
CompanyID *string `json:"companyId" example:"01HGW2BBG0000000000000000"`
HourlyRate *float64 `json:"hourlyRate" example:"50.00"`
ID string `json:"id"`
CreatedAt *time.Time `json:"createdAt"`
UpdatedAt *time.Time `json:"updatedAt"`
LastEditorID *string `json:"lastEditorID"`
Email *string `json:"email"`
Password *string `json:"password"`
Role *string `json:"role"`
CompanyID *string `json:"companyId"`
HourlyRate *float64 `json:"hourlyRate"`
}

2
backend/tygo.yaml → backend/tygo.yml
View File

@ -1,5 +1,5 @@
packages:
- path: github.com/timetracker/backend/internal/dtos
- path: github.com/timetracker/backend/dto
type_mappings:
"time.Time": "string"
"ulid.ULID": "string"

17
docu/deployment_devops.md Normal file
View File

@ -0,0 +1,17 @@
# Deployment and DevOps
## Containerization
- Docker containers for backend and frontend
- Docker Compose for development environment
- Kubernetes manifests for production environment
## CI/CD Pipeline
- Automated tests (Unit, Integration, E2E)
- Automated deployment
- Version management
## Monitoring and Logging
- Prometheus for metrics
- Grafana for visualization
- ELK Stack or similar for logging
- Alerting for critical events

59
frontend/src/types/dto.ts
View File

@ -24,24 +24,6 @@ export interface ActivityUpdateDto {
billingRate?: number /* float64 */;
}
//////////
// source: auth_dto.go
/**
* LoginDto represents the login request
*/
export interface LoginDto {
email: string;
password: string;
}
/**
* TokenDto represents the response after successful authentication
*/
export interface TokenDto {
token: string;
user: UserDto;
}
//////////
// source: company_dto.go
@ -72,11 +54,11 @@ export interface CustomerDto {
updatedAt: string;
lastEditorID: string;
name: string;
companyId: string;
companyId: number /* int */;
}
export interface CustomerCreateDto {
name: string;
companyId: string;
companyId: number /* int */;
}
export interface CustomerUpdateDto {
id: string;
@ -84,7 +66,7 @@ export interface CustomerUpdateDto {
updatedAt?: string;
lastEditorID?: string;
name?: string;
companyId?: string;
companyId?: number /* int */;
}
//////////
@ -96,11 +78,11 @@ export interface ProjectDto {
updatedAt: string;
lastEditorID: string;
name: string;
customerId: string;
customerId: number /* int */;
}
export interface ProjectCreateDto {
name: string;
customerId: string;
customerId: number /* int */;
}
export interface ProjectUpdateDto {
id: string;
@ -108,7 +90,7 @@ export interface ProjectUpdateDto {
updatedAt?: string;
lastEditorID?: string;
name?: string;
customerId?: string;
customerId?: number /* int */;
}
//////////
@ -119,18 +101,18 @@ export interface TimeEntryDto {
createdAt: string;
updatedAt: string;
lastEditorID: string;
userId: string;
projectId: string;
activityId: string;
userId: number /* int */;
projectId: number /* int */;
activityId: number /* int */;
start: string;
end: string;
description: string;
billable: number /* int */; // Percentage (0-100)
}
export interface TimeEntryCreateDto {
userId: string;
projectId: string;
activityId: string;
userId: number /* int */;
projectId: number /* int */;
activityId: number /* int */;
start: string;
end: string;
description: string;
@ -141,9 +123,9 @@ export interface TimeEntryUpdateDto {
createdAt?: string;
updatedAt?: string;
lastEditorID?: string;
userId?: string;
projectId?: string;
activityId?: string;
userId?: number /* int */;
projectId?: number /* int */;
activityId?: number /* int */;
start?: string;
end?: string;
description?: string;
@ -159,15 +141,16 @@ export interface UserDto {
updatedAt: string;
lastEditorID: string;
email: string;
password: string; // Note: In a real application, you would NEVER send the password in a DTO. This is just for demonstration.
role: string;
companyId: string;
companyId: number /* int */;
hourlyRate: number /* float64 */;
}
export interface UserCreateDto {
email: string;
password: string;
password: string; // Note: In a real application, you would NEVER send the password in a DTO. This is just for demonstration.
role: string;
companyId: string;
companyId: number /* int */;
hourlyRate: number /* float64 */;
}
export interface UserUpdateDto {
@ -176,8 +159,8 @@ export interface UserUpdateDto {
updatedAt?: string;
lastEditorID?: string;
email?: string;
password?: string;
password?: string; // Note: In a real application, you would NEVER send the password in a DTO. This is just for demonstration.
role?: string;
companyId?: string;
companyId?: number /* int */;
hourlyRate?: number /* float64 */;
}