From 6be40b772db718f7b6e0712f0f79b39d3ef47446 Mon Sep 17 00:00:00 2001 From: Carlos Quiroz Date: Mon, 22 Jan 2024 10:19:33 -0300 Subject: [PATCH] Preparation for PIT 2024B --- .gitignore | 1 + app/p1-monitor/build.sbt | 28 +-- build.sbt | 4 +- .../gemini/model/p1/immutable/Semester.scala | 2 +- .../p1/immutable/transform/UpConverter.scala | 56 +++--- .../model/p1/immutable/ProposalSpec.scala | 6 +- .../p1/immutable/SemesterProperties.scala | 2 +- .../model/p1/immutable/SemesterSpec.scala | 2 +- .../immutable/transform/UpConverterSpec.scala | 2 +- .../config/conf.production-2024B.xml | 175 ++++++++++++++++++ 10 files changed, 232 insertions(+), 46 deletions(-) create mode 100644 bundle/edu.gemini.p1monitor/src/main/resources/edu/gemini/p1monitor/config/conf.production-2024B.xml diff --git a/.gitignore b/.gitignore index e208897f48..9fc2b362f9 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ metals.sbt #FR IDE .Trash-3906/ +bundle/*/project diff --git a/app/p1-monitor/build.sbt b/app/p1-monitor/build.sbt index a1bba5f893..74eafdf98e 100644 --- a/app/p1-monitor/build.sbt +++ b/app/p1-monitor/build.sbt @@ -18,9 +18,9 @@ ocsAppManifest := { common(ov, pv), dev(ov, pv), staging(ov, pv), - v2023A(ov, pv), v2023B(ov, pv), - v2024A(ov, pv) + v2024A(ov, pv), + v2024B(ov, pv) ) ) } @@ -79,18 +79,6 @@ def staging(ov: Version, pv: Version) = AppConfig( distribution = List(Linux32, Linux64) ) extending List(common(ov, pv)) -// 2023A -def v2023A(ov: Version, pv: Version) = AppConfig( - id = "2023A", - props = Map( - "org.osgi.framework.storage" -> "${user.home}/.edu.gemini.p1monitor.2023A/felix-cache", - "p1monitor.config" -> "conf.production-2023A.xml", - "org.osgi.service.http.port" -> "9007", - "p1monitor.host" -> "phase1.gemini.edu" - ), - distribution = List(Linux32, Linux64) -) extending List(common(ov, pv)) - // 2023B def v2023B(ov: Version, pv: Version) = AppConfig( id = "2023B", @@ -115,3 +103,15 @@ def v2024A(ov: Version, pv: Version) = AppConfig( distribution = List(Linux64) ) extending List(common(ov, pv)) +// 2024B +def v2024B(ov: Version, pv: Version) = AppConfig( + id = "202BA", + props = Map( + "org.osgi.framework.storage" -> "${user.home}/.edu.gemini.p1monitor.2024B/felix-cache", + "p1monitor.config" -> "conf.production-2024B.xml", + "org.osgi.service.http.port" -> "9007", + "p1monitor.host" -> "phase1.gemini.edu" + ), + distribution = List(Linux32, Linux64) +) extending List(common(ov, pv)) + diff --git a/build.sbt b/build.sbt index eeda5607e5..8d14297099 100644 --- a/build.sbt +++ b/build.sbt @@ -5,9 +5,9 @@ name := "ocs" organization in Global := "edu.gemini.ocs" // true indicates a test release, and false indicates a production release -ocsVersion in ThisBuild := OcsVersion("2023B", true, 1, 1, 1) +ocsVersion in ThisBuild := OcsVersion("2024A", true, 1, 1, 2) -pitVersion in ThisBuild := OcsVersion("2024A", false, 1, 1, 0) +pitVersion in ThisBuild := OcsVersion("2024B", true, 1, 1, 0) // Bundles by default use the ocsVersion; this is overridden in bundles used only by the PIT version in ThisBuild := ocsVersion.value.toOsgiVersion diff --git a/bundle/edu.gemini.model.p1/src/main/scala/edu/gemini/model/p1/immutable/Semester.scala b/bundle/edu.gemini.model.p1/src/main/scala/edu/gemini/model/p1/immutable/Semester.scala index eb7db76931..ea04377cdc 100644 --- a/bundle/edu.gemini.model.p1/src/main/scala/edu/gemini/model/p1/immutable/Semester.scala +++ b/bundle/edu.gemini.model.p1/src/main/scala/edu/gemini/model/p1/immutable/Semester.scala @@ -7,7 +7,7 @@ import java.util.{Calendar, TimeZone} object Semester { lazy val year = 2024 - lazy val semesterOption: SemesterOption = SemesterOption.A + lazy val semesterOption: SemesterOption = SemesterOption.B lazy val current: Semester = Semester(year, semesterOption) diff --git a/bundle/edu.gemini.model.p1/src/main/scala/edu/gemini/model/p1/immutable/transform/UpConverter.scala b/bundle/edu.gemini.model.p1/src/main/scala/edu/gemini/model/p1/immutable/transform/UpConverter.scala index a3de910267..660cf675e6 100644 --- a/bundle/edu.gemini.model.p1/src/main/scala/edu/gemini/model/p1/immutable/transform/UpConverter.scala +++ b/bundle/edu.gemini.model.p1/src/main/scala/edu/gemini/model/p1/immutable/transform/UpConverter.scala @@ -34,29 +34,30 @@ object UpConverter { } // Sequence of conversions for proposals from a given semester. Cleaned up for 2017A since older conversion multiples to increment version no longer necessary. - val from2023B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, LastStepConverter(Semester(2023, SemesterOption.B))) - val from2023A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, LastStepConverter(Semester(2023, SemesterOption.A))) - val from2022B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, LastStepConverter(Semester(2022, SemesterOption.B))) - val from2022A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, LastStepConverter(Semester(2022, SemesterOption.A))) - val from2021B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, LastStepConverter(Semester(2021, SemesterOption.B))) - val from2021A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, LastStepConverter(Semester(2021, SemesterOption.A))) - val from2020B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, LastStepConverter(Semester(2020, SemesterOption.B))) - val from2020A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A ,SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, LastStepConverter(Semester(2020, SemesterOption.A))) - val from2019B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, LastStepConverter(Semester(2019, SemesterOption.B))) - val from2019A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, LastStepConverter(Semester(2019, SemesterOption.A))) - val from2018B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, LastStepConverter(Semester(2018, SemesterOption.B))) - val from2018A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, LastStepConverter(Semester(2018, SemesterOption.A))) - val from2017B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, LastStepConverter(Semester(2017, SemesterOption.B))) - val from2017A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2017, SemesterOption.A))) - val from2016B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2016, SemesterOption.B))) - val from2016A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2016ATo2016B, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2016, SemesterOption.A))) - val from2015B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2016ATo2016B, SemesterConverter2015BTo2016A, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2015, SemesterOption.B))) - val from2015A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2016ATo2016B, SemesterConverter2015BTo2016A, SemesterConverter2015ATo2015B, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2015, SemesterOption.A))) - val from2014B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A ,SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2016ATo2016B, SemesterConverter2015ATo2015B, SemesterConverter2014BTo2015A, SemesterConverter2014BTo2014BSV, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2014, SemesterOption.B))) - val from2014A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2016ATo2016B, SemesterConverter2015ATo2015B, SemesterConverter2014BTo2015A, SemesterConverter2014BTo2014BSV, SemesterConverter2014ATo2014B, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2014, SemesterOption.A))) - val from2013B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2016ATo2016B, SemesterConverter2015ATo2015B, SemesterConverter2014BTo2015A, SemesterConverter2014BTo2014BSV, SemesterConverter2013BTo2014A, SemesterConverter2014ATo2014B, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2013, SemesterOption.B))) - val from2013A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2016ATo2016B, SemesterConverter2015ATo2015B, SemesterConverter2014BTo2015A, SemesterConverter2014BTo2014BSV, SemesterConverter2013ATo2013B, SemesterConverter2013BTo2014A, SemesterConverter2014ATo2014B, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2013, SemesterOption.A))) - val from2012B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2016ATo2016B, SemesterConverter2015ATo2015B, SemesterConverter2014BTo2015A, SemesterConverter2014BTo2014BSV, SemesterConverter2012BTo2013A, SemesterConverter2013ATo2013B, SemesterConverter2013BTo2014A, SemesterConverter2014ATo2014B, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2012, SemesterOption.B))) + val from2024A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, LastStepConverter(Semester(2024, SemesterOption.A))) + val from2023B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, LastStepConverter(Semester(2023, SemesterOption.B))) + val from2023A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, LastStepConverter(Semester(2023, SemesterOption.A))) + val from2022B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, LastStepConverter(Semester(2022, SemesterOption.B))) + val from2022A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, LastStepConverter(Semester(2022, SemesterOption.A))) + val from2021B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, LastStepConverter(Semester(2021, SemesterOption.B))) + val from2021A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, LastStepConverter(Semester(2021, SemesterOption.A))) + val from2020B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, LastStepConverter(Semester(2020, SemesterOption.B))) + val from2020A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A ,SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, LastStepConverter(Semester(2020, SemesterOption.A))) + val from2019B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, LastStepConverter(Semester(2019, SemesterOption.B))) + val from2019A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, LastStepConverter(Semester(2019, SemesterOption.A))) + val from2018B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, LastStepConverter(Semester(2018, SemesterOption.B))) + val from2018A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, LastStepConverter(Semester(2018, SemesterOption.A))) + val from2017B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, LastStepConverter(Semester(2017, SemesterOption.B))) + val from2017A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2017, SemesterOption.A))) + val from2016B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2016, SemesterOption.B))) + val from2016A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2016ATo2016B, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2016, SemesterOption.A))) + val from2015B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2016ATo2016B, SemesterConverter2015BTo2016A, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2015, SemesterOption.B))) + val from2015A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2016ATo2016B, SemesterConverter2015BTo2016A, SemesterConverter2015ATo2015B, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2015, SemesterOption.A))) + val from2014B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A ,SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2016ATo2016B, SemesterConverter2015ATo2015B, SemesterConverter2014BTo2015A, SemesterConverter2014BTo2014BSV, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2014, SemesterOption.B))) + val from2014A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2016ATo2016B, SemesterConverter2015ATo2015B, SemesterConverter2014BTo2015A, SemesterConverter2014BTo2014BSV, SemesterConverter2014ATo2014B, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2014, SemesterOption.A))) + val from2013B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2016ATo2016B, SemesterConverter2015ATo2015B, SemesterConverter2014BTo2015A, SemesterConverter2014BTo2014BSV, SemesterConverter2013BTo2014A, SemesterConverter2014ATo2014B, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2013, SemesterOption.B))) + val from2013A:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2016ATo2016B, SemesterConverter2015ATo2015B, SemesterConverter2014BTo2015A, SemesterConverter2014BTo2014BSV, SemesterConverter2013ATo2013B, SemesterConverter2013BTo2014A, SemesterConverter2014ATo2014B, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2013, SemesterOption.A))) + val from2012B:List[SemesterConverter] = List(SemesterConverterToCurrent, SemesterConverter2024ATo2024B, SemesterConverter2023BTo2024A, SemesterConverter2023ATo2023B, SemesterConverter2022BTo2023A, SemesterConverter2022ATo2022B, SemesterConverter2021BTo2022A, SemesterConverter2021ATo2021B, SemesterConverter2020BTo2021A, SemesterConverter2020ATo2020B, SemesterConverter2019BTo2020A, SemesterConverter2019ATo2019B, SemesterConverter2018BTo2019A, SemesterConverter2018ATo2018B, SemesterConverter2017BTo2018A, SemesterConverter2016BTo2017A, SemesterConverter2016ATo2016B, SemesterConverter2015ATo2015B, SemesterConverter2014BTo2015A, SemesterConverter2014BTo2014BSV, SemesterConverter2012BTo2013A, SemesterConverter2013ATo2013B, SemesterConverter2013BTo2014A, SemesterConverter2014ATo2014B, SemesterConverter2017ATo2017B, LastStepConverter(Semester(2012, SemesterOption.B))) /** * Converts one version of a proposal node to the next @@ -67,6 +68,8 @@ object UpConverter { def convert(node: XMLNode):Result = node match { case p @ {ns @ _*} if (p \ "@schemaVersion").text == Proposal.currentSchemaVersion => StepResult(Nil, node).successNel[String] + case p @ {ns @ _*} if (p \ "@schemaVersion").text.matches("2024.1.1") => + from2024A.concatenate.convert(node) case p @ {ns @ _*} if (p \ "@schemaVersion").text.matches("2023.2.[12]") => from2023B.concatenate.convert(node) case p @ {ns @ _*} if (p \ "@schemaVersion").text.matches("2023.1.[12]") => @@ -170,6 +173,13 @@ case class LastStepConverter(semester: Semester) extends SemesterConverter { override val transformers = List(notifyToUseOlderPIT) } +/** + * This converter supports migrating to 2024B + */ +case object SemesterConverter2024ATo2024B extends SemesterConverter { + override val transformers: List[TransformFunction] = Nil +} + /** * This converter supports migrating to 2023B */ diff --git a/bundle/edu.gemini.model.p1/src/test/scala/edu/gemini/model/p1/immutable/ProposalSpec.scala b/bundle/edu.gemini.model.p1/src/test/scala/edu/gemini/model/p1/immutable/ProposalSpec.scala index fdc1c34d60..8c9f8bc278 100644 --- a/bundle/edu.gemini.model.p1/src/test/scala/edu/gemini/model/p1/immutable/ProposalSpec.scala +++ b/bundle/edu.gemini.model.p1/src/test/scala/edu/gemini/model/p1/immutable/ProposalSpec.scala @@ -14,7 +14,7 @@ class ProposalSpec extends Specification with SemesterProperties with XmlMatcher } "use a schema version read from System properties" in { val proposal = Proposal.empty - proposal.schemaVersion must beEqualTo("2024.1.1") + proposal.schemaVersion must beEqualTo("2024.2.1") } "set the band3optionChosen by default to false" in { val proposal = Proposal.empty @@ -49,7 +49,7 @@ class ProposalSpec extends Specification with SemesterProperties with XmlMatcher val xml = XML.loadString(ProposalIo.writeToString(proposal)) // verify the exported value is set to the current semester - xml must \\("semester", "year" -> "2024", "half" -> "A") + xml must \\("semester", "year" -> "2024", "half" -> "B") } "set the schemaVersion to current upon saving a new proposal" in { val proposal = Proposal.empty @@ -57,7 +57,7 @@ class ProposalSpec extends Specification with SemesterProperties with XmlMatcher val xml = XML.loadString(ProposalIo.writeToString(proposal)) // verify the exported value is set to the current semester - xml must \\("proposal", "schemaVersion" -> "2024.1.1") + xml must \\("proposal", "schemaVersion" -> "2024.2.1") } "be able to open latin1 encoded files" in { val proposal = ProposalIo.read(new InputStreamReader(getClass.getResourceAsStream("proposal_with_latin1_encoding.xml"))) diff --git a/bundle/edu.gemini.model.p1/src/test/scala/edu/gemini/model/p1/immutable/SemesterProperties.scala b/bundle/edu.gemini.model.p1/src/test/scala/edu/gemini/model/p1/immutable/SemesterProperties.scala index 420c952f30..58f414b18c 100644 --- a/bundle/edu.gemini.model.p1/src/test/scala/edu/gemini/model/p1/immutable/SemesterProperties.scala +++ b/bundle/edu.gemini.model.p1/src/test/scala/edu/gemini/model/p1/immutable/SemesterProperties.scala @@ -1,6 +1,6 @@ package edu.gemini.model.p1.immutable trait SemesterProperties { - System.setProperty("edu.gemini.model.p1.schemaVersion", "2024.1.1") + System.setProperty("edu.gemini.model.p1.schemaVersion", "2024.2.1") } diff --git a/bundle/edu.gemini.model.p1/src/test/scala/edu/gemini/model/p1/immutable/SemesterSpec.scala b/bundle/edu.gemini.model.p1/src/test/scala/edu/gemini/model/p1/immutable/SemesterSpec.scala index 9c333f5908..cf3269c14e 100644 --- a/bundle/edu.gemini.model.p1/src/test/scala/edu/gemini/model/p1/immutable/SemesterSpec.scala +++ b/bundle/edu.gemini.model.p1/src/test/scala/edu/gemini/model/p1/immutable/SemesterSpec.scala @@ -6,7 +6,7 @@ import java.io.InputStreamReader class SemesterSpec extends Specification { "The Semester class" should { "have a default" in { - Semester.current must beEqualTo(Semester(2024, SemesterOption.A)) + Semester.current must beEqualTo(Semester(2024, SemesterOption.B)) } "deserialize any semester" in { val proposal = ProposalIo.read(new InputStreamReader(getClass.getResourceAsStream("proposal_with_old_semester.xml"))) diff --git a/bundle/edu.gemini.model.p1/src/test/scala/edu/gemini/model/p1/immutable/transform/UpConverterSpec.scala b/bundle/edu.gemini.model.p1/src/test/scala/edu/gemini/model/p1/immutable/transform/UpConverterSpec.scala index 1d19534034..93a3d5aa56 100644 --- a/bundle/edu.gemini.model.p1/src/test/scala/edu/gemini/model/p1/immutable/transform/UpConverterSpec.scala +++ b/bundle/edu.gemini.model.p1/src/test/scala/edu/gemini/model/p1/immutable/transform/UpConverterSpec.scala @@ -43,7 +43,7 @@ class UpConverterSpec extends Specification with SemesterProperties with XmlMatc i.visitor must beFalse } - proposal.semester must beEqualTo(Semester(2024, SemesterOption.A)) + proposal.semester must beEqualTo(Semester(2024, SemesterOption.B)) } UpConverter.upConvert(xml) must beSuccessful.like { diff --git a/bundle/edu.gemini.p1monitor/src/main/resources/edu/gemini/p1monitor/config/conf.production-2024B.xml b/bundle/edu.gemini.p1monitor/src/main/resources/edu/gemini/p1monitor/config/conf.production-2024B.xml new file mode 100644 index 0000000000..1b1a4a372e --- /dev/null +++ b/bundle/edu.gemini.p1monitor/src/main/resources/edu/gemini/p1monitor/config/conf.production-2024B.xml @@ -0,0 +1,175 @@ + + smtp.hi.gemini.edu + + swalker@gemini.edu + cquiroz@gemini.edu + sraaphorst@gemini.edu + rnorris@gemini.edu + + + /home/software/proposals/fast_turnaround/proposals/2023A + pitft@gemini.edu + + + + /home/software/proposals/directors_time/proposals/2023A + pitdd@gemini.edu + + + + + /home/software/proposals/poor_weather/proposals/2023A + pitpw@gemini.edu + + + + + /home/software/proposals/demo_science/proposals/2023A + pitds@gemini.edu + + + + /home/software/proposals/system_verification/proposals/2023A + pitsv@gemini.edu + + + + /home/software/proposals/guaranteed_time/proposals/2023A + pitgt@gemini.edu + + + + + /home/software/proposals/large_program/proposals/2023A + pitlp@gemini.edu + + + + + /home/software/proposals/subaru_intensive_program/proposals/2023A + pitlp@gemini.edu + + + + + /home/software/proposals/ar/proposals/2023A + pit.ar@gemini.edu + + + + /home/software/proposals/br/proposals/2023A + pit.br@gemini.edu + + + + /home/software/proposals/ca/proposals/2023A + pit.ca@gemini.edu + + + + /home/software/proposals/cfh/proposals/2023A + pit.cfh@gemini.edu + + + + /home/software/proposals/cl/proposals/2023A + pit.cl@gemini.edu + + + + + /home/software/proposals/kr/proposals/2023A + pit.kr@gemini.edu + + + + /home/software/proposals/uh/proposals/2023A + pit.uh@gemini.edu + + + + /home/software/proposals/us/proposals/2023A + pit.us@gemini.edu + + + + /home/software/proposals/subaru/proposals/2023A + pit.subaru@gemini.edu + + + + + ft + FT + + + System Verification + SV + + + Guaranteed Time + GT + + + Poor Weather + PW + + + Directors Time + DT + + + Demo Science + DS + + + lp + LP + + + ar + AR + + + au + AU + + + br + BR + + + ca + CA + + + cl + CL + + + cfh + CFH + + + kr + KR + + + sip + SIP + + + us + US + + + uh + UH + + + subaru + SUBARU + + + +