Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
c18751d
Add Organization, deprecate Enterprise
lecoqlibre Mar 31, 2026
180e0da
Constraint 1:1 for Stock:availabilityDate
lecoqlibre Mar 31, 2026
954578c
Constraint 1:1 for PaymentMethod:paymentMethodProvider and PaymentMet…
lecoqlibre Mar 31, 2026
8c959b6
Add Catalog begin and end date. Change Ellapsable datatype to DateTime.
lecoqlibre Mar 31, 2026
04a426c
Add Vevent and ValueRecur classes
lecoqlibre Apr 2, 2026
4e40ecd
Add Datable, IProductOptionValue, ProductOptionValue
lecoqlibre Apr 7, 2026
9f693c6
Add ProductOption, add missing ProductOptionValue constructor
lecoqlibre Apr 7, 2026
76dbdea
Add VariantCharacteristic
lecoqlibre Apr 7, 2026
0b64a70
Add Variant
lecoqlibre Apr 7, 2026
df92e99
Move isVariantOf to Variant
lecoqlibre Apr 7, 2026
57d7970
Add TemplateSaleSession, add SaleSession missing hosting places
lecoqlibre Apr 7, 2026
d2c1189
Add the Certification class with its data properties
lecoqlibre Apr 11, 2026
110b5f2
Add GeoJSON interfaces
lecoqlibre Apr 16, 2026
c4d7fd4
Add interfaces Step, Shipment, Route
lecoqlibre Apr 16, 2026
dc29803
Add GeoJSON feature to interfaces PhysicalPlace and Route
lecoqlibre Apr 16, 2026
20a528a
Add feature to class PhysicalPlace
lecoqlibre Apr 16, 2026
41c3355
Add class Route
lecoqlibre Apr 16, 2026
c0a0fa5
Add classes Step, DeliveryStep and PickUpStep
lecoqlibre Apr 16, 2026
d9fa268
Fix Step routes properties
lecoqlibre Apr 16, 2026
deb08a7
Fix Step constructors
lecoqlibre Apr 16, 2026
b846dc7
Add customer category membership
lecoqlibre Apr 16, 2026
af9079a
Add referenceProductOptions
lecoqlibre Apr 16, 2026
a062998
Add Variant:variantCharacteristics
lecoqlibre Apr 16, 2026
28f4945
Fix Variant:variantCharacteristics bindings
lecoqlibre Apr 16, 2026
f72afcc
Add referenceProductOptions to Variant constructor
lecoqlibre Apr 16, 2026
d9fd1c0
Complete SUPPORTED.md
lecoqlibre Apr 16, 2026
a3aef38
Fix Certification
lecoqlibre Apr 20, 2026
339ca15
Removed Enterprise
lecoqlibre Apr 28, 2026
2a03a38
Fix Agent setters for localizations and phone numbers
lecoqlibre Apr 28, 2026
e03355b
Fix ILocalizedProduct consumptionFlow -> localConsumptionFlow
lecoqlibre Apr 29, 2026
821d8fa
Exhibitable now has adder and remover, image -> images
lecoqlibre Apr 29, 2026
83b16d8
LocalizedProduct is now Exhibitable
lecoqlibre Apr 29, 2026
4c25a69
DefinedProduct and subclasses are now Exhibitable_
lecoqlibre Apr 29, 2026
6037237
Fix Order paymentMethod
lecoqlibre Apr 29, 2026
df45cd4
Add certifications param in Organization constructor, fix missing sem…
lecoqlibre Apr 29, 2026
d4cf91f
Fix PlannedLocalTransformation bad outcome and associated constructor…
lecoqlibre Apr 29, 2026
687f131
Fix RealStock quantity (remove Quantifiable)
lecoqlibre Apr 29, 2026
fa8bf74
Add SuppliedProduct referenceOf
lecoqlibre Apr 29, 2026
ea91adb
Add TechnicalProduct referenceProductOptions
lecoqlibre Apr 29, 2026
24ddd28
Fix Variant missing constructor parameter types, add semantic stereot…
lecoqlibre Apr 29, 2026
ca28252
Fix DefinedProduct referenceProductOption type, add missing semantic …
lecoqlibre Apr 29, 2026
5f8d494
Fix DeliveryOption wrong interface realization
lecoqlibre Apr 29, 2026
0622fd0
Fix LocalizedProduct quantity getter and setter
lecoqlibre Apr 29, 2026
a0ebad1
Fix Agent customerCategoriesMembership and Organization constructor
lecoqlibre Apr 29, 2026
21fbe83
Fix PaymentMethod price getter and setter
lecoqlibre Apr 29, 2026
9d68702
Fix PhysicalPlace, add semantic stereotype to IGeoJsonFeature
lecoqlibre Apr 29, 2026
d721427
Fix PhysicalProduct quantity and images properties
lecoqlibre Apr 30, 2026
9eb984f
Fix PlannedLocalConsumptionFlow wrong method bindings
lecoqlibre Apr 30, 2026
e7e6e5a
Fix PlannedLocalProductionFlow wrong method bindings
lecoqlibre Apr 30, 2026
e66ddf1
Fix ProductBatch wrong method bindings
lecoqlibre Apr 30, 2026
39ea71f
Fix RealizedConsumptionFlow wrong method bindings
lecoqlibre Apr 30, 2026
2d3e243
Fix RealizedProductionFlow wrong method bindings
lecoqlibre Apr 30, 2026
62efb6a
Fix RealizedTransformation wrong method bindings
lecoqlibre Apr 30, 2026
ea04c56
Add semantic stereotype to IStep, IShipment, IRoute
lecoqlibre Apr 30, 2026
a7603e8
Fix TemplateSaleSession missing date property
lecoqlibre Apr 30, 2026
e63964b
Fix VEvent wrong method binding and wrong URIs bindings
lecoqlibre Apr 30, 2026
261cb4a
Rename incomeOf, outcomeOf, hasIncome, hasOutcome
lecoqlibre May 5, 2026
bf14485
Merge v3.2.0
lecoqlibre May 5, 2026
21ea076
Merge 3.2.1
lecoqlibre May 5, 2026
3cc11d9
Merge 3.3.0 and 3.4.0
lecoqlibre Jun 10, 2026
56d1205
Keep changelog to v4.0.0
lecoqlibre Jun 10, 2026
9d2fa04
Fix Catalog:removeMaintainer and Catalog:setMaintainers wrong type (B…
lecoqlibre Jun 11, 2026
a3ce8b1
Merge 3.5.0
lecoqlibre Jun 15, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,28 @@ TODO:
- Create top classes `Subject` and `Relation` to be generalized by all DFC subjects and relations.
- Rename IQuantity to IQuantitativeValue (**Breaking change**).

## [4.0.0] - 2026-06-10

This major version implements the ontology version 2 changes. It introduces several breaking changes in the generated code.

### Added

- `SuppliedProduct:constructor` variants parameter
- `TechnicalProduct:constructor` variants parameter

### Changed

- Domain : isVariantOf, DefinedProduct -> Variant (**BREAKING CHANGE**)
- Constraint 1:1 for Stock:availabilityDate (**BREAKING CHANGE**)
- Constraint 1:1 for PaymentMethod:paymentMethodProvider (**BREAKING CHANGE**)
- Constraint 1:1 for PaymentMethod:paymentMethodType (**BREAKING CHANGE**)
- Domain : beginDate, (AsPlannedLocalTransformation | AsRealizedTransformation | SaleSession | Shipment | Shipping option) -> (AsPlannedTransformation | AsRealizedTransformation | Catalog | SaleSession | Shipment | Shipping option)
- Domain : endDate, (AsPlannedLocalTransformation | AsRealizedTransformation | SaleSession | Shipment | Shipping option) -> (AsPlannedTransformation | AsRealizedTransformation | Catalog | SaleSession | Shipment | Shipping option)

### Removed

- The `Enterprise` class has been replaced by `Organization` (**BREAKING CHANGE**).

## [3.5.0] - 2026-06-15

### Added
Expand Down Expand Up @@ -464,7 +486,8 @@ Classes:
- sale.uml
- skos.uml

[unreleased]: https://github.com/datafoodconsortium/data-model-uml/compare/v3.5.0...HEAD
[unreleased]: https://github.com/datafoodconsortium/data-model-uml/compare/v4.0.0...HEAD
[4.0.0]: https://github.com/datafoodconsortium/data-model-uml/compare/v3.5.0...v4.0.0
[3.5.0]: https://github.com/datafoodconsortium/data-model-uml/compare/v3.4.0...v3.5.0
[3.4.0]: https://github.com/datafoodconsortium/data-model-uml/compare/v3.3.0...v3.4.0
[3.3.0]: https://github.com/datafoodconsortium/data-model-uml/compare/v3.2.1...v3.3.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ To edit these `.uml` files you can use Eclipse with the `Eclipse Modeling Tools`
## Overview

The model is divided into several files containing concepts:
- agent.uml: `Agent`, `Enterprise`, `Person` and `CustomerCategory`.
- agent.uml: `Agent`, `Organization`, `Person` and `CustomerCategory`.
- common.uml: `Address`, `QuantitativeValue`, measures and facets objects.
- connector.uml: the main package that contains all the others.
- product.uml: `DefinedProduct` and `SuppliedProduct`.
Expand Down
155 changes: 111 additions & 44 deletions SUPPORTED.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@ Here is a list of the DFC features that the model currently supports.
- [x] offeredThrough
- [x] listedIn
- [ ] managedBy
- `Certification`
- [x] certiferReference
- [x] certificationScore
- [x] certifies
- [x] operatorId
- `Coordination`
- [ ] date
- [ ] coordinates
Expand All @@ -101,6 +106,7 @@ Here is a list of the DFC features that the model currently supports.
- [x] description
- [ ] date
- [ ] definedBy
- [x] hasMember
- `DeliveryOption`
- [x] name
- [x] description
Expand All @@ -115,52 +121,29 @@ Here is a list of the DFC features that the model currently supports.
- [x] endDate
- [x] fee
- [x] selectedBy
- `Enterprise`
- [ ] name
- [x] description
- [ ] date
- [x] hasAddress
- [x] hasPhoneNumber
- [x] hasSocialMedia
- [x] logo
- [ ] orders
- [ ] requests
- [ ] owns
- [x] email
- [x] websitePage
- [x] VATnumber
- [x] defines
- [x] hasMainContact
- [x] supplies
- [x] manages
- [x] proposes
- [ ] transforms
- [x] maintains
- [ ] affiliates
- [ ] coordinatedBy
- `FunctionalProduct`
- [x] name
- [x] description
- [ ] name
- [ ] description
- [ ] date
- [x] hasType
- [x] hasQuantity
- [x] alcoholPercentage
- [x] lifetime
- [x] hasClaim
- [x] usageOrStorageConditions
- [x] hasAllergenCharacteristic
- [x] hasNutrientCharacteristic
- [x] hasPhysicalCharacteristic
- [x] hasGeographicalOrigin
- [x] hasCertifications
- [x] hasNatureOrigin
- [x] hasPartOrigin
- [ ] hasType
- [ ] hasQuantity
- [ ] alcoholPercentage
- [ ] lifetime
- [ ] hasClaim
- [ ] usageOrStorageConditions
- [ ] hasAllergenCharacteristic
- [ ] hasNutrientCharacteristic
- [ ] hasPhysicalCharacteristic
- [ ] hasGeographicalOrigin
- [ ] hasCertifications
- [ ] hasNatureOrigin
- [ ] hasPartOrigin
- [ ] hasBrand
- [ ] hasProcess
- [x] hasVariant
- [x] isVariantOf
- [x] image
- [x] referencedBy
- [ ] hasVariant
- [ ] isVariantOf
- [ ] image
- [ ] referencedBy
- [ ] consumedBy
- [ ] referenceOf
- [ ] requestedBy
Expand Down Expand Up @@ -214,6 +197,32 @@ Here is a list of the DFC features that the model currently supports.
- [x] hasPrice
- [x] concerns
- [x] partOf
- `Organization`
- [ ] name
- [x] description
- [ ] date
- [x] hasAddress
- [x] hasPhoneNumber
- [x] hasSocialMedia
- [x] hasTemplateSaleSession
- [x] isCertifiedBy
- [x] isMemberOf
- [x] logo
- [ ] orders
- [ ] requests
- [ ] owns
- [x] email
- [x] websitePage
- [x] VATnumber
- [x] defines
- [x] hasMainContact
- [x] supplies
- [x] manages
- [x] proposes
- [ ] transforms
- [x] maintains
- [ ] affiliates
- [ ] coordinatedBy
- `PaymentMethod`
- [x] name
- [x] description
Expand All @@ -229,6 +238,7 @@ Here is a list of the DFC features that the model currently supports.
- [x] hasAddress
- [x] hasPhoneNumber
- [x] hasSocialMedia
- [x] isMemberOf
- [x] logo
- [ ] orders
- [ ] requests
Expand All @@ -254,6 +264,7 @@ Here is a list of the DFC features that the model currently supports.
- [ ] date
- [x] hosts
- [x] hasAddress
- [x] hasGeoJsonFeature
- [x] hasPhoneNumber
- [x] hasMainContact
- `PhysicalProduct`
Expand Down Expand Up @@ -297,6 +308,11 @@ Here is a list of the DFC features that the model currently supports.
- [x] bestBeforeDate
- [x] expirationDate
- [x] productionDate
- `ProductOption`
- [x] name
- [x] description
- [x] date
- [x] hasReferenceProductOptionValue
- `QuantitativeValue`
- [x] hasUnit
- [x] value
Expand All @@ -307,10 +323,16 @@ Here is a list of the DFC features that the model currently supports.
- [x] isStoredIn
- [x] identifies
- [x] constitutes
- `Route`
- [x] description
- [x] hasGeoJsonFeature
- [x] hasStep
- [x] name
- `SaleSession`
- [ ] date
- [x] beginDate
- [x] endDate
- [x] hostedAt
- [x] quantity
- [x] lists
- `Shipment`
Expand All @@ -326,6 +348,17 @@ Here is a list of the DFC features that the model currently supports.
- [ ] description
- [ ] date
- [x] URL
- `Step`
- [x] arrivalDate
- [ ] date
- [x] delivery
- [x] description
- [x] duration
- [x] isStepOf
- [x] name
- [x] pickUp
- [ ] usedInRoute
- [ ] useVehicle
- `SuppliedProduct`
- [x] name
- [x] description
Expand All @@ -343,6 +376,7 @@ Here is a list of the DFC features that the model currently supports.
- [x] hasCertifications
- [x] hasNatureOrigin
- [x] hasPartOrigin
- [x] hasReferenceProductOption
- [ ] hasBrand
- [ ] hasProcess
- [x] hasVariant
Expand All @@ -369,16 +403,20 @@ Here is a list of the DFC features that the model currently supports.
- [x] hasCertifications
- [x] hasNatureOrigin
- [x] hasPartOrigin
- [x] hasReferenceProductOption
- [ ] hasBrand
- [ ] hasProcess
- [x] hasVariant
- [x] isVariantOf
- [x] image
- [x] referencedBy
- [ ] consumedBy
- [ ] referenceOf
- [x] referenceOf
- [ ] satisfies
- [ ] industrializedBy
- `TemplateSaleSession`
- [x] isTemplateSaleSessionOf
- [x] hostedAt
- `TheoreticalStock`
- [ ] date
- [x] availabilityDate
Expand All @@ -394,6 +432,35 @@ Here is a list of the DFC features that the model currently supports.
- [ ] from
- [ ] to
- [ ] concerns
- `Variant`
- [x] name
- [x] description
- [ ] date
- [x] hasType
- [x] hasQuantity
- [x] alcoholPercentage
- [x] lifetime
- [x] hasClaim
- [x] usageOrStorageConditions
- [x] hasAllergenCharacteristic
- [x] hasNutrientCharacteristic
- [x] hasPhysicalCharacteristic
- [x] hasGeographicalOrigin
- [x] hasCertifications
- [x] hasNatureOrigin
- [x] hasPartOrigin
- [x] hasReferenceProductOption
- [x] hasVariant
- [x] hasVariantCaracteristic (with typo)
- [x] isVariantOf
- [x] image
- [x] referencedBy
- `VariantCharacteristic`
- [x] name
- [x] description
- [ ] date
- [x] hasProductOption
- [x] hasProductOptionValue
- `Vehicle`
- [ ] name
- [ ] description
Expand All @@ -410,4 +477,4 @@ Here is a list of the DFC features that the model currently supports.
- [ ] date
- [x] hosts
- [x] URL
- [ ] websitePage
- [ ] websitePage
Loading