fix

graphql-hive · Oct 20, 2024 · ed53dce · ed53dce
1 parent 1cb929e
commit ed53dce
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 10 deletions.
diff --git a/packages/services/api/src/modules/audit-logs/module.graphql.ts b/packages/services/api/src/modules/audit-logs/module.graphql.ts
@@ -106,6 +106,7 @@ export const typeDefs = gql`
  eventTime: DateTime!
  record: AuditLogIdRecord!
  projectId: String!
+ projectType: String!
  projectName: String!
  }
 

diff --git a/packages/services/api/src/modules/audit-logs/providers/audit-logs-types.ts b/packages/services/api/src/modules/audit-logs/providers/audit-logs-types.ts
@@ -190,6 +190,7 @@ const subscriptionCanceledAuditLogSchema = z.object({
 const projectCreatedAuditLogSchema = z.object({
  projectId: z.string(),
  projectName: z.string(),
+ projectType: z.string(),
 });
 
 const projectSettingsUpdatedAuditLogSchema = z.object({

diff --git a/packages/services/api/src/modules/audit-logs/resolvers/ProjectCreatedAuditLog.ts b/packages/services/api/src/modules/audit-logs/resolvers/ProjectCreatedAuditLog.ts
@@ -15,5 +15,6 @@ export const ProjectCreatedAuditLog: ProjectCreatedAuditLogResolvers = {
  eventTime: e => new Date(e.event_time).toISOString(),
  projectId: e => e.metadata.projectCreatedAuditLogSchema.projectId,
  projectName: e => e.metadata.projectCreatedAuditLogSchema.projectName,
+ projectType: e => e.metadata.projectCreatedAuditLogSchema.projectType,
  record: (e, _, { injector }) => resolveRecordAuditLog(e, injector),
 };
diff --git a/packages/services/api/src/modules/project/resolvers/Mutation/createProject.ts b/packages/services/api/src/modules/project/resolvers/Mutation/createProject.ts
@@ -78,22 +78,13 @@ export const createProject: NonNullable<MutationResolvers['createProject']> = as
  }),
  ]);
 
- const logger = injector.get(Logger);
- const targets: Target[] = [];
- for (const result of targetResults) {
- if (result.ok) {
- targets.push(result.target);
- } else {
- logger.error('Failed to create a target: ' + result.message);
- }
- }
-
  const currentUser = await injector.get(AuthManager).getCurrentUser();
  injector.get(AuditLogManager).createLogAuditEvent(
  {
  eventType: 'PROJECT_CREATED',
  projectCreatedAuditLogSchema: {
  projectId: result.project.id,
+ projectType: result.project.type,
  projectName: result.project.name,
  },
  },
@@ -105,6 +96,16 @@ export const createProject: NonNullable<MutationResolvers['createProject']> = as
  },
  );
 
+ const logger = injector.get(Logger);
+ const targets: Target[] = [];
+ for (const result of targetResults) {
+ if (result.ok) {
+ targets.push(result.target);
+ } else {
+ logger.error('Failed to create a target: ' + result.message);
+ }
+ }
+
  return {
  ok: {
  createdProject: result.project,

diff --git a/packages/services/api/src/modules/project/resolvers/Mutation/updateProjectSlug.ts b/packages/services/api/src/modules/project/resolvers/Mutation/updateProjectSlug.ts
@@ -1,4 +1,6 @@
 import { z } from 'zod';
+import { AuditLogManager } from '../../../audit-logs/providers/audit-logs-manager';
+import { AuthManager } from '../../../auth/providers/auth-manager';
 import { IdTranslator } from '../../../shared/providers/id-translator';
 import { ProjectManager } from '../../providers/project-manager';
 import { ProjectSlugModel } from '../../validation';
@@ -37,6 +39,25 @@ export const updateProjectSlug: NonNullable<MutationResolvers['updateProjectSlug
  });
 
  if (result.ok) {
+ const currentUser = await injector.get(AuthManager).getCurrentUser();
+ injector.get(AuditLogManager).createLogAuditEvent(
+ {
+ eventType: 'PROJECT_SETTINGS_UPDATED',
+ projectSettingsUpdatedAuditLogSchema: {
+ projectId: projectId,
+ updatedFields: JSON.stringify({
+ newSlug: input.slug,
+ }),
+ },
+ },
+ {
+ organizationId: organizationId,
+ userEmail: currentUser.email,
+ userId: currentUser.id,
+ user: currentUser,
+ },
+ );
+
  return {
  ok: {
  selector: {