Merge pull request #876 from trycompai/mariano/comp-166-osquery-agent-integration

[dev] [Marfuen] mariano/comp-166-osquery-agent-integration

Author: Marfuen

…20250611142949_add_fleetdm/migration.sql …evice_agent_details_to_org/migration.sqlpackages/db/prisma/migrations/20250611142949_add_fleetdm/migration.sql renamed to packages/db/prisma/migrations/20250605184740_add_device_agent_details_to_org/migration.sql packages/db/prisma/migrations/20250611142949_add_fleetdm/migration.sql renamed to packages/db/prisma/migrations/20250605184740_add_device_agent_details_to_org/migration.sql

@@ -11,11 +11,8 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql;
 
--- AlterTable
-ALTER TABLE "Organization" ADD COLUMN     "fleetDmLabelId" INTEGER,
-ADD COLUMN     "fleetDmSecret" TEXT NOT NULL DEFAULT generate_random_secret(32),
-ADD COLUMN     "isFleetSetupCompleted" BOOLEAN NOT NULL DEFAULT false,
-ADD COLUMN     "osqueryAgentDownloadUrl" TEXT;
 
 -- AlterTable
-ALTER TABLE "Member" ADD COLUMN     "fleetDmLabelId" INTEGER;
+ALTER TABLE "Organization" ADD COLUMN     "fleetDmSecret" TEXT NOT NULL DEFAULT generate_random_secret(32);
+ALTER TABLE "Organization" ADD COLUMN     "fleetDmLabelId" INT;
+ALTER TABLE "Organization" ADD COLUMN     "osqueryAgentDownloadUrl" TEXT;

packages/db/prisma/migrations/20250610215328_add_fleet_label_to_employees/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Member" ADD COLUMN     "fleetDmLabelId" INTEGER;

packages/db/prisma/migrations/20250611144654_add_is_fleet_setup_flag/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Organization" ADD COLUMN     "isFleetSetupCompleted" BOOLEAN NOT NULL DEFAULT false;

packages/db/prisma/schema/auth.prisma

@@ -83,6 +83,7 @@ model Member {
     department                      Departments                       @default(none)
     isActive                        Boolean                           @default(true)
     employeeTrainingVideoCompletion EmployeeTrainingVideoCompletion[]
+    fleetDmLabelId                  Int?
 
     assignedPolicies Policy[]   @relation("PolicyAssignee") // Policies where this member is an assignee
     approvedPolicies Policy[]   @relation("PolicyApprover") // Policies where this member is an approver