Remove unused organization ref from messaging channel

messaging/types/channel.go

@@ -20,7 +20,6 @@ type (
 		MembershipPolicy ChannelMembershipPolicy `json:"membershipPolicy"`
 
 		CreatorID      uint64 `json:"creatorId"`
-		OrganisationID uint64 `json:"organisationId"`
 
 		CreatedAt time.Time  `json:"createdAt,omitempty"`
 		UpdatedAt *time.Time `json:"updatedAt,omitempty"`

store/messaging_channels.yaml

@@ -12,7 +12,6 @@ fields:
   - { field: Meta }
   - { field: MembershipPolicy }
   - { field: CreatorID }
-  - { field: OrganisationID }
   - { field: CreatedAt }
   - { field: UpdatedAt }
   - { field: ArchivedAt }

store/rdbms/generic_upgrades.go

@@ -68,6 +68,10 @@ func (g genericUpgrades) Upgrade(ctx context.Context, t *ddl.Table) error {
 		return g.all(ctx,
 			g.AlterComposeModuleRenameJsonToMeta,
 		)
+	case "messaging_channel":
+		return g.all(ctx,
+			g.AlterMessagingChannelsDropOrganisation,
+		)
 	case "messaging_attachment":
 		return g.all(ctx,
 			g.AlterMessageAttachmentsRenameOwner,
@@ -249,6 +253,11 @@ func (g genericUpgrades) AlterUsersDropOrganisation(ctx context.Context) error {
 	return err
 }
 
+func (g genericUpgrades) AlterMessagingChannelsDropOrganisation(ctx context.Context) error {
+	_, err := g.u.DropColumn(ctx, "messaging_channel", "rel_organisation")
+	return err
+}
+
 func (g genericUpgrades) AlterUsersDropRelatedUser(ctx context.Context) error {
 	_, err := g.u.DropColumn(ctx, "users", "rel_user_id")
 	return err

store/rdbms/messaging_channels.gen.go

@@ -381,7 +381,6 @@ func (s Store) internalMessagingChannelRowScanner(row rowScanner) (res *types.Ch
 			&res.Meta,
 			&res.MembershipPolicy,
 			&res.CreatorID,
-			&res.OrganisationID,
 			&res.CreatedAt,
 			&res.UpdatedAt,
 			&res.ArchivedAt,
@@ -433,7 +432,6 @@ func (Store) messagingChannelColumns(aa ...string) []string {
 		alias + "meta",
 		alias + "membership_policy",
 		alias + "rel_creator",
-		alias + "rel_organisation",
 		alias + "created_at",
 		alias + "updated_at",
 		alias + "archived_at",
@@ -466,7 +464,6 @@ func (s Store) internalMessagingChannelEncoder(res *types.Channel) store.Payload
 		"meta":              res.Meta,
 		"membership_policy": res.MembershipPolicy,
 		"rel_creator":       res.CreatorID,
-		"rel_organisation":  res.OrganisationID,
 		"created_at":        res.CreatedAt,
 		"updated_at":        res.UpdatedAt,
 		"archived_at":       res.ArchivedAt,

store/rdbms/rdbms_schema.go

@@ -402,7 +402,6 @@ func (Schema) MessagingChannel() *Table {
 		ColumnDef("type", ColumnTypeText),
 		ColumnDef("membership_policy", ColumnTypeText),
 		ColumnDef("rel_creator", ColumnTypeIdentifier), // @todo rename => created_by
-		ColumnDef("rel_organisation", ColumnTypeIdentifier),
 		ColumnDef("archived_at", ColumnTypeTimestamp, Null),
 		ColumnDef("rel_last_message", ColumnTypeIdentifier),
 		CUDTimestamps,