8313c759c6
Auto Tag Develop / tag (push) Successful in 9s
## Migration modular monolith DDD — Lesstime (0.1 → 3.3) Cette MR regroupe l'intégralité de la refonte en monolithe modulaire (strangler progressif, additif). Elle remplace les MR stackées de Phase 1 (#12–#16), désormais incluses ici. **Ne pas merger avant validation fonctionnelle** : branche destinée à être testée telle quelle. ### Périmètre — 9 modules sous `src/Module/` | Phase | Module | Contenu | |------|--------|---------| | 0.1 | (socle) | infrastructure modulaire, `ModuleInterface`, mapping Doctrine par module | | 0.2 | (socle front) | auto-détection des layers Nuxt sous `frontend/modules/*` | | 1.1 | **Core** | Identité (User/Auth), Notifications, Notifier | | 1.2 | Core | RBAC fin (permissions `module.resource.action`, sidebar gated) | | 1.3 | Core | Audit log (`#[Auditable]`, listener, provider DBAL) | | 2.1 | **TimeTracking** | TimeEntry + MCP + export | | 2.2 | **ProjectManagement** | cœur métier Projets/Tâches + 38 MCP tools | | 2.3 | **Absence** | demandes, soldes, policies, justificatifs | | 2.4 | **Directory** | Clients (migrés) + **Prospects** (nouveau, conversion → Client) | | 2.5 | **Mail** | intégration IMAP OVH + liens tâches | | 2.6 | **Integration** | Gitea / BookStack / Zimbra / Share | | 3.1 | **Reporting** | rapports transverses (DBAL read-only, 0 import inter-module) | | 3.2 | **ClientPortal** | portail client (ROLE_CLIENT cloisonné, tickets, notifications) | | 3.3 | (finition) | nettoyage legacy — `src/Entity` vide, app 100% modulaire | ### Architecture - Découplage inter-modules par **contrats** (`UserInterface`, `ProjectInterface`, `TaskInterface`, `TaskTagInterface`, `ClientInterface`, `ClientTicketInterface`, `LeaveProfileInterface`) + `resolve_target_entities` 100% modulaire (aucune cible legacy). - Repositories : interface `Domain/Repository` + implémentation `Infrastructure/Doctrine`, bindées. - Reporting en DBAL read-only pur (aucun import d'entité d'un autre module). - Chaque migration de module : déplacement à comportement préservé (API publique et noms d'outils MCP inchangés), migrations **additives** uniquement (zéro destructif). ### Sécurité - ROLE_CLIENT cloisonné : un utilisateur client n'accède qu'à `/portal` et à ses propres tickets (filtrés par `allowedProjects`), interdit sur toute l'API interne. - Correctif : interdiction pour un client de créer un lien vers le partage SMB (upload uniquement). ### QA non-régression (branche reconstruite from scratch) - Migrations from scratch + fixtures : OK. - Compilation dev + prod : OK. - **180 tests PHPUnit verts**, php-cs-fixer clean, ~96 routes, **66 outils MCP** tous sous `App\Module\*`. - Smoke test runtime multi-rôles (admin / ROLE_USER / ROLE_CLIENT) : 44 vérifications HTTP, **0 écart**, cloisonnement client étanche. - Build Nuxt OK, 9 layers, 0 import legacy résiduel. ### Points à arbitrer (hors périmètre de cette migration) - Durcissement MCP/IDOR pré-existant (`userId` explicite sans scoping sur certains tools TimeTracking/Absence/TaskDocument) — ticket dédié recommandé. - Validation fonctionnelle de **Prospect** et **ClientPortal** (conçus depuis les specs disque). - **Harmonisation visuelle Malio finale** (3.3) — finition esthétique inter-modules laissée au PO. --- ## ⚠️ Déploiement / migration des données — à ne pas oublier ### 1. Resynchroniser les séquences PostgreSQL après tout import/restore de dump Si la prod (ou tout environnement) est **montée depuis un dump** (`pg_restore` / `COPY`), les lignes sont chargées avec leurs `id` explicites **sans avancer les séquences** → au premier `INSERT` : `duplicate key value violates unique constraint "..._pkey"` (constaté en local sur `notification`, `task`, `time_entry`…). À lancer **juste après chaque restore/import** : ```sql DO $$ DECLARE r RECORD; maxid BIGINT; seq TEXT; BEGIN FOR r IN SELECT table_name, column_name FROM information_schema.columns WHERE table_schema='public' LOOP seq := pg_get_serial_sequence(quote_ident(r.table_name), r.column_name); IF seq IS NOT NULL THEN EXECUTE format('SELECT COALESCE(MAX(%I),0) FROM %I', r.column_name, r.table_name) INTO maxid; PERFORM setval(seq, GREATEST(maxid,1), maxid > 0); END IF; END LOOP; END $$; ``` > Ne concerne **pas** une prod qui tourne déjà (séquences avancées organiquement) — uniquement le cas restore/import. Idempotent, sans risque. ### 2. Fix dénormalisation des collections typées-contrat (code, inclus dans la branche) Les relations **to-many** typées par une interface `Shared\Domain\Contract\*` (`TimeEntry::tags` → `TaskTagInterface`, `Task::collaborators` → `UserInterface`) étaient **indénormalisables par API Platform** (mono-valué OK via IRI, collection KO) → **tout POST/PATCH portant une telle collection renvoyait 400/500**. Corrigé par un dénormaliseur générique `ContractRelationDenormalizer` (réutilise `resolve_target_entities`, zéro couplage par-entité) + test fonctionnel de non-régression. --------- Co-authored-by: Matthieu <contact@malio.fr> Reviewed-on: #17
294 lines
10 KiB
Vue
294 lines
10 KiB
Vue
<template>
|
|
<MalioDrawer v-model="isOpen">
|
|
<template #header>
|
|
<h2 class="text-xl font-bold">{{ isEditing ? $t('timeEntries.editEntry') : $t('timeEntries.addEntry') }}</h2>
|
|
</template>
|
|
<form class="space-y-4" @submit.prevent="onSubmit">
|
|
<div>
|
|
<label class="mb-1 block text-sm font-semibold text-neutral-700">Titre</label>
|
|
<input
|
|
v-model="form.title"
|
|
type="text"
|
|
class="w-full rounded-md border border-neutral-300 px-3 py-2 text-sm focus:border-primary-500 focus:outline-none"
|
|
placeholder="Que fais-tu ?"
|
|
/>
|
|
</div>
|
|
|
|
<MalioInputRichText
|
|
v-model="form.description"
|
|
label="Description"
|
|
min-height="120px"
|
|
/>
|
|
|
|
<div>
|
|
<label class="mb-1 block text-sm font-semibold text-neutral-700">Date</label>
|
|
<input
|
|
v-model="form.date"
|
|
type="date"
|
|
class="w-full rounded-md border border-neutral-300 px-3 py-2 text-sm focus:border-primary-500 focus:outline-none"
|
|
/>
|
|
</div>
|
|
|
|
<div class="grid grid-cols-2 gap-3">
|
|
<div>
|
|
<label class="mb-1 block text-sm font-semibold text-neutral-700">Début</label>
|
|
<input
|
|
v-model="form.startTime"
|
|
type="time"
|
|
step="60"
|
|
class="w-full rounded-md border border-neutral-300 px-3 py-2 text-sm tabular-nums focus:border-primary-500 focus:outline-none"
|
|
/>
|
|
</div>
|
|
<div>
|
|
<label class="mb-1 block text-sm font-semibold text-neutral-700">Fin</label>
|
|
<input
|
|
v-model="form.endTime"
|
|
type="time"
|
|
step="60"
|
|
class="w-full rounded-md border border-neutral-300 px-3 py-2 text-sm tabular-nums focus:border-primary-500 focus:outline-none"
|
|
/>
|
|
</div>
|
|
</div>
|
|
|
|
<div
|
|
v-if="durationLabel"
|
|
class="rounded-md bg-neutral-100 px-3 py-2 text-center text-sm font-semibold text-neutral-600 tabular-nums"
|
|
>
|
|
{{ durationLabel }}
|
|
</div>
|
|
|
|
<MalioSelect
|
|
v-model="form.userId"
|
|
:options="userOptions"
|
|
label="Utilisateur"
|
|
group-class="w-full"
|
|
/>
|
|
|
|
<MalioSelect
|
|
v-model="form.projectId"
|
|
:options="projectOptions"
|
|
label="Projet"
|
|
empty-option-label="— Aucun —"
|
|
group-class="w-full"
|
|
/>
|
|
|
|
<div>
|
|
<p class="mb-2 text-sm font-semibold text-neutral-700">Tags</p>
|
|
<div class="flex flex-wrap gap-2">
|
|
<label
|
|
v-for="tag in tags"
|
|
:key="tag.id"
|
|
class="cursor-pointer rounded-full px-3 py-1 text-xs font-semibold transition"
|
|
:class="form.tagIds.includes(tag.id)
|
|
? 'text-white'
|
|
: 'bg-neutral-100 text-neutral-600 hover:bg-neutral-200'"
|
|
:style="form.tagIds.includes(tag.id) ? { backgroundColor: tag.color } : {}"
|
|
>
|
|
<input
|
|
type="checkbox"
|
|
class="hidden"
|
|
:value="tag.id"
|
|
:checked="form.tagIds.includes(tag.id)"
|
|
@change="toggleTag(tag.id)"
|
|
/>
|
|
{{ tag.label }}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="flex items-center" :class="isEditing ? 'justify-between' : 'justify-end'">
|
|
<MalioButton
|
|
v-if="isEditing"
|
|
variant="danger"
|
|
label="Supprimer"
|
|
button-class="w-auto px-4"
|
|
@click="onDelete"
|
|
/>
|
|
<div class="flex gap-2">
|
|
<MalioButton
|
|
v-if="isEditing"
|
|
variant="secondary"
|
|
label="Dupliquer"
|
|
button-class="w-auto px-4"
|
|
@click="onDuplicate"
|
|
/>
|
|
<MalioButton
|
|
label="Enregistrer"
|
|
button-class="w-auto px-4"
|
|
@click="onSubmit"
|
|
/>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
</MalioDrawer>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import type { TimeEntry, TimeEntryWrite } from '~/modules/time-tracking/services/dto/time-entry'
|
|
import type { UserData } from '~/services/dto/user-data'
|
|
import type { Project } from '~/modules/project-management/services/dto/project'
|
|
import type { TaskTag } from '~/modules/project-management/services/dto/task-tag'
|
|
import { useTimeEntryService } from '~/modules/time-tracking/services/time-entries'
|
|
|
|
const props = defineProps<{
|
|
modelValue: boolean
|
|
entry?: TimeEntry | null
|
|
prefillStartedAt?: string | null
|
|
users: UserData[]
|
|
projects: Project[]
|
|
tags: TaskTag[]
|
|
}>()
|
|
|
|
const emit = defineEmits<{
|
|
(e: 'update:modelValue', value: boolean): void
|
|
(e: 'saved'): void
|
|
}>()
|
|
|
|
const isOpen = computed({
|
|
get: () => props.modelValue,
|
|
set: (v) => emit('update:modelValue', v),
|
|
})
|
|
|
|
const isEditing = computed(() => !!props.entry)
|
|
|
|
const authStore = useAuthStore()
|
|
|
|
const form = reactive({
|
|
title: '',
|
|
description: '',
|
|
date: '',
|
|
startTime: '',
|
|
endTime: '',
|
|
userId: authStore.user?.id ?? null as number | null,
|
|
projectId: null as number | null,
|
|
tagIds: [] as number[],
|
|
})
|
|
|
|
const userOptions = computed(() =>
|
|
props.users.map(u => ({ label: u.username, value: u.id }))
|
|
)
|
|
|
|
const projectOptions = computed(() =>
|
|
props.projects.map(p => ({ label: p.name, value: p.id }))
|
|
)
|
|
|
|
const durationLabel = computed(() => {
|
|
if (!form.startTime || !form.endTime) return ''
|
|
const [sh, sm] = form.startTime.split(':').map(Number) as [number, number]
|
|
const [eh, em] = form.endTime.split(':').map(Number) as [number, number]
|
|
const diff = (eh * 60 + em) - (sh * 60 + sm)
|
|
if (diff <= 0) return ''
|
|
const h = Math.floor(diff / 60)
|
|
const m = diff % 60
|
|
return m > 0 ? `${h}h${String(m).padStart(2, '0')}` : `${h}h`
|
|
})
|
|
|
|
function toggleTag(id: number) {
|
|
const idx = form.tagIds.indexOf(id)
|
|
if (idx >= 0) {
|
|
form.tagIds.splice(idx, 1)
|
|
} else {
|
|
form.tagIds.push(id)
|
|
}
|
|
}
|
|
|
|
function toLocalDate(iso: string): string {
|
|
const d = new Date(iso)
|
|
const offset = d.getTimezoneOffset()
|
|
const local = new Date(d.getTime() - offset * 60000)
|
|
return local.toISOString().slice(0, 10)
|
|
}
|
|
|
|
function toLocalTime(iso: string): string {
|
|
const d = new Date(iso)
|
|
const offset = d.getTimezoneOffset()
|
|
const local = new Date(d.getTime() - offset * 60000)
|
|
return local.toISOString().slice(11, 16)
|
|
}
|
|
|
|
function toISO(date: string, time: string): string {
|
|
return new Date(`${date}T${time}`).toISOString()
|
|
}
|
|
|
|
function populateForm(entry: TimeEntry | null | undefined) {
|
|
if (entry) {
|
|
form.title = entry.title ?? ''
|
|
form.description = entry.description ?? ''
|
|
form.date = toLocalDate(entry.startedAt)
|
|
form.startTime = toLocalTime(entry.startedAt)
|
|
form.endTime = entry.stoppedAt ? toLocalTime(entry.stoppedAt) : ''
|
|
form.userId = entry.user?.id ?? authStore.user?.id ?? null
|
|
form.projectId = entry.project?.id ?? null
|
|
form.tagIds = entry.tags?.map(t => t.id) ?? []
|
|
} else {
|
|
form.title = ''
|
|
form.description = ''
|
|
form.date = props.prefillStartedAt ? toLocalDate(props.prefillStartedAt) : new Date().toISOString().slice(0, 10)
|
|
form.startTime = props.prefillStartedAt ? toLocalTime(props.prefillStartedAt) : ''
|
|
form.endTime = ''
|
|
form.userId = authStore.user?.id ?? null
|
|
form.projectId = null
|
|
form.tagIds = []
|
|
}
|
|
}
|
|
|
|
watch([() => props.modelValue, () => props.entry] as const, ([open, entry]) => {
|
|
if (open) {
|
|
populateForm(entry)
|
|
}
|
|
})
|
|
|
|
async function onDuplicate() {
|
|
if (!form.date || !form.startTime || !form.endTime) return
|
|
|
|
const { create } = useTimeEntryService()
|
|
|
|
const payload: Record<string, unknown> = {
|
|
title: form.title || null,
|
|
description: form.description || null,
|
|
startedAt: toISO(form.date, form.startTime),
|
|
stoppedAt: form.endTime ? toISO(form.date, form.endTime) : null,
|
|
user: `/api/users/${form.userId}`,
|
|
project: form.projectId ? `/api/projects/${form.projectId}` : null,
|
|
tags: form.tagIds.map(id => `/api/task_tags/${id}`),
|
|
}
|
|
|
|
await create(payload as TimeEntryWrite)
|
|
emit('saved')
|
|
isOpen.value = false
|
|
}
|
|
|
|
async function onDelete() {
|
|
if (!props.entry) return
|
|
const { remove } = useTimeEntryService()
|
|
await remove(props.entry.id)
|
|
emit('saved')
|
|
isOpen.value = false
|
|
}
|
|
|
|
async function onSubmit() {
|
|
if (!form.date || !form.startTime || !form.endTime) return
|
|
|
|
const { create, update } = useTimeEntryService()
|
|
|
|
const payload: Record<string, unknown> = {
|
|
title: form.title || null,
|
|
description: form.description || null,
|
|
startedAt: toISO(form.date, form.startTime),
|
|
stoppedAt: form.endTime ? toISO(form.date, form.endTime) : null,
|
|
user: `/api/users/${form.userId}`,
|
|
project: form.projectId ? `/api/projects/${form.projectId}` : null,
|
|
tags: form.tagIds.map(id => `/api/task_tags/${id}`),
|
|
}
|
|
|
|
if (isEditing.value && props.entry) {
|
|
await update(props.entry.id, payload)
|
|
} else {
|
|
await create(payload as TimeEntryWrite)
|
|
}
|
|
|
|
emit('saved')
|
|
isOpen.value = false
|
|
}
|
|
</script>
|