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
209 lines
7.3 KiB
Vue
209 lines
7.3 KiB
Vue
<template>
|
|
<MalioDrawer v-model="isOpen" drawer-class="max-w-lg">
|
|
<template #header>
|
|
<h2 class="text-xl font-bold">{{ $t('timeEntries.exportTitle') }}</h2>
|
|
</template>
|
|
<div class="flex flex-col gap-6 p-4">
|
|
<!-- Period presets -->
|
|
<div>
|
|
<p class="mb-2 text-sm font-semibold text-neutral-700">Période</p>
|
|
<div class="flex flex-col gap-2">
|
|
<MalioRadioButton
|
|
v-model="periodMode"
|
|
name="exportPeriod"
|
|
value="currentMonth"
|
|
:label="$t('timeEntries.exportCurrentMonth')"
|
|
/>
|
|
<MalioRadioButton
|
|
v-model="periodMode"
|
|
name="exportPeriod"
|
|
value="lastMonth"
|
|
:label="$t('timeEntries.exportLastMonth')"
|
|
/>
|
|
<MalioRadioButton
|
|
v-model="periodMode"
|
|
name="exportPeriod"
|
|
value="custom"
|
|
:label="$t('timeEntries.exportCustomPeriod')"
|
|
/>
|
|
</div>
|
|
<div v-if="periodMode === 'custom'" class="mt-3 flex items-center gap-3">
|
|
<div class="flex-1">
|
|
<label class="mb-1 block text-xs text-neutral-500">{{ $t('timeEntries.exportFrom') }}</label>
|
|
<input
|
|
v-model="customFrom"
|
|
type="date"
|
|
class="w-full rounded-md border border-neutral-300 px-3 py-2 text-sm"
|
|
/>
|
|
</div>
|
|
<div class="flex-1">
|
|
<label class="mb-1 block text-xs text-neutral-500">{{ $t('timeEntries.exportTo') }}</label>
|
|
<input
|
|
v-model="customTo"
|
|
type="date"
|
|
class="w-full rounded-md border border-neutral-300 px-3 py-2 text-sm"
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- User filter (admin only) -->
|
|
<div v-if="isAdmin" class="[&>div]:!mt-0">
|
|
<MalioSelectCheckbox
|
|
v-model="selectedUserIds"
|
|
:options="userOptions"
|
|
:label="$t('timeEntries.exportUsers')"
|
|
:display-tag="true"
|
|
:display-select-all="true"
|
|
group-class="!w-full"
|
|
/>
|
|
</div>
|
|
|
|
<!-- Client filter -->
|
|
<div class="[&>div]:!mt-0">
|
|
<MalioSelect
|
|
v-model="selectedClientId"
|
|
:options="clientOptions"
|
|
:label="$t('timeEntries.exportClient')"
|
|
:empty-option-label="$t('timeEntries.exportAllClients')"
|
|
group-class="!w-full"
|
|
/>
|
|
</div>
|
|
|
|
<!-- Project filter -->
|
|
<div class="[&>div]:!mt-0">
|
|
<MalioSelectCheckbox
|
|
v-model="selectedProjectIds"
|
|
:options="filteredProjectOptions"
|
|
:label="$t('timeEntries.exportProjects')"
|
|
:display-tag="true"
|
|
:display-select-all="true"
|
|
group-class="!w-full"
|
|
/>
|
|
</div>
|
|
|
|
<!-- Tag filter -->
|
|
<div class="[&>div]:!mt-0">
|
|
<MalioSelectCheckbox
|
|
v-model="selectedTagIds"
|
|
:options="tagOptions"
|
|
:label="$t('timeEntries.exportTags')"
|
|
:display-tag="true"
|
|
:display-select-all="true"
|
|
group-class="!w-full"
|
|
/>
|
|
</div>
|
|
|
|
<!-- Export button -->
|
|
<MalioButton
|
|
:label="$t('timeEntries.export')"
|
|
icon-name="mdi:download"
|
|
icon-position="left"
|
|
button-class="w-full"
|
|
@click="doExport"
|
|
/>
|
|
</div>
|
|
</MalioDrawer>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
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 type { Client } from '~/modules/directory/services/dto/client'
|
|
|
|
const props = defineProps<{
|
|
users: UserData[]
|
|
projects: Project[]
|
|
tags: TaskTag[]
|
|
clients: Client[]
|
|
}>()
|
|
|
|
const isOpen = defineModel<boolean>({ default: false })
|
|
const emit = defineEmits<{
|
|
(e: 'export', params: {
|
|
after: string
|
|
before: string
|
|
users?: number[]
|
|
projects?: number[]
|
|
client?: number
|
|
tags?: number[]
|
|
}): void
|
|
}>()
|
|
|
|
const authStore = useAuthStore()
|
|
const isAdmin = computed(() => authStore.user?.roles?.includes('ROLE_ADMIN') ?? false)
|
|
|
|
const periodMode = ref<'currentMonth' | 'lastMonth' | 'custom'>('currentMonth')
|
|
const customFrom = ref('')
|
|
const customTo = ref('')
|
|
const selectedUserIds = ref<number[]>([])
|
|
const selectedClientId = ref<number | null>(null)
|
|
const selectedProjectIds = ref<number[]>([])
|
|
const selectedTagIds = ref<number[]>([])
|
|
|
|
const userOptions = computed(() =>
|
|
props.users.map(u => ({ label: u.username, value: u.id }))
|
|
)
|
|
|
|
const clientOptions = computed(() =>
|
|
props.clients.map(c => ({ label: c.name, value: c.id }))
|
|
)
|
|
|
|
const filteredProjectOptions = computed(() => {
|
|
let list = props.projects
|
|
if (selectedClientId.value) {
|
|
list = list.filter(p => p.client?.id === selectedClientId.value)
|
|
}
|
|
return list.map(p => ({ label: p.name, value: p.id }))
|
|
})
|
|
|
|
const tagOptions = computed(() =>
|
|
props.tags.map(t => ({ label: t.label, value: t.id }))
|
|
)
|
|
|
|
// Reset project selection when client changes
|
|
watch(selectedClientId, () => {
|
|
selectedProjectIds.value = []
|
|
})
|
|
|
|
function getDateRange(): { after: string; before: string } {
|
|
const now = new Date()
|
|
if (periodMode.value === 'currentMonth') {
|
|
const first = new Date(now.getFullYear(), now.getMonth(), 1)
|
|
const last = new Date(now.getFullYear(), now.getMonth() + 1, 1)
|
|
return {
|
|
after: first.toISOString().slice(0, 10),
|
|
before: last.toISOString().slice(0, 10),
|
|
}
|
|
}
|
|
if (periodMode.value === 'lastMonth') {
|
|
const first = new Date(now.getFullYear(), now.getMonth() - 1, 1)
|
|
const last = new Date(now.getFullYear(), now.getMonth(), 1)
|
|
return {
|
|
after: first.toISOString().slice(0, 10),
|
|
before: last.toISOString().slice(0, 10),
|
|
}
|
|
}
|
|
return {
|
|
after: customFrom.value,
|
|
before: customTo.value,
|
|
}
|
|
}
|
|
|
|
function doExport() {
|
|
const { after, before } = getDateRange()
|
|
if (!after || !before) return
|
|
|
|
emit('export', {
|
|
after,
|
|
before,
|
|
users: selectedUserIds.value.length ? selectedUserIds.value : undefined,
|
|
projects: selectedProjectIds.value.length ? selectedProjectIds.value : undefined,
|
|
client: selectedClientId.value ?? undefined,
|
|
tags: selectedTagIds.value.length ? selectedTagIds.value : undefined,
|
|
})
|
|
isOpen.value = false
|
|
}
|
|
</script>
|