Skip to content

Commit d3e0bd1

Browse files
committed
Revert changes
1 parent a2f46f6 commit d3e0bd1

4 files changed

Lines changed: 4 additions & 20 deletions

File tree

transformation/src/main/scala/org/broadinstitute/monster/encode/transformation/BiosampleTransformations.scala

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,6 @@ object BiosampleTransformations {
5555
treatments = biosampleInput.read[List[String]]("treatments"),
5656
wasPerturbed = biosampleInput.read[Boolean]("perturbed"),
5757
submittedBy = biosampleInput.read[String]("submitted_by"),
58-
flyLifeStage = biosampleInput.tryRead[String]("fly_life_stage"),
59-
flySynchronizationStage = biosampleInput.tryRead[String]("fly_synchronization_stage"),
60-
modelOrganismAge = biosampleInput.tryRead[Long]("model_organism_age"),
61-
modelOrganismAgeUnit = biosampleInput.tryRead[String]("model_organism_age_units"),
62-
mouseLifeStage = biosampleInput.tryRead[String]("mouse_life_stage"),
63-
originBatch = Some("test"),
64-
passageNumber = biosampleInput.tryRead[Long]("passage_number"),
65-
postNucleicAcidDeliveryTime = biosampleInput.tryRead[Long]("post_nucleic_acid_delivery_time"),
66-
postNucleicAcidDeliveryTimeUnit =
67-
biosampleInput.tryRead[String]("post_nucleic_acid_delivery_time_units"),
68-
pulseChaseTime = biosampleInput.tryRead[Long]("pulse_chase_time"),
69-
pulseChaseTimeUnit = biosampleInput.tryRead[String]("pulse_chase_time_units"),
70-
wormLifeStage = biosampleInput.tryRead[String]("worm_life_stage"),
71-
wormSynchronizationStage = biosampleInput.tryRead[String]("worm_synchronization_stage"),
7258
productId = if (productIds.size > 1) {
7359
logger.warn(
7460
s"Biosample '$biosampleId' has multiple product ids: [${productIds.mkString(",")}]."

transformation/src/main/scala/org/broadinstitute/monster/encode/transformation/DonorTransformations.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ object DonorTransformations {
2626
}
2727
}
2828
}
29+
2930
Donor(
3031
id = CommonTransformations.readId(donorInput),
3132
crossReferences = donorInput.read[List[String]]("dbxrefs"),

transformation/src/main/scala/org/broadinstitute/monster/encode/transformation/LibraryTransformations.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ object LibraryTransformations {
3535
spikeIns = libraryInput.read[List[String]]("spikeins_used"),
3636
biosampleId = CommonTransformations.transformId(libraryInput.read[String]("biosample")),
3737
prepMaterial = libraryInput.tryRead[String]("nucleic_acid_term_id"),
38-
prepMaterialName = libraryInput.tryRead[String]("nucleic_acid_term_name"),
39-
constructionMethod = Some("test")
38+
prepMaterialName = libraryInput.tryRead[String]("nucleic_acid_term_name")
4039
)
4140
}
4241

transformation/src/test/scala/org/broadinstitute/monster/encode/transformation/DonorTransformationsSpec.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ class DonorTransformationsSpec extends AnyFlatSpec with Matchers {
1818
|"lab": "/labs/example-lab",
1919
|"parents": [],
2020
|"submitted_by": "/users/123-abc",
21-
|"age": "30-33",
22-
|"uuid": "C12A1ED2-454C-47AB-B7D4-A47570F464A0"
21+
|"age": "30-33"
2322
|}
2423
|""".stripMargin
2524
val inputMsg: Msg = JsonParser.parseEncodedJson(inputJson)
@@ -48,8 +47,7 @@ class DonorTransformationsSpec extends AnyFlatSpec with Matchers {
4847
|"lab": "/labs/example-lab",
4948
|"parents": [],
5049
|"submitted_by": "/users/123-abc",
51-
|"age": "90 or above",
52-
|"uuid": "C12A1ED2-454C-47AB-B7D4-A47570F464A0"
50+
|"age": "90 or above"
5351
|}
5452
|""".stripMargin
5553
val inputMsg: Msg = JsonParser.parseEncodedJson(inputJson)

0 commit comments

Comments
 (0)