Skip to content

Commit

Permalink
Add organization details settings (#220)
Browse files Browse the repository at this point in the history
* Add favicon

* Add organization details form

* Add tests

* Delete the obsolete migration service
  • Loading branch information
th0th authored Jan 13, 2025
1 parent 7f706e0 commit 5ef90c4
Show file tree
Hide file tree
Showing 36 changed files with 1,023 additions and 149 deletions.
24 changes: 16 additions & 8 deletions backend/cmd/migrator/main.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package main

import (
"fmt"

clickhouse2 "gorm.io/driver/clickhouse"
postgres2 "gorm.io/driver/postgres"
"gorm.io/gorm"

"github.com/th0th/poeticmetric/backend/cmd"
"github.com/th0th/poeticmetric/backend/pkg/lib/migration"
"github.com/th0th/poeticmetric/backend/pkg/service/env"
"github.com/th0th/poeticmetric/backend/pkg/service/migration"
)

func main() {
Expand All @@ -26,15 +28,21 @@ func main() {
cmd.LogPanic(err, "failed to init clickhouse")
}

migrationService := migration.New(migration.NewParams{
Clickhouse: clickhouse,
EnvService: envService,
Postgres: postgres,
})
err = postgres.Transaction(func(postgres2 *gorm.DB) error {
err2 := migration.Postgres(postgres2, envService.PostgresDatabase())
if err2 != nil {
return fmt.Errorf("failed to run postgres migrations: %w", err2)
}

err = migrationService.Run()
err2 = migration.ClickHouse(clickhouse, envService.ClickhouseDatabase())
if err2 != nil {
return fmt.Errorf("failed to run clickhouse migrations: %w", err2)
}

return nil
})
if err != nil {
cmd.LogPanic(err, "failed to run migrator")
cmd.LogPanic(err, "failed to run migrations: %w")
}

cmd.Logger.Info().Msg("migrations are run successfully")
Expand Down
2 changes: 2 additions & 0 deletions backend/cmd/rest-api/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,12 @@ func main() {
permissionWrite := alice.New(middleware.PermissionOrganizationOwner(responder))

// handlers: authentication
mux.Handle("GET /authentication/organization", permissionUserAccessTokenAuthenticated.ThenFunc(authenticationHandler.ReadOrganization))
mux.Handle("GET /authentication/user", permissionUserAccessTokenAuthenticated.ThenFunc(authenticationHandler.ReadUser))
mux.Handle("POST /authentication/user-access-tokens", sensitiveRateLimit.Extend(permissionBasicAuthenticated).ThenFunc(authenticationHandler.CreateUserAccessToken))
mux.Handle("DELETE /authentication/user-access-tokens", permissionUserAccessTokenAuthenticated.ThenFunc(authenticationHandler.DeleteUserAccessToken))
mux.Handle("PATCH /authentication/user", permissionUserAccessTokenAuthenticated.ThenFunc(authenticationHandler.UpdateUser))
mux.Handle("PATCH /authentication/organization", permissionUserAccessTokenAuthenticated.Append(permissionWrite.Then).ThenFunc(authenticationHandler.UpdateOrganization))
mux.Handle("POST /authentication/change-user-password", permissionBasicAuthenticated.ThenFunc(authenticationHandler.ChangeUserPassword))
mux.HandleFunc("POST /authentication/send-user-password-recovery-email", authenticationHandler.SendUserPasswordRecoveryEmail)
mux.HandleFunc("POST /authentication/reset-user-password", authenticationHandler.ResetUserPassword)
Expand Down
33 changes: 33 additions & 0 deletions backend/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ require (
github.com/stretchr/testify v1.10.0
github.com/swaggo/http-swagger/v2 v2.0.2
github.com/swaggo/swag v1.16.4
github.com/testcontainers/testcontainers-go v0.35.0
github.com/testcontainers/testcontainers-go/modules/postgres v0.35.0
github.com/ulule/limiter/v3 v3.11.2
golang.org/x/crypto v0.31.0
golang.org/x/oauth2 v0.24.0
Expand All @@ -34,23 +36,36 @@ require (
cloud.google.com/go/auth v0.13.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
cloud.google.com/go/compute/metadata v0.6.0 // indirect
dario.cat/mergo v1.0.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/ClickHouse/ch-go v0.61.5 // indirect
github.com/ClickHouse/clickhouse-go/v2 v2.23.2 // indirect
github.com/KyleBanks/depth v1.2.1 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/cpuguy83/dockercfg v0.3.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/docker v27.2.0+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-faster/city v1.0.1 // indirect
github.com/go-faster/errors v0.7.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/spec v0.20.6 // indirect
github.com/go-openapi/swag v0.19.15 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/s2a-go v0.1.8 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
Expand All @@ -65,19 +80,37 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/klauspost/compress v1.17.8 // indirect
github.com/lib/pq v1.10.9 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/moby/sys/user v0.1.0 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/paulmach/orb v0.11.1 // indirect
github.com/pierrec/lz4/v4 v4.1.21 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/rogpeppe/go-internal v1.13.1 // indirect
github.com/rs/xid v1.5.0 // indirect
github.com/segmentio/asm v1.2.0 // indirect
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/swaggo/files/v2 v2.0.0 // indirect
github.com/th0th/disposableemail v0.0.2-0.20241107110532-1e027547679f // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
Expand Down
Loading

0 comments on commit 5ef90c4

Please sign in to comment.