From 8269f2038fae40be2587e767d1058d8e519b3cae Mon Sep 17 00:00:00 2001
From: cameronvoell <cameronvoell@users.noreply.github.com>
Date: Tue, 26 Nov 2024 09:56:21 -0800
Subject: [PATCH] prevents future migrations from hitting error

---
 xmtp_mls/src/storage/encrypted_store/group.rs  | 4 ++--
 xmtp_mls/src/storage/encrypted_store/schema.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xmtp_mls/src/storage/encrypted_store/group.rs b/xmtp_mls/src/storage/encrypted_store/group.rs
index 1bd426db7..c9e28051b 100644
--- a/xmtp_mls/src/storage/encrypted_store/group.rs
+++ b/xmtp_mls/src/storage/encrypted_store/group.rs
@@ -32,8 +32,6 @@ pub struct StoredGroup {
     pub membership_state: GroupMembershipState,
     /// Track when the latest, most recent installations were checked
     pub installations_last_checked: i64,
-    /// Enum, [`ConversationType`] signifies the group conversation type which extends to who can access it.
-    pub conversation_type: ConversationType,
     /// The inbox_id of who added the user to a group.
     pub added_by_inbox_id: String,
     /// The sequence id of the welcome message
@@ -42,6 +40,8 @@ pub struct StoredGroup {
     pub dm_inbox_id: Option<String>,
     /// The last time the leaf node encryption key was rotated
     pub rotated_at_ns: i64,
+    /// Enum, [`ConversationType`] signifies the group conversation type which extends to who can access it.
+    pub conversation_type: ConversationType,
 }
 
 impl_fetch!(StoredGroup, groups, Vec<u8>);
diff --git a/xmtp_mls/src/storage/encrypted_store/schema.rs b/xmtp_mls/src/storage/encrypted_store/schema.rs
index 5a6e3385b..db79db920 100644
--- a/xmtp_mls/src/storage/encrypted_store/schema.rs
+++ b/xmtp_mls/src/storage/encrypted_store/schema.rs
@@ -50,11 +50,11 @@ diesel::table! {
         created_at_ns -> BigInt,
         membership_state -> Integer,
         installations_last_checked -> BigInt,
-        conversation_type -> Integer,
         added_by_inbox_id -> Text,
         welcome_id -> Nullable<BigInt>,
         dm_inbox_id -> Nullable<Text>,
         rotated_at_ns -> BigInt,
+        conversation_type -> Integer,
     }
 }