Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AUTO] Local auto nomenclature & MDD update collection #9

Merged
merged 77 commits into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
a8c0fb3
[23.12.14 19:09] Model auto-generation
romainfd Dec 14, 2023
3685625
⚙️ Auto-génération des classes et des specs
romainfd Dec 14, 2023
c897ed0
[23.12.15 09:30] Model auto-generation
romainfd Dec 15, 2023
4dd45e9
⚙️ Auto-génération des classes et des specs
romainfd Dec 15, 2023
9024229
[23.12.21 18:46] Model auto-generation
romainfd Dec 21, 2023
f3cbf4d
[23.12.21 18:50] Model auto-generation
romainfd Dec 21, 2023
651139a
Merge
romainfd Jan 5, 2024
38d936b
Latest model
romainfd Jan 5, 2024
06108a1
⚙️ Auto-génération des classes et des specs
romainfd Jan 5, 2024
c7618dd
Delete nomenclature_parser/cron.log
romainfd Jan 5, 2024
5b8db5e
⚙️ Auto-génération des classes et des specs
romainfd Jan 5, 2024
1d03406
Corrected nomenclature parser
romainfd Jan 5, 2024
099e8cf
⚙️ Auto-génération des classes et des specs
romainfd Jan 5, 2024
1d555d7
RS-EDA
romainfd Jan 5, 2024
cd91995
⚙️ Auto-génération des classes et des specs
romainfd Jan 5, 2024
87b16b1
[24.01.08 15:30] Model auto-generation
romainfd Jan 8, 2024
dba53a4
⚙️ Auto-génération des classes et des specs
romainfd Jan 8, 2024
acb2359
[24.01.08 17:30] Model auto-generation
romainfd Jan 8, 2024
cf2f84c
⚙️ Auto-génération des classes et des specs
romainfd Jan 8, 2024
54b9d12
[24.01.09 10:00] Model auto-generation
romainfd Jan 9, 2024
673b5bd
⚙️ Auto-génération des classes et des specs
romainfd Jan 9, 2024
a19f3ec
[24.01.09 10:05] Model auto-generation
romainfd Jan 9, 2024
eb11fa6
[24.01.09 10:06] Model auto-generation
romainfd Jan 9, 2024
fc4abea
⚙️ Auto-génération des classes et des specs
romainfd Jan 9, 2024
93ea3e2
[24.01.09 10:23] Model auto-generation
romainfd Jan 9, 2024
ec6ac91
⚙️ Auto-génération des classes et des specs
romainfd Jan 9, 2024
7b69255
Removing rs/, fixing calltakeContact type, fixing RESOURCE_ID to list
romainfd Jan 9, 2024
7ca279a
Merge branch 'main' into auto/model_tracker
romainfd Jan 9, 2024
96c400c
⚙️ Auto-génération des classes et des specs
romainfd Jan 9, 2024
6d7e15a
Adding test report on failure
romainfd Jan 9, 2024
084e276
⚙️ Auto-génération des classes et des specs
romainfd Jan 9, 2024
93b4854
[24.01.09 11:30] Model auto-generation
romainfd Jan 9, 2024
a1a3dcf
Fixing model cp
romainfd Jan 9, 2024
f5c0da8
⚙️ Auto-génération des classes et des specs
romainfd Jan 9, 2024
858cfcd
Increasing gradle test log level to have clearer error message
romainfd Jan 9, 2024
3de6331
⚙️ Auto-génération des classes et des specs
romainfd Jan 9, 2024
0aac945
Reverting incorrect RESOURCE_ID
romainfd Jan 9, 2024
4e9028f
⚙️ Auto-génération des classes et des specs
romainfd Jan 9, 2024
c6d31c6
[24.01.09 15:31] Model auto-generation
romainfd Jan 9, 2024
27254fd
[24.01.09 17:42] Model auto-generation
romainfd Jan 9, 2024
e4b0b70
[24.01.09 17:44] Model auto-generation
romainfd Jan 9, 2024
c27cc1b
Adding rebase to get auto-commits before adding new things
romainfd Jan 9, 2024
2672130
⚙️ Auto-génération des classes et des specs
romainfd Jan 9, 2024
da32284
Update RS-EDA-usecase-PartageDossier-1.json
efalcioni Jan 10, 2024
ba1b40e
Fixing UML generator to clear context for each run
romainfd Jan 10, 2024
7aba433
⚙️ Auto-génération des classes et des specs
romainfd Jan 10, 2024
c9bef1c
Add files via upload
efalcioni Jan 10, 2024
9a2f2e3
Delete nomenclature_parser/cron.log
romainfd Jan 10, 2024
380bd8b
Merge branch 'auto/model_tracker' into efalcioni-1515-patch-2
romainfd Jan 10, 2024
3ec2479
Merge pull request #22 from ansforge/efalcioni-1515-patch-2
romainfd Jan 10, 2024
4d68dfa
merge from auto
bou3108 Jan 10, 2024
f6d9cd8
Revert "merge from auto"
bou3108 Jan 10, 2024
01b3c0b
Merge branch 'main' into auto/model_tracker
bou3108 Jan 10, 2024
0739f0d
resolve conflicts
bou3108 Jan 10, 2024
09ee65d
⚙️ Auto-génération des classes et des specs
bou3108 Jan 10, 2024
2611333
fix csv_parser
bou3108 Jan 10, 2024
6e01d3d
resolve conflicts
bou3108 Jan 11, 2024
100e093
⚙️ Auto-génération des classes et des specs
bou3108 Jan 11, 2024
3a08c45
resolve conflicts
bou3108 Jan 11, 2024
8b5bde0
⚙️ Auto-génération des classes et des specs
bou3108 Jan 11, 2024
76dbe44
add root prefix for createCase
bou3108 Jan 11, 2024
cfac6a6
⚙️ Auto-génération des classes et des specs
bou3108 Jan 11, 2024
da20dc0
fix tests
bou3108 Jan 11, 2024
7375ad1
⚙️ Auto-génération des classes et des specs
bou3108 Jan 11, 2024
5b84e9b
invert logic
bou3108 Jan 11, 2024
5c752fd
Merge remote-tracking branch 'origin/fix/change-root-prefix' into fix…
bou3108 Jan 11, 2024
f89c99d
⚙️ Auto-génération des classes et des specs
bou3108 Jan 11, 2024
c676bce
invert logic
bou3108 Jan 11, 2024
6659bfa
⚙️ Auto-génération des classes et des specs
bou3108 Jan 11, 2024
ddf2d19
move additionalProperties inside children definition, not in root
bou3108 Jan 11, 2024
de10e3b
⚙️ Auto-génération des classes et des specs
bou3108 Jan 11, 2024
26c79d2
add missing import in generator template
bou3108 Jan 11, 2024
a7e20d9
⚙️ Auto-génération des classes et des specs
bou3108 Jan 11, 2024
556bc81
rm JsonIgnoreProperties annotation
bou3108 Jan 12, 2024
f40d157
⚙️ Auto-génération des classes et des specs
bou3108 Jan 12, 2024
b211e4e
Merge pull request #24 from ansforge/fix/change-root-prefix
bou3108 Jan 12, 2024
23506c5
⚙️ Auto-génération des classes et des specs
bou3108 Jan 12, 2024
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
12 changes: 10 additions & 2 deletions .github/workflows/generate-model.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,16 @@ jobs:
commit_message: ⚙️ Auto-génération des classes et des specs

- name: Build and run tests
run: ./gradlew test

run: ./gradlew test --info
bou3108 marked this conversation as resolved.
Show resolved Hide resolved

# Ref.: https://github.com/gradle/gradle-build-action/issues/619#issuecomment-1453244157
- name: Upload test report
if: failure()
uses: actions/upload-artifact@v4
with:
name: test-report
path: build/reports/tests/test/**

bou3108 marked this conversation as resolved.
Show resolved Hide resolved
- name: Add coverage to PR
id: jacoco
uses: madrapps/jacoco-report@v1.3
Expand Down
2 changes: 1 addition & 1 deletion csv_parser/auto.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ run() {
echo "[$DATE] Running script..." | tee -a "$LOG_FILE"
echo "Checking out tracking branch ($TRACKING_BRANCH_NAME), copying files and committing changes..."
git checkout "$TRACKING_BRANCH_NAME"
git pull
git pull --rebase
bou3108 marked this conversation as resolved.
Show resolved Hide resolved
setup
git add ..
nomenclatures
Expand Down
6 changes: 6 additions & 0 deletions csv_parser/csv_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ def get_nomenclature(elem):
# Schema name is in name = RC-EDA (or RS-EDA) for instance
MODEL_NAME = params['modelName'] # CreateCase
MODEL_TYPE = MODEL_NAME[0].lower() + MODEL_NAME[1:] # createCase
def isCreateCase():
return MODEL_TYPE == "createCase"

if not filter and isCreateCase():
MODEL_TYPE = "createCaseHealth"
WRAPPER_NAME = f"{MODEL_TYPE}Wrapper" # createCaseWrapper
NB_ROWS = params['rows']
NB_COLS = params['cols']
Expand Down Expand Up @@ -415,6 +420,7 @@ def add_object_child_definition(parent, child, definitions):
'x-health-only': child['is_health_only'],
'required': [],
'properties': {},
'additionalProperties': False,
'example': parentExamplePath + '/' + child['name'] + ('/0' if is_array(child) else '')
}
if child['Cardinalité'].startswith('1'):
Expand Down
1,616 changes: 1,588 additions & 28 deletions csv_parser/json_schema2xsd/src/main/resources/EMSI.schema.json

Large diffs are not rendered by default.

Loading