Skip to content

Commit

Permalink
feat: rework permisssion, role, and user entities in kolomoni_databas…
Browse files Browse the repository at this point in the history
…e, remove unused CLI flags in kolomoni_migrations, update dependencies, scripts, and makefile
  • Loading branch information
simongoricar committed Sep 4, 2024
1 parent 93d2237 commit b31e551
Show file tree
Hide file tree
Showing 68 changed files with 792 additions and 3,659 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ publish = false
members = [
"kolomoni_auth",
"kolomoni_configuration",
# "kolomoni_database",
"kolomoni_database",
# "kolomoni_database_old",
"kolomoni_migrations",
"kolomoni_migrations_core",
"kolomoni_migrations_macros",
Expand Down Expand Up @@ -73,7 +74,6 @@ http = "0.2.12"
mime = "0.3.17"
uuid = { version = "1.8.0", features = ["v7"] }
httpdate = "1.0.3"
futures-util = "0.3.30"
bytes = "1.6.0"
dotenvy = "0.15.7"

Expand All @@ -86,6 +86,10 @@ path-slash = "0.2.1"

fs-more = "0.7.1"

futures-core = "0.3.30"
futures-util = "0.3.30"
pin-project-lite = "0.2.14"


[workspace.dependencies.sqlx]
version = "0.8.0"
Expand Down
57 changes: 3 additions & 54 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,59 +12,6 @@ CARGO_MAKE_USE_WORKSPACE_PROFILE = false




[tasks."migrations:create"]
clear = true
workspace = false
command = "sea-orm-cli"
args = [
"migrate",
"generate",
"--universal-time",
"--migration-dir",
"./kolomoni_migrations",
"${@}"
]


[tasks."migrations"]
clear = true
workspace = false
command = "sea-orm-cli"
args = [
"migrate",
"${@}",
"--migration-dir",
"./kolomoni_migrations"
]

[tasks."migrations:up"]
clear = true
workspace = false
command = "sea-orm-cli"
args = [
"migrate",
"up",
"--migration-dir",
"./kolomoni_migrations"
]



[tasks."entities:generate"]
clear = true
workspace = false
command = "sea-orm-cli"
args = [
"generate",
"entity",
"--output-dir",
"./kolomoni_database/src/entities",
"--expanded-format"
]



[tasks."database:initialize"]
clear = true
workspace = false
Expand Down Expand Up @@ -116,14 +63,15 @@ args = [
"--open"
]


[tasks."backend:run"]
clear = true
workspace = true
command = "cargo"
args = ["run", "--release"]
cwd = "."

[tasks."openapi-backend:run"]
[tasks."backend:openapi:run"]
clear = true
workspace = true
command = "cargo"
Expand All @@ -147,6 +95,7 @@ args = [
[tasks.documentation]
clear = true
workspace = true
alias = "doc"
dependencies = [
"build-and-open-full-documentation",
"build-and-watch-workspace-documentation-with-private-items"
Expand Down
Loading

0 comments on commit b31e551

Please sign in to comment.