Skip to content

Commit 7136271

Browse files
authored
Changed generated for generate tense (#156)
* Changed generated for generate tense * Fix test excel files
1 parent 97cbc65 commit 7136271

25 files changed

+32
-32
lines changed

bam_masterdata/checker/source_loader.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ def entities_to_json(self):
107107
transformed_entity["defs"]["generated_code_prefix"] = (
108108
entity_data.get("generatedCodePrefix")
109109
)
110-
transformed_entity["defs"]["auto_generated_codes"] = (
111-
entity_data.get("autoGeneratedCode")
110+
transformed_entity["defs"]["auto_generate_codes"] = entity_data.get(
111+
"autoGeneratedCode"
112112
)
113113

114114
# Convert properties from dict to list

bam_masterdata/checker/validation_rules/all_validation_rules.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"pattern": "^[A-Za-z0-9_\\.]+$",
1111
"allow_empty": true
1212
},
13-
"auto_generated_codes": {
13+
"auto_generate_codes": {
1414
"is_bool": true
1515
},
1616
"main_dataset_pattern": {

bam_masterdata/checker/validation_rules/excel_validation_rules.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"pattern": ".*",
1313
"extra_validation": "is_reduced_version"
1414
},
15-
"Auto generated codes": {"key": "autoGeneratedCode", "pattern": null, "is_bool": true}
15+
"Auto generate codes": {"key": "autoGeneratedCode", "pattern": null, "is_bool": true}
1616
},
1717
"OBJECT_TYPE": {
1818
"Code": {"key": "code", "pattern": "^\\$?[A-Za-z0-9_.-]+$"},
@@ -27,7 +27,7 @@
2727
"pattern": ".*",
2828
"extra_validation": "is_reduced_version"
2929
},
30-
"Auto generated codes": {"key": "autoGeneratedCode", "pattern": null, "is_bool": true}
30+
"Auto generate codes": {"key": "autoGeneratedCode", "pattern": null, "is_bool": true}
3131
},
3232
"EXPERIMENT_TYPE": {
3333
"Code": {"key": "code", "pattern": "^\\$?[A-Za-z0-9_.-]+$"},

bam_masterdata/checker/validation_rules/validation_rules.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"pattern": ".*",
2525
"allow_empty": true
2626
},
27-
"auto_generated_codes": {
27+
"auto_generate_codes": {
2828
"is_bool": true
2929
},
3030
"url_template": {

bam_masterdata/cli/entities_to_rdf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ def entities_to_rdf(
173173
# parents defined from `code`
174174
# assigned properties can be Mandatory or Optional, can be PropertyType or ObjectType
175175
# ? For OBJECT TYPES
176-
# ? `generated_code_prefix`, `auto_generated_codes`?
176+
# ? `generated_code_prefix`, `auto_generate_codes`?
177177
for name, obj in inspect.getmembers(module, inspect.isclass):
178178
# Ensure the class has the `model_to_rdf` method
179179
if not hasattr(obj, "defs") or not callable(getattr(obj, "model_to_rdf")):

bam_masterdata/metadata/_maps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"description": "description",
2424
"validation_script": "validationPlugin",
2525
"generated_code_prefix": "generatedCodePrefix",
26-
"auto_generated_codes": "autoGeneratedCodes",
26+
"auto_generate_codes": "autoGeneratedCodes",
2727
}
2828

2929
VOCABULARY_TYPE_MAP = {

bam_masterdata/metadata/definitions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ class RawData(BaseModel):
246246

247247
class ObjectTypeDef(BaseObjectTypeDef):
248248
"""
249-
Definition class for an object type. It adds the fields of `generated_code_prefix`, `auto_generated_codes`,
249+
Definition class for an object type. It adds the fields of `generated_code_prefix`, `auto_generate_codes`,
250250
and `validation_script` to the common attributes of a base object type definition. E.g.:
251251
252252
```python
@@ -269,7 +269,7 @@ class Instrument(BaseModel):
269269
""",
270270
)
271271

272-
auto_generated_codes: bool = Field(
272+
auto_generate_codes: bool = Field(
273273
True,
274274
description="""
275275
Boolean used to generate codes using `generated_code_prefix` plus a unique number. Set to

bam_masterdata/metadata/entities.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ def _add_properties_rdf(
421421
# parents defined from `code`
422422
# assigned properties can be Mandatory or Optional, can be PropertyType or ObjectType
423423
# ? For OBJECT TYPES
424-
# ? `generated_code_prefix`, `auto_generated_codes`?
424+
# ? `generated_code_prefix`, `auto_generate_codes`?
425425
@no_type_check
426426
def model_to_rdf(
427427
self, namespace: "Namespace", graph: "Graph", logger: "BoundLoggerLazyProxy"
@@ -557,7 +557,7 @@ def create_type(openbis: "Openbis", defs: ObjectTypeDef):
557557
description=defs.description,
558558
validationPlugin=defs.validation_script,
559559
generatedCodePrefix=defs.generated_code_prefix,
560-
autoGeneratedCode=defs.auto_generated_codes,
560+
autoGeneratedCode=defs.auto_generate_codes,
561561
)
562562

563563
super()._to_openbis(

tests/checker/test_source_loader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ def expected_transformed_data():
178178
"id": "Action",
179179
"validation_script": None,
180180
"generated_code_prefix": "ACT",
181-
"auto_generated_codes": True,
181+
"auto_generate_codes": True,
182182
},
183183
}
184184
},

tests/cli/test_entities_to_excel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"Description",
2525
"Validation script",
2626
"Generated code prefix",
27-
"Auto generated codes",
27+
"Auto generate codes",
2828
],
2929
),
3030
(

0 commit comments

Comments
 (0)