ITS ApId should be an int

microbiomedata · Dec 9, 2024 · b32d0ba · b32d0ba
1 parent bd6aae4
commit b32d0ba
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/nmdc_automation/jgi_file_staging/models.py b/nmdc_automation/jgi_file_staging/models.py
@@ -6,7 +6,7 @@
 class Sample(BaseModel):
     apGoldId: str
     studyId: str
-    itsApId: str
+    itsApId: int
     projects: str
     biosample_id: str
     seq_id: str

diff --git a/tests/test_jgi_file_staging/fixtures/grow_analysis_projects.csv b/tests/test_jgi_file_staging/fixtures/grow_analysis_projects.csv
@@ -1,11 +1,11 @@
 apGoldId,studyId,itsApId,projects,biosample_id,seq_id,file_name,file_status,file_size,jdp_file_id,md5sum,analysis_project_id
-Ga0499978,Gs0149396,a1323348,['Gp0587070'],Gb0305643,s1323445,52614.1.394702.GCACTAAC-CCAAGACT.filtered-report.txt,RESTORED,3645,6190d7d30de2fc3298da6f7a,fcd87248b5922a8bd0d530bcb23bffae,p1323348
-Ga0499978,Gs0149396,a1323348,['Gp0587070'],Gb0305643,s1323445,52614.1.394702.GCACTAAC-CCAAGACT.filter_cmd-METAGENOME.sh,RESTORED,6151,6190d7d30de2fc3298da6f7c,892bfb0ad0f44ce133530e07d24ab37f,p1323348
-Ga0499978,Gs0149396,a1323348,['Gp0587070'],Gb0305643,s1323445,Ga0499978_imgap.info,RESTORED,411,61a9d6ee8277d7ede604d0f6,852f507c44a0743e08cc3cc0de9575d2,p1323348
-Ga0499978,Gs0149396,a1323348,['Gp0587070'],Gb0305643,s1323445,Ga0499978_proteins.supfam.domtblout,RESTORED,7424934505,61a9d6ef8277d7ede604d105,c09cc12998669c5d4ec3973ff4d27580,p1323348
-Ga0499978,Gs0149396,a1323348,['Gp0587070'],Gb0305643,s1323445,Ga0499978_ko.tsv,RESTORED,44433089,61a9d6ef8277d7ede604d0f8,0ad4c6ca9deab065699e6f431d939cdf,p1323348
-Ga0499978,Gs0149396,a1323348,['Gp0587070'],Gb0305643,s1323445,Ga0499978_proteins.faa,RESTORED,417512094,61a9d6ef8277d7ede604d101,bd36edd00d12188b1d45a9b1c942bbb4,p1323348
-Ga0499978,Gs0149396,a1323348,['Gp0587070'],Gb0305643,s1323445,pairedMapped_sorted.bam.cov,RESTORED,80122313,61a9d6f18277d7ede604d116,30c9b60aab947deba0ffaa6e21755964,p1323348
-Ga0499978,Gs0149396,a1323348,['Gp0587070'],Gb0305643,s1323445,Table_8_-_3300049478.taxonomic_composition.txt,RESTORED,16996,61a9d6ed8277d7ede604d0e4,ee3efca7c81b6dbf837be5e91c5bbc78,p1323348
-Ga0499978,Gs0149396,a1323348,['Gp0587070'],Gb0305643,s1323445,Ga0499978_annotation_config.yaml,RESTORED,3015,61a9d6ee8277d7ede604d0e5,a7950724aa003bea5f23f2edbd24c596,p1323348
-Ga0499978,Gs0149396,a1323348,['Gp0587070'],Gb0305643,s1323445,rqc-stats.pdf,RESTORED,290034,619d6f9850d56abc0a99a4f4,100954063b2bd8a0bafb2488f6f07bdd,p1323348
+Ga0499978,Gs0149396,1323348,['Gp0587070'],Gb0305643,s1323445,52614.1.394702.GCACTAAC-CCAAGACT.filtered-report.txt,RESTORED,3645,6190d7d30de2fc3298da6f7a,fcd87248b5922a8bd0d530bcb23bffae,p1323348
+Ga0499978,Gs0149396,1323348,['Gp0587070'],Gb0305643,s1323445,52614.1.394702.GCACTAAC-CCAAGACT.filter_cmd-METAGENOME.sh,RESTORED,6151,6190d7d30de2fc3298da6f7c,892bfb0ad0f44ce133530e07d24ab37f,p1323348
+Ga0499978,Gs0149396,1323348,['Gp0587070'],Gb0305643,s1323445,Ga0499978_imgap.info,RESTORED,411,61a9d6ee8277d7ede604d0f6,852f507c44a0743e08cc3cc0de9575d2,p1323348
+Ga0499978,Gs0149396,1323348,['Gp0587070'],Gb0305643,s1323445,Ga0499978_proteins.supfam.domtblout,RESTORED,7424934505,61a9d6ef8277d7ede604d105,c09cc12998669c5d4ec3973ff4d27580,p1323348
+Ga0499978,Gs0149396,1323348,['Gp0587070'],Gb0305643,s1323445,Ga0499978_ko.tsv,RESTORED,44433089,61a9d6ef8277d7ede604d0f8,0ad4c6ca9deab065699e6f431d939cdf,p1323348
+Ga0499978,Gs0149396,1323348,['Gp0587070'],Gb0305643,s1323445,Ga0499978_proteins.faa,RESTORED,417512094,61a9d6ef8277d7ede604d101,bd36edd00d12188b1d45a9b1c942bbb4,p1323348
+Ga0499978,Gs0149396,1323348,['Gp0587070'],Gb0305643,s1323445,pairedMapped_sorted.bam.cov,RESTORED,80122313,61a9d6f18277d7ede604d116,30c9b60aab947deba0ffaa6e21755964,p1323348
+Ga0499978,Gs0149396,1323348,['Gp0587070'],Gb0305643,s1323445,Table_8_-_3300049478.taxonomic_composition.txt,RESTORED,16996,61a9d6ed8277d7ede604d0e4,ee3efca7c81b6dbf837be5e91c5bbc78,p1323348
+Ga0499978,Gs0149396,1323348,['Gp0587070'],Gb0305643,s1323445,Ga0499978_annotation_config.yaml,RESTORED,3015,61a9d6ee8277d7ede604d0e5,a7950724aa003bea5f23f2edbd24c596,p1323348
+Ga0499978,Gs0149396,1323348,['Gp0587070'],Gb0305643,s1323445,rqc-stats.pdf,RESTORED,290034,619d6f9850d56abc0a99a4f4,100954063b2bd8a0bafb2488f6f07bdd,p1323348
diff --git a/tests/test_jgi_file_staging/test_file_metadata.py b/tests/test_jgi_file_staging/test_file_metadata.py
@@ -95,7 +95,7 @@ def test_sample_model_instance_creation(monkeypatch, grow_analysis_df):
     sample_model = Sample(**sample_dict)
     assert sample_model.apGoldId == "Ga0499978"
     assert sample_model.studyId == "Gs0149396"
-    assert sample_model.itsApId == "a1323348"
+    assert sample_model.itsApId == 1323348
     assert sample_model.projects == "['Gp0587070']"
     assert sample_model.biosample_id == "Gb0305643"
     assert sample_model.seq_id == "s1323445"