Project

General

Profile

Actions

Feature #388

open
NP NP

Admin: bring feat/canteen-diet-type-master current with dev (Part 1 of HR Dietetics workflow)

Feature #388: Admin: bring feat/canteen-diet-type-master current with dev (Part 1 of HR Dietetics workflow)

Added by Navya P. 30 days ago. Updated 30 days ago.

Status:
Resolved
Priority:
Normal
Assignee:
Target version:
-
Start date:
10/14/2026
Due date:
% Done:

0%

Estimated time:
Resolved By:

Description

Part 1 of the Dietetics/Nutrition workflow (HR adds diet types -> visible to IPD doctor -> order updates IPD billing -> shows in Canteen). ADR-0002 already recommends Admin own the diet-type master; a real draft (DietType entity, migration, DietTypeService CRUD, GetDietTypesAsync contract read) already existed on feat/canteen-diet-type-master (commit 99acc070, 2026-10-06) but was 381 commits stale and never finished. Brought current with devg: merged origin/dev (5 real conflicts, all additive constructor-param collisions between this branches IDietTypeService and devs own new IPaymentMerchantService -- resolved by keeping both). Also found and fixed an unrelated pre-existing gap the merge surfaced: dev commit 385f3627 (PregnancySafety on the drug contract) was written against an unpublished kernel field that was never actually added to nuvita-shared-kernel -- added the missing PregnancySafety property to AdminDrugContractDto (additive, non-breaking) and fixed one more stale test constructor call. Admin unit suite 3499/3499 green (source mode, since the PregnancySafety field is not yet in the published kernel package -- same posture the original authors own commit already documented).

NP Updated by Navya P. 30 days ago Actions #1

  • Assignee set to Navya P.

NP Updated by Navya P. 30 days ago Actions #2

  • Status changed from New to Resolved
  • Resolved By set to Navya P.
Actions

Also available in: PDF Atom