feat: allow organization members to be assigned multiple groups

connect/src/wg/cosmo/platform/v1/platform_pb.ts

@@ -7442,9 +7442,9 @@ export class InviteUserRequest extends Message<InviteUserRequest> {
   email = "";
 
   /**
-   * @generated from field: string groupId = 2;
+   * @generated from field: repeated string groups = 2;
    */
-  groupId = "";
+  groups: string[] = [];
 
   constructor(data?: PartialMessage<InviteUserRequest>) {
     super();
@@ -7455,7 +7455,7 @@ export class InviteUserRequest extends Message<InviteUserRequest> {
   static readonly typeName = "wg.cosmo.platform.v1.InviteUserRequest";
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     { no: 1, name: "email", kind: "scalar", T: 9 /* ScalarType.STRING */ },
-    { no: 2, name: "groupId", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 2, name: "groups", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): InviteUserRequest {
@@ -10457,19 +10457,14 @@ export class UpdateOrganizationDetailsResponse extends Message<UpdateOrganizatio
  */
 export class UpdateOrgMemberGroupRequest extends Message<UpdateOrgMemberGroupRequest> {
   /**
-   * @generated from field: string userID = 1;
-   */
-  userID = "";
-
-  /**
-   * @generated from field: string orgMemberUserID = 2;
+   * @generated from field: string orgMemberUserID = 1;
    */
   orgMemberUserID = "";
 
   /**
-   * @generated from field: string groupId = 3;
+   * @generated from field: repeated string groups = 2;
    */
-  groupId = "";
+  groups: string[] = [];
 
   constructor(data?: PartialMessage<UpdateOrgMemberGroupRequest>) {
     super();
@@ -10479,9 +10474,8 @@ export class UpdateOrgMemberGroupRequest extends Message<UpdateOrgMemberGroupReq
   static readonly runtime: typeof proto3 = proto3;
   static readonly typeName = "wg.cosmo.platform.v1.UpdateOrgMemberGroupRequest";
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
-    { no: 1, name: "userID", kind: "scalar", T: 9 /* ScalarType.STRING */ },
-    { no: 2, name: "orgMemberUserID", kind: "scalar", T: 9 /* ScalarType.STRING */ },
-    { no: 3, name: "groupId", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 1, name: "orgMemberUserID", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 2, name: "groups", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): UpdateOrgMemberGroupRequest {

controlplane/migrations/0125_acoustic_jackpot.sql

@@ -0,0 +1,30 @@
+CREATE TABLE IF NOT EXISTS "organization_invitation_groups" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"invitation_id" uuid NOT NULL,
+	"group_id" uuid NOT NULL
+);
+
+-- Copy invitation groups to the new table
+INSERT INTO "organization_invitation_groups"("invitation_id", "group_id")
+    SELECT "id" as "invitation_id", "group_id"
+    FROM "organization_invitations" "inv"
+    WHERE "inv"."group_id" IS NOT NULL
+
+--> statement-breakpoint
+ALTER TABLE "organization_invitations" DROP CONSTRAINT "organization_invitations_group_id_organization_groups_id_fk";
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "organization_invitation_groups" ADD CONSTRAINT "organization_invitation_groups_invitation_id_organization_invitations_id_fk" FOREIGN KEY ("invitation_id") REFERENCES "public"."organization_invitations"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "organization_invitation_groups" ADD CONSTRAINT "organization_invitation_groups_group_id_organization_groups_id_fk" FOREIGN KEY ("group_id") REFERENCES "public"."organization_groups"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "org_inv_invitation_idx" ON "organization_invitation_groups" USING btree ("invitation_id");--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "org_inv_group_id" ON "organization_invitation_groups" USING btree ("group_id");--> statement-breakpoint
+ALTER TABLE "organization_invitations" DROP COLUMN IF EXISTS "group_id";