Fix merge conflicts

backend/src/validation/integration.ts

@@ -80,13 +80,14 @@ export const CreateIntegrationV1 = z.object({
     owner: z.string().trim().optional(),
     path: z.string().trim().optional(),
     region: z.string().trim().optional(),
+    scope: z.string().trim().optional(),
     metadata: z.object({
       secretPrefix: z.string().optional(),
       secretSuffix: z.string().optional(),
       secretGCPLabel: z.object({
         labelName: z.string(),
         labelValue: z.string()
-      }).optional()
+      }).optional(),
     }).optional()
   })
 });

backend/src/validation/integrationAuth.ts

@@ -117,6 +117,39 @@ export const GetIntegrationAuthVercelBranchesV1 = z.object({
   })
 });
 
+export const GetIntegrationAuthQoveryOrgsV1 = z.object({
+  params: z.object({
+    integrationAuthId: z.string().trim()
+  })
+});
+
+export const GetIntegrationAuthQoveryProjectsV1 = z.object({
+  params: z.object({
+    integrationAuthId: z.string().trim()
+  }),
+  query: z.object({
+    orgId: z.string().trim()
+  })
+});
+
+export const GetIntegrationAuthQoveryEnvironmentsV1 = z.object({
+  params: z.object({
+    integrationAuthId: z.string().trim()
+  }),
+  query: z.object({
+    projectId: z.string().trim()
+  })
+});
+
+export const GetIntegrationAuthQoveryScopesV1 = z.object({
+  params: z.object({
+    integrationAuthId: z.string().trim()
+  }),
+  query: z.object({
+    environmentId: z.string().trim()
+  })
+});
+
 export const GetIntegrationAuthRailwayEnvironmentsV1 = z.object({
   params: z.object({
     integrationAuthId: z.string().trim()
@@ -157,9 +190,11 @@ export const DeleteIntegrationAuthV1 = z.object({
 });
 
 export const GetIntegrationAuthTeamCityBuildConfigsV1 = z.object({
-  params:z.object({
-    appId:z.string().trim().optional(),
+  params: z.object({
     integrationAuthId:z.string().trim()
+  }),
+  query: z.object({
+    appId:z.string().trim()
   })
 })
 

backend/src/validation/workspace.ts

@@ -274,7 +274,7 @@ export const ToggleAutoCapitalizationV2 = z.object({
     workspaceId: z.string().trim()
   }),
   body: z.object({
-    autoCapitalization: z.string().trim()
+    autoCapitalization: z.boolean()
   })
 });