feat: add domains, update to pg18

Author: stakach

db/migrations/202504040000000_add_user_tables.sql

@@ -1,15 +1,12 @@
 -- +micrate Up
 -- SQL in section 'Up' is executed when this migration is applied
 
--- Enable UUID extension
-CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
-
 -- Permission Enum
 CREATE TYPE permission AS ENUM ('Admin', 'Manager', 'User', 'Viewer');
 
 -- Users Table
 CREATE TABLE users (
-    id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+    id UUID PRIMARY KEY DEFAULT uuidv7(),
     name TEXT NOT NULL,
     email TEXT UNIQUE NOT NULL,
     created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
@@ -31,7 +28,7 @@ CREATE INDEX idx_auth_user_id ON auth(user_id);
 
 -- Organizations Table
 CREATE TABLE organizations (
-    id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+    id UUID PRIMARY KEY DEFAULT uuidv7(),
     owner_id UUID REFERENCES users(id) ON DELETE SET NULL,
     name TEXT NOT NULL,
     description TEXT,
@@ -58,7 +55,7 @@ CREATE INDEX idx_org_users_organization_id ON organization_users(organization_id
 
 -- OrganizationInvites Table
 CREATE TABLE organization_invites (
-    id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+    id UUID PRIMARY KEY DEFAULT uuidv7(),
     organization_id UUID NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,
     email TEXT NOT NULL,
     secret TEXT NOT NULL,
@@ -73,5 +70,17 @@ CREATE INDEX idx_org_invites_email ON organization_invites(email);
 CREATE INDEX idx_org_invites_organization_id ON organization_invites(organization_id);
 CREATE INDEX idx_org_invites_expires ON organization_invites(expires);
 
+-- Organisation domains
+CREATE TABLE domains (
+    id UUID PRIMARY KEY DEFAULT uuidv7(),
+    organization_id UUID NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,
+    name TEXT NOT NULL,
+    domain TEXT NOT NULL,
+    description TEXT,
+    created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
+    updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
+    UNIQUE (domain)
+);
+
 -- +micrate Down
 -- SQL section 'Down' is executed when this migration is rolled back

docker-compose.yml

@@ -18,7 +18,7 @@ services:
     entrypoint: ["crystal", "spec", "-v", "--error-trace"]
 
   postgres:
-    image: postgres:17-alpine
+    image: postgres:18-alpine
     healthcheck:
       test: [ "CMD-SHELL", "pg_isready -U postgres" ]
       interval: 30s

shard.lock

@@ -2,7 +2,7 @@ version: 2.0
 shards:
   action-controller:
     git: https://github.com/spider-gazelle/action-controller.git
-    version: 7.6.0
+    version: 7.6.1
 
   active-model:
     git: https://github.com/spider-gazelle/active-model.git
@@ -34,7 +34,7 @@ shards:
 
   hot_topic:
     git: https://github.com/jgaskins/hot_topic.git
-    version: 0.1.0+git.commit.3c901e77b6e000930398738260a2944b6f5785dc
+    version: 0.1.0+git.commit.4eafc046ed4d98bbab7a4534da57e163ea16b6c6
 
   http-params-serializable:
     git: https://github.com/place-labs/http-params-serializable.git
@@ -46,7 +46,7 @@ shards:
 
   lucky_router:
     git: https://github.com/luckyframework/lucky_router.git
-    version: 0.6.0
+    version: 0.6.1
 
   micrate:
     git: https://github.com/amberframework/micrate.git
@@ -66,7 +66,7 @@ shards:
 
   pg-orm:
     git: https://github.com/spider-gazelle/pg-orm.git
-    version: 2.0.3
+    version: 2.0.5
 
   pool:
     git: https://github.com/ysbaddaden/pool.git

src/models/organization.cr

@@ -8,6 +8,15 @@ class App::Models::Organization < ::PgORM::Base
   attribute owner_id : UUID?
   belongs_to :owner, class_name: User
 
+  has_many :domains, class_name: Domain
+
+  include PgORM::Timestamps
+
+  before_save do
+    self.name = name.strip
+    self.description = description.try(&.strip.presence)
+  end
+
   def users
     User.join(:inner, OrganizationUser, :user_id).where("organization_users.organization_id = ?", self.id)
   end
@@ -41,6 +50,4 @@ class App::Models::Organization < ::PgORM::Base
       expires: expires
     ).save!
   end
-
-  include PgORM::Timestamps
 end