ammend

s3lase · s3lase · commit 0db434a6d808 · 2025-05-28T13:27:05.000Z
diff --git a/migrations/config/intermediate_db.yml b/migrations/config/intermediate_db.yml
@@ -43,6 +43,7 @@ schema:
           - "created_at"
           - "id"
     category_users:
+      primary_key_column_names: [ "category_id", "user_id" ]
       columns:
         exclude:
           - "id"
@@ -72,8 +73,15 @@ schema:
       primary_key_column_names: [original_id, channel_id, original_message_id, original_message_user_id ]
     group_users:
       primary_key_column_names: [ "group_id", "user_id" ]
+      columns:
+        exclude:
+          - "id"
+          - "created_at"
     groups:
       columns:
+        add:
+          - name: "existing_id"
+            datatype: text
         include:
           - "allow_membership_requests"
           - "allow_unknown_sender_topic_replies"
diff --git a/migrations/db/intermediate_db_schema/100-base-schema.sql b/migrations/db/intermediate_db_schema/100-base-schema.sql
@@ -88,9 +88,10 @@ CREATE TABLE category_custom_fields
 CREATE TABLE category_users
 (
     category_id        NUMERIC  NOT NULL,
+    user_id            NUMERIC  NOT NULL,
     last_seen_at       DATETIME,
     notification_level INTEGER  NOT NULL,
-    user_id            NUMERIC  NOT NULL
+    PRIMARY KEY (category_id, user_id)
 );
 
 CREATE TABLE chat_channels
@@ -173,10 +174,8 @@ CREATE TABLE group_users
 (
     group_id           NUMERIC  NOT NULL,
     user_id            NUMERIC  NOT NULL,
-    created_at         DATETIME NOT NULL,
     first_unread_pm_at DATETIME NOT NULL,
     notification_level INTEGER,
-    original_id        NUMERIC  NOT NULL,
     owner              BOOLEAN,
     PRIMARY KEY (group_id, user_id)
 );
@@ -191,6 +190,7 @@ CREATE TABLE "groups"
     bio_raw                            TEXT,
     created_at                         DATETIME NOT NULL,
     default_notification_level         INTEGER,
+    existing_id                        TEXT,
     flair_bg_color                     TEXT,
     flair_color                        TEXT,
     flair_icon                         TEXT,
diff --git a/migrations/lib/database/intermediate_db/category_user.rb b/migrations/lib/database/intermediate_db/category_user.rb
@@ -9,22 +9,22 @@ module CategoryUser
     SQL = <<~SQL
       INSERT INTO category_users (
         category_id,
+        user_id,
         last_seen_at,
-        notification_level,
-        user_id
+        notification_level
       )
       VALUES (
         ?, ?, ?, ?
       )
     SQL
 
-    def self.create(category_id:, last_seen_at: nil, notification_level:, user_id:)
+    def self.create(category_id:, user_id:, last_seen_at: nil, notification_level:)
       ::Migrations::Database::IntermediateDB.insert(
         SQL,
         category_id,
+        user_id,
         ::Migrations::Database.format_datetime(last_seen_at),
         notification_level,
-        user_id,
       )
     end
   end
diff --git a/migrations/lib/database/intermediate_db/group.rb b/migrations/lib/database/intermediate_db/group.rb
@@ -16,6 +16,7 @@ module Group
         bio_raw,
         created_at,
         default_notification_level,
+        existing_id,
         flair_bg_color,
         flair_color,
         flair_icon,
@@ -34,7 +35,7 @@ module Group
         visibility_level
       )
       VALUES (
-        ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
+        ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
       )
     SQL
 
@@ -47,6 +48,7 @@ def self.create(
       bio_raw: nil,
       created_at:,
       default_notification_level: nil,
+      existing_id: nil,
       flair_bg_color: nil,
       flair_color: nil,
       flair_icon: nil,
@@ -74,6 +76,7 @@ def self.create(
         bio_raw,
         ::Migrations::Database.format_datetime(created_at),
         default_notification_level,
+        existing_id,
         flair_bg_color,
         flair_color,
         flair_icon,
diff --git a/migrations/lib/database/intermediate_db/group_user.rb b/migrations/lib/database/intermediate_db/group_user.rb
@@ -10,34 +10,22 @@ module GroupUser
       INSERT INTO group_users (
         group_id,
         user_id,
-        created_at,
         first_unread_pm_at,
         notification_level,
-        original_id,
         owner
       )
       VALUES (
-        ?, ?, ?, ?, ?, ?, ?
+        ?, ?, ?, ?, ?
       )
     SQL
 
-    def self.create(
-      group_id:,
-      user_id:,
-      created_at:,
-      first_unread_pm_at:,
-      notification_level: nil,
-      original_id:,
-      owner: nil
-    )
+    def self.create(group_id:, user_id:, first_unread_pm_at:, notification_level: nil, owner: nil)
       ::Migrations::Database::IntermediateDB.insert(
         SQL,
         group_id,
         user_id,
-        ::Migrations::Database.format_datetime(created_at),
         ::Migrations::Database.format_datetime(first_unread_pm_at),
         notification_level,
-        original_id,
         ::Migrations::Database.format_boolean(owner),
       )
     end
