Switch to using application types (#45)

* begin switch to using application types * lint * app slugs no longer required to be unique * lint..again * remove one more reference to kind * fix db rollback statement
metal-toolbox · Sep 5, 2023 · 492aa09 · 492aa09
1 parent 620836e
commit 492aa09
Show file tree

Hide file tree

Showing 24 changed files with 141 additions and 68 deletions.
diff --git a/db/migrations/00032_implement_application_types.sql b/db/migrations/00032_implement_application_types.sql
@@ -0,0 +1,57 @@
+-- +goose Up
+-- +goose StatementBegin
+INSERT INTO application_types (id, name, slug, description, logo_url, created_at, updated_at, deleted_at)
+SELECT
+	gen_random_uuid (),
+	kind,
+	kind,
+	'',
+	'',
+	NOW(),
+	NOW(),
+	NULL
+FROM
+	applications
+GROUP BY
+	kind
+ON CONFLICT DO NOTHING;
+
+UPDATE
+	applications
+SET
+	type_id = application_types.id
+FROM
+	application_types
+WHERE
+	applications.kind = application_types.slug;
+
+ALTER TABLE applications DROP COLUMN kind;
+
+DROP INDEX IF EXISTS applications_slug_key CASCADE;
+
+ALTER TABLE applications ADD CONSTRAINT applications_slug_type_key UNIQUE (slug, type_id) WHERE deleted_at IS NULL;
+-- +goose StatementEnd
+
+-- +goose Down
+-- +goose StatementBegin
+DROP INDEX IF EXISTS applications_slug_type_key CASCADE;
+
+ALTER TABLE applications ADD CONSTRAINT applications_slug_key UNIQUE (slug) WHERE deleted_at IS NULL;
+
+ALTER TABLE applications ADD COLUMN IF NOT EXISTS kind STRING;
+
+UPDATE
+	applications
+SET
+	kind = application_types.slug
+FROM
+	application_types
+WHERE
+	applications.type_id = application_types.id;
+
+ALTER TABLE applications ALTER COLUMN kind SET NOT NULL;
+
+-- not deleting from application_types here because there isn't a good way to know if manual changes have been made
+-- to the rows and the above transaction should be replayable anyway
+
+-- +goose StatementEnd
diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/spf13/viper v1.16.0
 	github.com/stretchr/testify v1.8.4
 	github.com/volatiletech/null/v8 v8.1.2
-	github.com/volatiletech/sqlboiler/v4 v4.14.2
+	github.com/volatiletech/sqlboiler/v4 v4.15.0
 	github.com/volatiletech/strmangle v0.0.5
 	github.com/zsais/go-gin-prometheus v0.1.0
 	go.hollow.sh/toolbox v0.6.1

diff --git a/go.sum b/go.sum
@@ -150,7 +150,7 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/ericlagergren/decimal v0.0.0-20211103172832-aca2edc11f73/go.mod h1:5sruVSMrZCk0U4hwRaGD0D8wIMFVsBWQqG74jQDFg4k=
+github.com/ericlagergren/decimal v0.0.0-20190420051523-6335edbaa640/go.mod h1:mdYyfAkzn9kyJ/kMk/7WE9ufl9lflh+2NvecQ5mAghs=
 github.com/ericlagergren/decimal v0.0.0-20221120152707-495c53812d05 h1:S92OBrGuLLZsyM5ybUzgc/mPjIYk2AZqufieooe98uw=
 github.com/ericlagergren/decimal v0.0.0-20221120152707-495c53812d05/go.mod h1:M9R1FoZ3y//hwwnJtO51ypFGwm8ZfpxPT/ZLtO1mcgQ=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
@@ -649,10 +649,9 @@ github.com/volatiletech/null/v8 v8.1.2 h1:kiTiX1PpwvuugKwfvUNX/SU/5A2KGZMXfGD0DU
 github.com/volatiletech/null/v8 v8.1.2/go.mod h1:98DbwNoKEpRrYtGjWFctievIfm4n4MxG0A6EBUcoS5g=
 github.com/volatiletech/randomize v0.0.1 h1:eE5yajattWqTB2/eN8df4dw+8jwAzBtbdo5sbWC4nMk=
 github.com/volatiletech/randomize v0.0.1/go.mod h1:GN3U0QYqfZ9FOJ67bzax1cqZ5q2xuj2mXrXBjWaRTlY=
-github.com/volatiletech/sqlboiler/v4 v4.14.2 h1:j5QnlR5/wYDmGDDTutI3BO+4oPBiqYoVrfReVr7VSxA=
-github.com/volatiletech/sqlboiler/v4 v4.14.2/go.mod h1:65288sb8jBLnTynTumBK6eU8C2JwWsiPjoPihEfC0/A=
+github.com/volatiletech/sqlboiler/v4 v4.15.0 h1:+twm3mA34SaUF6wB9U6QkXxkK8AKkV5EfgMSvcKWeY4=
+github.com/volatiletech/sqlboiler/v4 v4.15.0/go.mod h1:s643wqYyCQ7Ak2hMVxH7kTS0+lFPNlj+gHKUIukJ0YA=
 github.com/volatiletech/strmangle v0.0.1/go.mod h1:F6RA6IkB5vq0yTG4GQ0UsbbRcl3ni9P76i+JrTBKFFg=
-github.com/volatiletech/strmangle v0.0.4/go.mod h1:ycDvbDkjDvhC0NUU8w3fWwl5JEMTV56vTKXzR3GeR+0=
 github.com/volatiletech/strmangle v0.0.5 h1:CompJPy+lAi9h+YU/IzBR4X2RDRuAuEIP+kjFdyZXcU=
 github.com/volatiletech/strmangle v0.0.5/go.mod h1:ycDvbDkjDvhC0NUU8w3fWwl5JEMTV56vTKXzR3GeR+0=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

diff --git a/internal/models/application_types.go b/internal/models/application_types.go
diff --git a/internal/models/applications.go b/internal/models/applications.go
diff --git a/internal/models/audit_events.go b/internal/models/audit_events.go
diff --git a/internal/models/boil_queries.go b/internal/models/boil_queries.go
diff --git a/internal/models/boil_table_names.go b/internal/models/boil_table_names.go
diff --git a/internal/models/boil_types.go b/internal/models/boil_types.go
diff --git a/internal/models/boil_view_names.go b/internal/models/boil_view_names.go
diff --git a/internal/models/crdb_upsert.go b/internal/models/crdb_upsert.go
diff --git a/internal/models/group_application_requests.go b/internal/models/group_application_requests.go
diff --git a/internal/models/group_applications.go b/internal/models/group_applications.go
diff --git a/internal/models/group_hierarchies.go b/internal/models/group_hierarchies.go
diff --git a/internal/models/group_membership_requests.go b/internal/models/group_membership_requests.go
diff --git a/internal/models/group_memberships.go b/internal/models/group_memberships.go
diff --git a/internal/models/group_organizations.go b/internal/models/group_organizations.go
diff --git a/internal/models/groups.go b/internal/models/groups.go
diff --git a/internal/models/notification_preferences.go b/internal/models/notification_preferences.go
diff --git a/internal/models/notification_targets.go b/internal/models/notification_targets.go
diff --git a/internal/models/notification_types.go b/internal/models/notification_types.go
diff --git a/internal/models/organizations.go b/internal/models/organizations.go
diff --git a/internal/models/users.go b/internal/models/users.go