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

Fix/obs unit db ids #72

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
fda28db
Remove deprecated dependencies
cpommier Jun 7, 2024
a4d3a5b
Base64 encoding for DbId fields of other document types within observ…
nlakmouri Jun 21, 2024
5e66cb0
Encoding all concerned DbId to base64 in observationUnit documents us…
nlakmouri Jun 21, 2024
a0eb311
correcting some typing errors. fix GNP-6529
nlakmouri Jun 24, 2024
11ea9db
Update datadiscovery_cards.py
nlakmouri Jun 24, 2024
9d7ff88
The observationVariableDbId is not ebase64 encoded anymore. fix GNP-6542
nlakmouri Jul 9, 2024
04a2c8b
Handle DbId to not be encoded when their names are none or empty. fi…
nlakmouri Jul 9, 2024
9608eb3
Change the _handle_DbId_URI method. fix GNP-6529
nlakmouri Jul 16, 2024
974ea13
Merge branch 'fix/obsUnit-DbIds' of github.com:elixir-europe/plant-br…
nlakmouri Jul 16, 2024
394b30b
Forcing to Python 3.12
cpommier Jul 16, 2024
67208bd
Correcting integration tests
cpommier Jul 16, 2024
fa02ff0
Correcting integration tests
cpommier Jul 16, 2024
3da7f03
Change test_basic_function
nlakmouri Jul 16, 2024
2a64a03
Change test_basic_mapping
nlakmouri Jul 16, 2024
858e6ed
Change test_season_transform
nlakmouri Jul 16, 2024
be728aa
Change test_germplasmName_transform
nlakmouri Jul 16, 2024
3a1da00
Merge pull request #73 from elixir-europe/feat/upgradeToPython3.12
nlakmouri Jul 16, 2024
6519459
Handling PHIS generating JSON and not JSON lines
cpommier Jul 20, 2024
7897c68
Handling study URL, needed from studyCards
cpommier Jul 20, 2024
a35bd63
Add the make_hashable method to resolve unhashable type error
nlakmouri Jul 31, 2024
baba4a6
Merge pull request #74 from elixir-europe/feat/upgradeToPython3.12
nlakmouri Jul 31, 2024
c68e99e
Add unit tests for observationUnit documents. Fix GNP-6543
nlakmouri Aug 1, 2024
5acddb1
Correct the expected study document for tests: add the url item
nlakmouri Aug 2, 2024
6cfea97
Enhance observationUnit unit tests: sort JSON lists before comparing …
nlakmouri Aug 12, 2024
0457b83
Comment the _handle_DbId_URI method
nlakmouri Aug 16, 2024
9815c3b
Rectify the name of the expected ZIP file for the observation_unit test.
nlakmouri Aug 16, 2024
7ed5b4a
Merge pull request #75 from elixir-europe/feat/upgradeToPython3.12
nlakmouri Aug 16, 2024
d23b9e0
Cleaning obsolete code and removing corresponding tests.
cpommier Nov 8, 2024
91a6aab
transform germplasm synonyms and institute
nlakmouri Nov 29, 2024
e8897a0
Correct typo in transform institute method name
nlakmouri Dec 3, 2024
39ec3b1
Merge pull request #76 from elixir-europe/fix/synonymsV2Mapping
nlakmouri Dec 3, 2024
0b4b988
Better handling of JSON to JSONL conversion by adding 'brapi:static-f…
nlakmouri Dec 18, 2024
efb0290
Merge pull request #77 from elixir-europe/fix/synonymsV2Mapping
nlakmouri Jan 7, 2025
bc08c08
Comment make_hashable() method and add SynonymsV2 to datadiscovery. F…
nlakmouri Jan 9, 2025
18fcd0d
Merge pull request #78 from elixir-europe/fix/synonymsV2Mapping
nlakmouri Jan 9, 2025
57ce58e
Merge pull request #79 from elixir-europe/fix/germplasmMapping
nlakmouri Jan 9, 2025
f91d9c4
Fix VIB source json to include brapi:static-file-type field
nlakmouri Jan 14, 2025
4fcb951
Fix etl tests
nlakmouri Jan 17, 2025
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
Prev Previous commit
Next Next commit
Change test_basic_function
nlakmouri committed Jul 16, 2024
commit 3da7f03c05e1937e491a509389d49f984731b218
4 changes: 2 additions & 2 deletions tests/transform/test_transform_cards.py
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
from etl.transform.transform_cards import do_card_transform

data_0 = {"refURIs": [1, 2, 3, '4', 5], "studyDbId": "1234", "foo": [1, 2, 3], "name": "thisIsAStudyName",
"genus": "Zea", "species": "mays", "falseField": False, "studyTypeName": "gnomic"}
"genus": "Zea", "species": "mays", "falseField": False, "studyTypeName": "gnomic", "@type":"study"}
data_1 = {"a": "a", "genus": "Zea", "species": "Zea mays", "name": "thisIsNotAStudy"}
data_2 = {"a": "b", "g": {"genus": "Populus"}}
data_3 = {"a": "b", "g": {"genus": "Triticum", "species": "Triticum aestivum"}}
@@ -39,7 +39,7 @@ def test_basic_mapping(self):

def test_basic_function(self):
actual = do_card_transform(data_0)
expected = {"genusSpecies": "Zea mays", "refURIs": [1, 2, 3, '4', 5], "foo": [1, 2, 3], "genus": "Zea",
expected = {"@type": "study", "genusSpecies": "Zea mays", "name": "thisIsAStudyName", "refURIs": [1, 2, 3, '4', 5], "schema:name": "thisIsAStudyName", "foo": [1, 2, 3], "genus": "Zea",
"species": "mays",
"falseField": False, "studyTypeName": "gnomic",
"studyDbId": "1234",'studyName': 'thisIsAStudyName'}