Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ecccaa9
Domain Models
GaballaGit Mar 1, 2026
6865ccf
Merge branch 'main' into feat/Domain-Models
GaballaGit Mar 7, 2026
d229607
Add DTO <-> Domain Mappers
GaballaGit Mar 7, 2026
89653eb
map nil struct saftey
GaballaGit Mar 9, 2026
0543871
Merge branch 'main' into feat/Domain-Models
GaballaGit Mar 10, 2026
6a0003c
update
GaballaGit Mar 20, 2026
7b2d0bf
add and use helper
GaballaGit Mar 23, 2026
96c4b93
rm prints
GaballaGit Mar 23, 2026
f8743bf
Merge branch 'main' into feat/Domain-Models
GaballaGit Mar 23, 2026
4d55345
Add Domain DB conversion in mapper
GaballaGit Mar 25, 2026
5454ffc
correct package mistake
GaballaGit Apr 6, 2026
f28e71a
correct names
GaballaGit Apr 6, 2026
b53e168
use domain models in announcement services
GaballaGit Apr 6, 2026
bd2c694
Remember why it starts with Convert instead
GaballaGit Apr 6, 2026
6a676f5
no more dbmodels in handler
GaballaGit Apr 6, 2026
ea8be40
update name convention for mapper
GaballaGit Apr 7, 2026
edd29eb
initial mapper migration
TheJolman Apr 8, 2026
e7bd183
finish dto <-> domain announcements
TheJolman Apr 8, 2026
982da05
event dto <-> domain
TheJolman Apr 8, 2026
cb6ddaa
officer dto <-> domain
TheJolman Apr 8, 2026
cef7631
finish dto <-> domain mappers
TheJolman Apr 8, 2026
58f0606
mmove dbmodels package
TheJolman Apr 8, 2026
0134a94
finish migration
TheJolman Apr 8, 2026
f31defe
formatting
TheJolman Apr 8, 2026
b88ff52
Merge branch 'main' into feat/Domain-Models
GaballaGit Apr 18, 2026
14c9eb6
Update SQLC target path in Makefile
GaballaGit Apr 18, 2026
82123f7
Fix path for dbmodels in swag generation
GaballaGit Apr 18, 2026
323b84e
make swag init a bit more readable
GaballaGit Apr 18, 2026
a85b4d9
add dto to swagger init and pray or smth idk
GaballaGit Apr 18, 2026
6122a8b
for some reason this generates on my machine
GaballaGit Apr 18, 2026
f45f0e0
list announcements now use dto
GaballaGit Apr 22, 2026
3d40586
remove dbmodels from swag gen
GaballaGit Apr 22, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GO_SOURCES := $(shell find . -type f -name '*.go' -not -path '*/vendor/*')
GO_DEPS := $(GO_SOURCES) go.mod go.sum

SQLC_DEPS := $(wildcard sql/migrations/*.sql) $(wildcard sql/queries/*.sql)
SQLC_TARGET := internal/api/dbmodels/models.go
SQLC_TARGET := internal/api/store/dbmodels/models.go

VERSION := $(shell git describe --tags --always --dirty 2> /dev/null || echo "dev")

Expand All @@ -33,7 +33,7 @@ $(BIN_DIR)/$(CLI_NAME): $(GO_DEPS)
generate: swag sqlc ## Generate all necessary files

swag: ## Generate OpenAPI docs
swag init -d cmd/acmcsuf-api,internal/api/handlers,internal/api/dbmodels -o internal/api/docs --parseDependency
swag init -d cmd/acmcsuf-api,internal/api/handlers,internal/dto -o internal/api/docs --parseDependency

sqlc: $(SQLC_TARGET) ## Generate dbmodels package with sqlc

Expand Down
36 changes: 36 additions & 0 deletions docs/docs.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// Package docs Code generated by swaggo/swag. DO NOT EDIT
package docs

import "github.com/swaggo/swag"

const docTemplate = `{
"schemes": {{ marshal .Schemes }},
"swagger": "2.0",
"info": {
"description": "{{escape .Description}}",
"title": "{{.Title}}",
"contact": {},
"version": "{{.Version}}"
},
"host": "{{.Host}}",
"basePath": "{{.BasePath}}",
"paths": {}
}`

// SwaggerInfo holds exported Swagger Info so clients can modify it
var SwaggerInfo = &swag.Spec{
Version: "",
Host: "",
BasePath: "",
Schemes: []string{},
Title: "",
Description: "",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
LeftDelim: "{{",
RightDelim: "}}",
}

func init() {
swag.Register(SwaggerInfo.InstanceName(), SwaggerInfo)
}
7 changes: 7 additions & 0 deletions docs/swagger.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"swagger": "2.0",
"info": {
"contact": {}
},
"paths": {}
}
4 changes: 4 additions & 0 deletions docs/swagger.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
info:
contact: {}
paths: {}
swagger: "2.0"
50 changes: 0 additions & 50 deletions internal/api/dbmodels/models.go

This file was deleted.

Loading
Loading