@open-mercato/core 0.6.4-develop.4217.1.c9aa050183 → 0.6.4-develop.4239.1.4a264a5828

package/src/modules/staff/data/enrichers.ts

@@ -0,0 +1,134 @@
+import type { EntityManager } from '@mikro-orm/postgresql'
+import type { AwilixContainer } from 'awilix'
+import type { ResponseEnricher, EnricherContext } from '@open-mercato/shared/lib/crud/response-enricher'
+import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
+import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { StaffTeamMember } from './entities'
+import { computeProjectHoursTrend } from '../lib/timesheets-projects/computeProjectHoursTrend'
+import {
+  listProjectMembersPreview,
+  type MemberPreview,
+} from '../lib/timesheets-projects/listProjectMembersPreview'
+
+const MANAGE_FEATURE = 'staff.timesheets.projects.manage'
+
+type EntityRecord = Record<string, unknown> & { id: string }
+
+type StaffEnrichment = {
+  _staff: {
+    hoursWeek: number
+    hoursTrend: number[]
+    myRole: string | null
+    members?: MemberPreview[]
+    memberCount?: number
+  }
+}
+
+const FALLBACK: StaffEnrichment = {
+  _staff: {
+    hoursWeek: 0,
+    hoursTrend: [0, 0, 0, 0, 0, 0, 0],
+    myRole: null,
+  },
+}
+
+type InternalContext = EnricherContext & {
+  em: EntityManager
+  container: AwilixContainer
+}
+
+async function callerHasManage(ctx: InternalContext): Promise<boolean> {
+  if (ctx.userFeatures?.includes(MANAGE_FEATURE)) return true
+  try {
+    const rbac = ctx.container.resolve('rbacService') as RbacService
+    return await rbac.userHasAllFeatures(ctx.userId, [MANAGE_FEATURE], {
+      tenantId: ctx.tenantId,
+      organizationId: ctx.organizationId,
+    })
+  } catch {
+    return false
+  }
+}
+
+async function resolveCallerStaffMemberId(ctx: InternalContext): Promise<string | null> {
+  const member = await findOneWithDecryption(
+    ctx.em.fork(),
+    StaffTeamMember,
+    {
+      userId: ctx.userId,
+      tenantId: ctx.tenantId,
+      organizationId: ctx.organizationId,
+      deletedAt: null,
+    },
+    {},
+    { tenantId: ctx.tenantId, organizationId: ctx.organizationId },
+  )
+  return member?.id ?? null
+}
+
+const portfolioEnricher: ResponseEnricher<EntityRecord, StaffEnrichment> = {
+  id: 'staff.timesheets-projects-portfolio',
+  targetEntity: 'staff:staff_time_project',
+  // ACL is enforced by the route (`requireFeatures: ['staff.timesheets.projects.view']`).
+  // Per-field gating (e.g. `members` for manage-only) happens inline below via rbacService.
+  priority: 10,
+  timeout: 3000,
+  critical: false,
+  fallback: FALLBACK,
+
+  async enrichOne(record, context) {
+    const enriched = await this.enrichMany!([record], context)
+    return enriched[0]
+  },
+
+  async enrichMany(records, context) {
+    if (records.length === 0) return records as (EntityRecord & StaffEnrichment)[]
+
+    const ctx = context as InternalContext
+    const projectIds = records.map((r) => r.id)
+
+    const [callerStaffMemberId, hasManage] = await Promise.all([
+      resolveCallerStaffMemberId(ctx),
+      callerHasManage(ctx),
+    ])
+
+    const [trendMap, membersMap] = await Promise.all([
+      computeProjectHoursTrend({
+        em: ctx.em,
+        tenantId: ctx.tenantId,
+        organizationId: ctx.organizationId,
+        projectIds,
+        staffMemberId: hasManage ? null : callerStaffMemberId,
+      }),
+      listProjectMembersPreview({
+        em: ctx.em,
+        tenantId: ctx.tenantId,
+        organizationId: ctx.organizationId,
+        projectIds,
+        callerStaffMemberId,
+      }),
+    ])
+
+    return records.map((record) => {
+      const trend = trendMap.get(record.id) ?? {
+        hoursWeek: 0,
+        hoursTrend: [0, 0, 0, 0, 0, 0, 0],
+      }
+      const members = membersMap.get(record.id)
+      const enrichment: StaffEnrichment['_staff'] = {
+        hoursWeek: trend.hoursWeek,
+        hoursTrend: trend.hoursTrend,
+        myRole: members?.myRole ?? null,
+      }
+      if (hasManage && members) {
+        enrichment.members = members.preview
+        enrichment.memberCount = members.total
+      }
+      return { ...record, _staff: enrichment }
+    })
+  },
+}
+
+export const enrichers: ResponseEnricher[] = [portfolioEnricher]
+
+export default enrichers

package/src/modules/staff/data/entities.ts

@@ -362,3 +362,201 @@ export class StaffTeamMemberAddress {
   @ManyToOne(() => StaffTeamMember, { fieldName: 'member_id' })
   member!: StaffTeamMember
 }
+
+// --- Timesheets entities (Phase 1) ---
+
+export type StaffTimeEntrySource = 'manual' | 'timer' | 'kiosk' | 'mobile'
+export type StaffTimeProjectStatus = 'active' | 'on_hold' | 'completed'
+export type StaffTimeProjectMemberStatus = 'active' | 'inactive'
+export type StaffTimeEntrySegmentType = 'work' | 'break'
+
+@Entity({ tableName: 'staff_time_entries' })
+@Index({ name: 'staff_time_entries_tenant_org_idx', properties: ['tenantId', 'organizationId'] })
+@Index({ name: 'staff_time_entries_member_date_idx', properties: ['organizationId', 'staffMemberId', 'date'] })
+@Index({ name: 'staff_time_entries_project_date_idx', properties: ['organizationId', 'timeProjectId', 'date'] })
+export class StaffTimeEntry {
+  @PrimaryKey({ type: 'uuid', defaultRaw: 'gen_random_uuid()' })
+  id!: string
+
+  @Property({ name: 'tenant_id', type: 'uuid' })
+  tenantId!: string
+
+  @Property({ name: 'organization_id', type: 'uuid' })
+  organizationId!: string
+
+  @Property({ name: 'staff_member_id', type: 'uuid' })
+  staffMemberId!: string
+
+  @Property({ name: 'date', type: 'date' })
+  date!: Date
+
+  @Property({ name: 'duration_minutes', type: 'integer', default: 0 })
+  durationMinutes: number = 0
+
+  @Property({ name: 'started_at', type: Date, nullable: true })
+  startedAt?: Date | null
+
+  @Property({ name: 'ended_at', type: Date, nullable: true })
+  endedAt?: Date | null
+
+  @Property({ type: 'text', nullable: true })
+  notes?: string | null
+
+  @Property({ name: 'time_project_id', type: 'uuid', nullable: true })
+  timeProjectId?: string | null
+
+  @Property({ name: 'customer_id', type: 'uuid', nullable: true })
+  customerId?: string | null
+
+  @Property({ name: 'deal_id', type: 'uuid', nullable: true })
+  dealId?: string | null
+
+  @Property({ name: 'order_id', type: 'uuid', nullable: true })
+  orderId?: string | null
+
+  @Enum({ items: ['manual', 'timer', 'kiosk', 'mobile'], type: 'text', name: 'source', default: 'manual' })
+  source: StaffTimeEntrySource = 'manual'
+
+  @Property({ name: 'created_at', type: Date, onCreate: () => new Date() })
+  createdAt: Date = new Date()
+
+  @Property({ name: 'updated_at', type: Date, onUpdate: () => new Date() })
+  updatedAt: Date = new Date()
+
+  @Property({ name: 'deleted_at', type: Date, nullable: true })
+  deletedAt?: Date | null
+}
+
+@Entity({ tableName: 'staff_time_entry_segments' })
+@Index({ name: 'staff_time_entry_segments_tenant_org_idx', properties: ['tenantId', 'organizationId'] })
+@Index({ name: 'staff_time_entry_segments_entry_idx', properties: ['timeEntryId'] })
+export class StaffTimeEntrySegment {
+  @PrimaryKey({ type: 'uuid', defaultRaw: 'gen_random_uuid()' })
+  id!: string
+
+  @Property({ name: 'tenant_id', type: 'uuid' })
+  tenantId!: string
+
+  @Property({ name: 'organization_id', type: 'uuid' })
+  organizationId!: string
+
+  @Property({ name: 'time_entry_id', type: 'uuid' })
+  timeEntryId!: string
+
+  @Property({ name: 'started_at', type: Date })
+  startedAt!: Date
+
+  @Property({ name: 'ended_at', type: Date, nullable: true })
+  endedAt?: Date | null
+
+  @Enum({ items: ['work', 'break'], type: 'text', name: 'segment_type', default: 'work' })
+  segmentType: StaffTimeEntrySegmentType = 'work'
+
+  @Property({ name: 'created_at', type: Date, onCreate: () => new Date() })
+  createdAt: Date = new Date()
+
+  @Property({ name: 'updated_at', type: Date, onUpdate: () => new Date() })
+  updatedAt: Date = new Date()
+
+  @Property({ name: 'deleted_at', type: Date, nullable: true })
+  deletedAt?: Date | null
+}
+
+@Entity({ tableName: 'staff_time_projects' })
+@Index({ name: 'staff_time_projects_tenant_org_idx', properties: ['tenantId', 'organizationId'] })
+@Index({ name: 'staff_time_projects_code_unique_idx', properties: ['organizationId', 'tenantId', 'code'], options: { unique: true, where: 'deleted_at IS NULL' } })
+export class StaffTimeProject {
+  @PrimaryKey({ type: 'uuid', defaultRaw: 'gen_random_uuid()' })
+  id!: string
+
+  @Property({ name: 'tenant_id', type: 'uuid' })
+  tenantId!: string
+
+  @Property({ name: 'organization_id', type: 'uuid' })
+  organizationId!: string
+
+  @Property({ type: 'text' })
+  name!: string
+
+  @Property({ name: 'customer_id', type: 'uuid', nullable: true })
+  customerId?: string | null
+
+  @Property({ type: 'text' })
+  code!: string
+
+  @Property({ type: 'text', nullable: true })
+  description?: string | null
+
+  @Property({ name: 'project_type', type: 'text', nullable: true })
+  projectType?: string | null
+
+  @Property({ type: 'varchar', length: 20, nullable: true })
+  color?: string | null
+
+  @Enum({ items: ['active', 'on_hold', 'completed'], type: 'text', name: 'status', default: 'active' })
+  status: StaffTimeProjectStatus = 'active'
+
+  @Property({ name: 'owner_user_id', type: 'uuid', nullable: true })
+  ownerUserId?: string | null
+
+  @Property({ name: 'cost_center', type: 'text', nullable: true })
+  costCenter?: string | null
+
+  @Property({ name: 'start_date', type: 'date', nullable: true })
+  startDate?: Date | null
+
+  @Property({ name: 'created_at', type: Date, onCreate: () => new Date() })
+  createdAt: Date = new Date()
+
+  @Property({ name: 'updated_at', type: Date, onUpdate: () => new Date() })
+  updatedAt: Date = new Date()
+
+  @Property({ name: 'deleted_at', type: Date, nullable: true })
+  deletedAt?: Date | null
+}
+
+@Entity({ tableName: 'staff_time_project_members' })
+@Index({ name: 'staff_time_project_members_tenant_org_idx', properties: ['tenantId', 'organizationId'] })
+@Index({ name: 'staff_time_project_members_project_idx', properties: ['organizationId', 'timeProjectId'] })
+@Index({ name: 'staff_time_project_members_member_idx', properties: ['organizationId', 'staffMemberId'] })
+@Index({ name: 'staff_time_project_members_unique_idx', properties: ['organizationId', 'tenantId', 'timeProjectId', 'staffMemberId'], options: { unique: true, where: 'deleted_at IS NULL' } })
+export class StaffTimeProjectMember {
+  @PrimaryKey({ type: 'uuid', defaultRaw: 'gen_random_uuid()' })
+  id!: string
+
+  @Property({ name: 'tenant_id', type: 'uuid' })
+  tenantId!: string
+
+  @Property({ name: 'organization_id', type: 'uuid' })
+  organizationId!: string
+
+  @Property({ name: 'time_project_id', type: 'uuid' })
+  timeProjectId!: string
+
+  @Property({ name: 'staff_member_id', type: 'uuid' })
+  staffMemberId!: string
+
+  @Property({ type: 'text', nullable: true })
+  role?: string | null
+
+  @Enum({ items: ['active', 'inactive'], type: 'text', name: 'status', default: 'active' })
+  status: StaffTimeProjectMemberStatus = 'active'
+
+  @Property({ name: 'show_in_grid', type: 'boolean', default: false })
+  showInGrid: boolean = false
+
+  @Property({ name: 'assigned_start_date', type: 'date' })
+  assignedStartDate!: Date
+
+  @Property({ name: 'assigned_end_date', type: 'date', nullable: true })
+  assignedEndDate?: Date | null
+
+  @Property({ name: 'created_at', type: Date, onCreate: () => new Date() })
+  createdAt: Date = new Date()
+
+  @Property({ name: 'updated_at', type: Date, onUpdate: () => new Date() })
+  updatedAt: Date = new Date()
+
+  @Property({ name: 'deleted_at', type: Date, nullable: true })
+  deletedAt?: Date | null
+}

package/src/modules/staff/data/validators.ts

@@ -1,4 +1,12 @@
 import { z } from 'zod'
+import { PROJECT_COLOR_KEYS } from '../lib/timesheets-ui/colors'
+
+const projectColorSchema = z
+  .string()
+  .refine(
+    (value) => (PROJECT_COLOR_KEYS as readonly string[]).includes(value),
+    { message: 'Invalid project color key.' },
+  )
 
 const tagsSchema = z.array(z.string().min(1)).optional().default([])
 
@@ -242,3 +250,124 @@ export type StaffLeaveRequestCreateInput = z.infer<typeof staffLeaveRequestCreat
 export type StaffLeaveRequestUpdateInput = z.infer<typeof staffLeaveRequestUpdateSchema>
 export type StaffLeaveRequestDecisionInput = z.infer<typeof staffLeaveRequestDecisionSchema>
 export type StaffTeamMemberSelfCreateInput = z.infer<typeof staffTeamMemberSelfCreateSchema>
+
+// --- Timesheets validators (Phase 1) ---
+
+const timeEntrySourceSchema = z.enum(['manual', 'timer', 'kiosk', 'mobile'])
+const timeProjectStatusSchema = z.enum(['active', 'on_hold', 'completed'])
+const timeProjectMemberStatusSchema = z.enum(['active', 'inactive'])
+const timeEntrySegmentTypeSchema = z.enum(['work', 'break'])
+const projectCodeSchema = z.string().min(1).max(50).regex(/^[a-zA-Z0-9-]+$/)
+
+export const staffTimeEntryCreateSchema = z.object({
+  ...scopedCreateFields,
+  staffMemberId: z.string().uuid(),
+  date: z.coerce.date(),
+  durationMinutes: z.number().int().min(0).max(1440),
+  startedAt: z.coerce.date().optional().nullable(),
+  endedAt: z.coerce.date().optional().nullable(),
+  timeProjectId: z.string().uuid().optional().nullable(),
+  customerId: z.string().uuid().optional().nullable(),
+  dealId: z.string().uuid().optional().nullable(),
+  orderId: z.string().uuid().optional().nullable(),
+  notes: z.string().max(2000).optional().nullable(),
+  source: timeEntrySourceSchema.optional().default('manual'),
+})
+
+export const staffTimeEntryUpdateSchema = z.object({
+  ...scopedUpdateFields,
+  date: z.coerce.date().optional(),
+  durationMinutes: z.number().int().min(0).max(1440).optional(),
+  timeProjectId: z.string().uuid().optional().nullable(),
+  customerId: z.string().uuid().optional().nullable(),
+  dealId: z.string().uuid().optional().nullable(),
+  orderId: z.string().uuid().optional().nullable(),
+  notes: z.string().max(2000).optional().nullable(),
+})
+
+export const staffTimeEntryBulkItemSchema = z.object({
+  id: z.string().uuid().optional().nullable(),
+  date: z.coerce.date(),
+  timeProjectId: z.string().uuid(),
+  durationMinutes: z.number().int().min(0).max(1440),
+  notes: z.string().max(2000).optional().nullable(),
+})
+
+export const staffTimeEntryBulkSaveSchema = z.object({
+  entries: z.array(staffTimeEntryBulkItemSchema).min(1).max(200),
+})
+
+export const staffTimeEntrySegmentCreateSchema = z.object({
+  ...scopedCreateFields,
+  timeEntryId: z.string().uuid(),
+  startedAt: z.coerce.date(),
+  endedAt: z.coerce.date().optional().nullable(),
+  segmentType: timeEntrySegmentTypeSchema.optional().default('work'),
+})
+
+export const staffTimeEntrySegmentUpdateSchema = z.object({
+  ...scopedUpdateFields,
+  startedAt: z.coerce.date().optional(),
+  endedAt: z.coerce.date().optional().nullable(),
+  segmentType: timeEntrySegmentTypeSchema.optional(),
+})
+
+export const staffTimeProjectCreateSchema = z.object({
+  ...scopedCreateFields,
+  name: z.string().min(1).max(255),
+  customerId: z.string().uuid().optional().nullable(),
+  code: projectCodeSchema,
+  description: z.string().max(2000).optional().nullable(),
+  projectType: z.string().max(100).optional().nullable(),
+  color: projectColorSchema.optional().nullable(),
+  status: timeProjectStatusSchema.optional().default('active'),
+  ownerUserId: z.string().uuid().optional().nullable(),
+  costCenter: z.string().max(100).optional().nullable(),
+  startDate: z.coerce.date().optional().nullable(),
+})
+
+export const staffTimeProjectUpdateSchema = z.object({
+  ...scopedUpdateFields,
+  name: z.string().min(1).max(255).optional(),
+  customerId: z.string().uuid().optional().nullable(),
+  code: projectCodeSchema.optional(),
+  description: z.string().max(2000).optional().nullable(),
+  projectType: z.string().max(100).optional().nullable(),
+  color: projectColorSchema.optional().nullable(),
+  status: timeProjectStatusSchema.optional(),
+  ownerUserId: z.string().uuid().optional().nullable(),
+  costCenter: z.string().max(100).optional().nullable(),
+  startDate: z.coerce.date().optional().nullable(),
+})
+
+export const staffTimeProjectMemberAssignSchema = z.object({
+  ...scopedCreateFields,
+  timeProjectId: z.string().uuid(),
+  staffMemberId: z.string().uuid(),
+  role: z.string().max(100).optional().nullable(),
+  status: timeProjectMemberStatusSchema.optional().default('active'),
+  assignedStartDate: z.coerce.date(),
+  assignedEndDate: z.coerce.date().optional().nullable(),
+})
+
+export const staffTimeProjectMemberUpdateSchema = z.object({
+  ...scopedUpdateFields,
+  role: z.string().max(100).optional().nullable(),
+  status: timeProjectMemberStatusSchema.optional(),
+  assignedEndDate: z.coerce.date().optional().nullable(),
+})
+
+export const staffMyProjectVisibilityUpdateSchema = z.object({
+  showInGrid: z.boolean(),
+})
+
+export type StaffTimeEntryCreateInput = z.infer<typeof staffTimeEntryCreateSchema>
+export type StaffTimeEntryUpdateInput = z.infer<typeof staffTimeEntryUpdateSchema>
+export type StaffTimeEntryBulkSaveInput = z.infer<typeof staffTimeEntryBulkSaveSchema>
+export type StaffTimeEntrySegmentCreateInput = z.infer<typeof staffTimeEntrySegmentCreateSchema>
+export type StaffTimeEntrySegmentUpdateInput = z.infer<typeof staffTimeEntrySegmentUpdateSchema>
+export type StaffTimeProjectCreateInput = z.infer<typeof staffTimeProjectCreateSchema>
+export type StaffTimeProjectUpdateInput = z.infer<typeof staffTimeProjectUpdateSchema>
+export type StaffTimeProjectMemberAssignInput = z.infer<typeof staffTimeProjectMemberAssignSchema>
+export type StaffTimeProjectMemberUpdateInput = z.infer<typeof staffTimeProjectMemberUpdateSchema>
+export type StaffMyProjectVisibilityUpdateInput = z.infer<typeof staffMyProjectVisibilityUpdateSchema>

package/src/modules/staff/events.ts

@@ -25,6 +25,19 @@ const events = [
   { id: 'staff.job_history.created', label: 'Job History Created', entity: 'job_history', category: 'crud' },
   { id: 'staff.job_history.updated', label: 'Job History Updated', entity: 'job_history', category: 'crud' },
   { id: 'staff.job_history.deleted', label: 'Job History Deleted', entity: 'job_history', category: 'crud' },
+
+  // Timesheets (Phase 1)
+  { id: 'staff.timesheets.time_entry.created', label: 'Time Entry Created', entity: 'time_entry', category: 'crud' },
+  { id: 'staff.timesheets.time_entry.updated', label: 'Time Entry Updated', entity: 'time_entry', category: 'crud' },
+  { id: 'staff.timesheets.time_entry.deleted', label: 'Time Entry Deleted', entity: 'time_entry', category: 'crud' },
+  { id: 'staff.timesheets.time_entry.timer_started', label: 'Timer Started', entity: 'time_entry', category: 'lifecycle' },
+  { id: 'staff.timesheets.time_entry.timer_stopped', label: 'Timer Stopped', entity: 'time_entry', category: 'lifecycle' },
+  { id: 'staff.timesheets.time_project.created', label: 'Time Project Created', entity: 'time_project', category: 'crud' },
+  { id: 'staff.timesheets.time_project.updated', label: 'Time Project Updated', entity: 'time_project', category: 'crud' },
+  { id: 'staff.timesheets.time_project.deleted', label: 'Time Project Deleted', entity: 'time_project', category: 'crud' },
+  { id: 'staff.timesheets.time_project_member.created', label: 'Time Project Member Assigned', entity: 'time_project_member', category: 'crud' },
+  { id: 'staff.timesheets.time_project_member.updated', label: 'Time Project Member Updated', entity: 'time_project_member', category: 'crud' },
+  { id: 'staff.timesheets.time_project_member.deleted', label: 'Time Project Member Unassigned', entity: 'time_project_member', category: 'crud' },
 ] as const
 
 export const eventsConfig = createModuleEvents({