Merge pull request #495 from vimc/vimc-7432

vimc-7432 Update guidance for 2024 Rfp touchstone

app/scripts/clear-docker.sh

@@ -1,5 +1,6 @@
 docker stop $(docker ps -aq)
 docker rm $(docker ps -aq) -f
 docker network prune --force
+docker volume prune --force
 
 docker ps

app/scripts/montagu-api.config.properties

@@ -0,0 +1 @@
+orderlyweb.api.url=http://montagu-orderly_web-1:8888/api/v2

app/scripts/run-dependencies.sh

@@ -28,19 +28,21 @@ docker run -v $ROOT/demo:/orderly $OW_CLI_IMAGE add-users [email protected]
 docker run -v $ROOT/demo:/orderly $OW_CLI_IMAGE grant [email protected] */users.manage
 
 # Run the APIs and database
-docker-compose pull
-docker-compose --project-name montagu up -d
+docker compose pull
+docker compose --project-name montagu up -d
 
 # Start the APIs
-docker exec montagu_api_1 mkdir -p /etc/montagu/api/
-docker exec montagu_api_1 touch /etc/montagu/api/go_signal
-# Wait for the database
-docker exec montagu_db_1 montagu-wait.sh
+docker exec montagu-api-1 mkdir -p /etc/montagu/api/
+docker container cp $here/montagu-api.config.properties montagu-api-1:/etc/montagu/api/config.properties
+docker exec montagu-api-1 touch /etc/montagu/api/go_signal
+
+# Wait for the database - this can take a while on buildkite
+docker exec montagu-db-1 montagu-wait.sh 300
 
 # Migrate the database
 docker pull $MONTAGU_MIGRATE_IMAGE
 docker run --network=montagu_default $MONTAGU_MIGRATE_IMAGE
 
 #start orderly web
-docker exec montagu_orderly_web_1 mkdir -p /etc/orderly/web
-docker exec montagu_orderly_web_1 touch /etc/orderly/web/go_signal
+docker exec montagu-orderly_web-1 mkdir -p /etc/orderly/web
+docker exec montagu-orderly_web-1 touch /etc/orderly/web/go_signal

app/scripts/run-integration-tests.sh

@@ -17,7 +17,7 @@ export PGPORT=5432
 # script
 
 # Setup template database
-docker exec montagu_db_1 psql -U vimc -d postgres -c \
+docker exec montagu-db-1 psql -U vimc -d postgres -c \
     "ALTER DATABASE $PGDATABASE RENAME TO $PGTEMPLATE"
 
 # Run the tests
@@ -27,8 +27,8 @@ result=$?
 
 # ------- Teardown -----------
 # Restore the database
-docker exec montagu_db_1 psql -U vimc -d postgres -c \
+docker exec montagu-db-1 psql -U vimc -d postgres -c \
     "ALTER DATABASE $PGTEMPLATE RENAME TO $PGDATABASE"
 
-docker logs montagu_api_1 > api.log 2> api.log
+docker logs montagu-api-1 > api.log 2> api.log
 exit $result

app/scripts/stop-dependencies.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -ex
-docker-compose --project-name montagu down --volumes
-docker-compose --project-name montagu rm
+docker compose --project-name montagu down --volumes
+docker compose --project-name montagu rm

app/src/main/contrib/components/Responsibilities/Overview/ResponsibilityOverviewDescription.tsx

@@ -9,6 +9,8 @@ interface ResponsibilityOverviewDescriptionProps {
     touchstoneStatus: string;
 }
 
+const rfp2024Guidance = require('./rfp-2024-guidance.pdf');
+
 const ContactDetails = () => {
     return <div>
         If you have any questions about using Montagu, please email&nbsp;
@@ -68,8 +70,26 @@ const TwentyTwentyTwoRfpTouchstone = () => {
             We have named the anonymous pre-defined country 'RfP'.
         </p>
         <p>
-        Output specifications guidance is available within the Guide for Applicants. To access this, go to&nbsp;
-        <a href="https://www.vaccineimpact.org/2022-11-23-rfp/">https://www.vaccineimpact.org/2022-11-23-rfp/</a>.
+            Output specifications guidance is available within the Guide for Applicants. To access this, go to&nbsp;
+            <a href="https://www.vaccineimpact.org/2022-11-23-rfp/">https://www.vaccineimpact.org/2022-11-23-rfp/</a>.
+        </p>
+        <ContactDetails/>
+    </div>
+};
+
+const TwentyTwentyFourRfpTouchstone = () => {
+    return <div>
+        On this page you can:
+        <ul>
+            <li>Access standardised demographic data for the anonymous pre-defined country.</li>
+            <li>Download the burden estimate templates for your disease area.</li>
+            <li>Submit the burden estimates generated by your model, for the pre-defined country.</li>
+        </ul>
+        <p>
+            We have named the anonymous pre-defined country 'RfP'.
+        </p>
+        <p>
+            Output specifications guidance is available within the <a href={rfp2024Guidance}>Guide for Applicants</a>.
         </p>
         <ContactDetails/>
     </div>
@@ -90,8 +110,11 @@ export const ResponsibilityOverviewDescription = (props: ResponsibilityOverviewD
         if (props.currentTouchstoneId.indexOf("2020") > -1) {
             return TwentyTwentyRfpTouchstone()
         }
-        else {
+        if (props.currentTouchstoneId.indexOf("2019") > -1) {
             return TwentyNineteenRfpTouchstone()
+        } else
+        {
+            return TwentyTwentyFourRfpTouchstone()
         }
     } else {
         let guidanceInputsUrl = `/help/model-inputs/${props.currentTouchstoneId}`;

app/src/test/contrib/components/Responsibilities/Overview/ResponsibilityOverviewDescriptionTests.tsx

@@ -21,7 +21,8 @@ describe("Responsibility Overview Description Component", () => {
     });
 
     it("renders component for 2019 applicants touchstone", () => {
-        const rendered = shallow(<ResponsibilityOverviewDescription currentTouchstoneId={itTouchstoneId2} groupId={itGroupId} touchstoneStatus={touchstoneStatus}/>);
+        const touchstoneId = "2019rfp-1";
+        const rendered = shallow(<ResponsibilityOverviewDescription currentTouchstoneId={touchstoneId} groupId={itGroupId} touchstoneStatus={touchstoneStatus}/>);
         expect(rendered.text().indexOf("Access the standardised demographic") > -1).toEqual(true);
     });
 
@@ -38,6 +39,14 @@ describe("Responsibility Overview Description Component", () => {
         expect(rendered.text().indexOf("https://www.vaccineimpact.org/2022-11-23-rfp")).toBeGreaterThan(-1);
     });
 
+    it("renders component for 2024 applicants touchstone", () => {
+        const touchstoneId = "202410rfp-1";
+        const rendered = shallow(<ResponsibilityOverviewDescription currentTouchstoneId={touchstoneId} groupId={itGroupId} touchstoneStatus={touchstoneStatus}/>);
+        expect(rendered.text().indexOf("the anonymous pre-defined country")).toBeGreaterThan(-1);
+        expect(rendered.text().indexOf("Output specifications guidance is available within the Guide for Applicants")).toBeGreaterThan(-1);
+        expect(rendered.html().indexOf("/rfp-2024-guidance.pdf")).toBeGreaterThan(-1);
+    });
+
     it("renders component on touchstone is not open", () => {
         const rendered = shallow(<ResponsibilityOverviewDescription currentTouchstoneId={itTouchstoneId2} groupId={itGroupId} touchstoneStatus="finished"/>);
         expect(rendered.text().indexOf("This touchstone is no longer open")).toBeGreaterThan(-1);

config/orderlyweb/config.properties

@@ -1 +1 @@
-montagu.api_url=http://montagu_api_1:8080/v1
+montagu.api_url=http://montagu-api-1:8080/v1