release 2.3.0

README.md

@@ -4,9 +4,15 @@ Sustainable Resource Planning
 Release History
 ---------------
 
-2.2.0 - 
+2.3.0 - 23 Oct 18
 
-  - Integration tests and bug fixes
+  - #288 Implement 'health-check' for returns
+  - #286 Render tables and graphs client side 
+  - #284 Remove 'Import ERIC data' (now implicit)
+
+2.2.0 - 02 Aug 18 - 3515b3c38eed136e3a5663340489bdc31041f786
+
+  - cosmetic changes and bug fixes
 
 2.1.0 - 15 Mar 18
 

app/gulpfile.js

@@ -9,7 +9,7 @@ var replace     = require('gulp-replace');
 var scp         = require('gulp-scp2');
 var through2    = require('through2');
 var zip         = require('gulp-zip');
-var vsn         = '2.1.0';
+var vsn         = '2.3.0';
 
 var argv = minimist(process.argv.slice(2));
 var env = argv['env'] || 'dev';

integration-tests/pom.xml

@@ -12,7 +12,7 @@
     <groupId>digital.srp</groupId>
     <artifactId>srp-root</artifactId>
     <relativePath>..</relativePath>
-    <version>2.2.0</version>
+    <version>2.3.0</version>
   </parent>
 
   <properties>

macc/pom.xml

@@ -9,7 +9,7 @@
     <parent>
       <groupId>digital.srp</groupId>
       <artifactId>srp-root</artifactId>
-      <version>2.2.0</version>
+      <version>2.3.0</version>
       <relativePath>..</relativePath>
     </parent>
 

macc/src/test/java/digital/srp/macc/model/InterventionTypeTest.java

@@ -21,7 +21,6 @@
 import java.math.BigDecimal;
 import java.math.MathContext;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import digital.srp.macc.maths.InterventionTypeValidator;
@@ -367,7 +366,6 @@ public void testSmokingCessationUsingTimeSeriesInputs() {
     }
 
     @Test
-    @Ignore
     public void testSolarThermalWithRHI() {
         InterventionType interventionType = new InterventionType();
         interventionType.setName("Solar Thermal");

pom.xml

@@ -8,7 +8,7 @@
 
   <groupId>digital.srp</groupId>
   <artifactId>srp-root</artifactId>
-  <version>2.2.0</version>
+  <version>2.3.0</version>
   <packaging>pom</packaging>
 
   <properties>

server/pom.xml

@@ -27,7 +27,7 @@
   <parent>
     <groupId>digital.srp</groupId>
     <artifactId>srp-root</artifactId>
-    <version>2.2.0</version>
+    <version>2.3.0</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -38,6 +38,10 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+    </dependency>
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
@@ -158,6 +162,10 @@
         <executions>
           <execution>
             <id>pre-integration-test</id>
+	    <configuration>
+              <wait>10000</wait>
+	      <maxAttempts>6</maxAttempts>
+	    </configuration>
             <goals>
               <goal>start</goal>
             </goals>

server/src/main/java/digital/srp/server/SrpConfig.java

@@ -2,9 +2,6 @@
 
 import java.util.List;
 
-import javax.persistence.EntityManagerFactory;
-
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguration;
@@ -20,10 +17,6 @@
 @Configuration
 @ComponentScan(basePackages = { "digital.srp.server" })
 public class SrpConfig extends RepositoryRestMvcConfiguration {
-
-    @Autowired
-    protected EntityManagerFactory entityManagerFactory;
-
     // DO NOT put this in a reusable configuration to avoid clashes
     @Override
     public void configureMessageConverters(

server/src/main/resources/static/self-test.html

@@ -31,9 +31,9 @@
   <script src="js/env.js"></script>
 
   <!-- include spec files here... -->
-  <script src="/webjars/sreport/2.2.0/specs/MgmtSpec.js"></script>
-  <script src="/webjars/sreport/2.2.0/specs/ReturnSpec.js"></script>
-  <script src="/webjars/sreport/2.2.0/specs/RoutesSpec.js"></script>
+  <script src="/webjars/sreport/2.3.0/specs/MgmtSpec.js"></script>
+  <script src="/webjars/sreport/2.3.0/specs/ReturnSpec.js"></script>
+  <script src="/webjars/sreport/2.3.0/specs/RoutesSpec.js"></script>
 
 </head>
 <body>

server/src/test/java/digital/srp/server/ApplicationTests.java

@@ -17,13 +17,11 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
-@DataJpaTest
 public class ApplicationTests {
 
     /**

server/src/test/java/digital/srp/server/RestApiIT.java

@@ -22,6 +22,8 @@
 
 public class RestApiIT {
 
+    private static final String VSN = "2.3.0";
+
     private static ScheduledExecutorService globalScheduledThreadPool = Executors.newScheduledThreadPool(20);
 
     private ObjectMapper objectMapper = new ObjectMapper();
@@ -31,7 +33,7 @@ public class RestApiIT {
     public void test10MgmtApi() throws IOException {
         StringBuilder sb = createScript(
                 "classpath:META-INF/resources/webjars/jasmine-boot/1.0.0/js/rest-helper.js",
-                "classpath:META-INF/resources/webjars/sreport/2.2.0/specs/MgmtSpec.js" );
+                "classpath:META-INF/resources/webjars/sreport/"+VSN+"/specs/MgmtSpec.js" );
 
         JsonNode report = runScript(sb);
         assertEquals(7, report.get("suite").get("totalSpecsDefined").asInt());
@@ -42,7 +44,7 @@ public void test10MgmtApi() throws IOException {
     public void test20SustainabilityReturnApi() throws IOException {
         StringBuilder sb = createScript(
                 "classpath:META-INF/resources/webjars/jasmine-boot/1.0.0/js/rest-helper.js",
-                "classpath:META-INF/resources/webjars/sreport/2.2.0/specs/ReturnSpec.js" );
+                "classpath:META-INF/resources/webjars/sreport/"+VSN+"/specs/ReturnSpec.js" );
 
         JsonNode report = runScript(sb);
         assertEquals(4, report.get("suite").get("totalSpecsDefined").asInt());

server/src/test/resources/application.properties

@@ -29,9 +29,6 @@ srp.tomcat.ajp.enabled = false
 
 logging.level.com.zaxxer.hikari=WARN
 logging.level.com.knowprocess=WARN
-logging.level.com.knowprocess.beans=WARN
-logging.level.com.knowprocess.bpm=INFO
-logging.level.com.knowprocess.resource=DEBUG
 logging.level.digital.srp=WARN
 logging.level.HikariPool=WARN
 logging.level.io.onedecision=WARN

sreport/pom.xml

@@ -9,7 +9,7 @@
     <parent>
       <groupId>digital.srp</groupId>
       <artifactId>srp-root</artifactId>
-      <version>2.2.0</version>
+      <version>2.3.0</version>
       <relativePath>..</relativePath>
     </parent>
 

sreport/src/main/java/digital/srp/sreport/internal/SReportConfiguration.java

@@ -16,8 +16,11 @@
 
 @Configuration
 @ComponentScan(basePackages = { "digital.srp.sreport" })
-@EntityScan({ "digital.srp.sreport.model" })
-@EnableJpaRepositories({ "digital.srp.sreport.repositories" })
+@EntityScan({ "digital.srp.sreport.model", "io.onedecision.engine.decisions.model",
+    "io.onedecision.engine.domain.model" })
+@EnableJpaRepositories({ "digital.srp.sreport.repositories",
+    "io.onedecision.engine.decisions.repositories",
+    "io.onedecision.engine.domain.repositories" })
 @EnableJpaAuditing
 public class SReportConfiguration extends RepositoryRestMvcConfiguration {
 

sreport/src/main/resources/data/Questions-201617b.csv

@@ -322,4 +322,10 @@ NO_HEALTHCARE_TRAVEL_CLAIMS$$$ERIC$$number$$$$
 LAUNDRY_RETURN_PCT$$$ERIC$$number$$$$
 BIZ_MILEAGE$$$ERIC$$number$$$$
 NO_LONG_STAY_HOSPITAL_SITES$$$ERIC$$number$$$$
-NO_NON_HOSPITAL_PATIENT_SITES$$$ERIC$$number$$$$
+NO_NON_HOSPITAL_PATIENT_SITES$$$ERIC$$number$$$$
+PCT_TEMP_MONITORED$$$ERIC$$number$$$$
+NO_FALSE_ALARMS_CALL_OUT$$$ERIC$$number$$$$
+NO_FALSE_ALARMS_NO_CALL_OUT$$$ERIC$$number$$$$
+OVERHEATING_EVENTS$$$ERIC$$number$$$$
+CIP_PLANNED_VAL$$$ERIC$$number$$$$
+CIP_ACTUAL_VAL$$$ERIC$$number$$$$

sreport/src/test/java/digital/srp/sreport/ApplicationTest.java

@@ -1,6 +1,5 @@
 package digital.srp.sreport;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -13,7 +12,6 @@
 public class ApplicationTest {
 
     @Test
-    @Ignore
     public void contextLoads() {
     }
 

sreport/src/test/java/digital/srp/sreport/importers/QuestionCsvImporterTest.java

@@ -18,7 +18,7 @@ public void testImport() {
             List<Question> questions = new QuestionCsvImporter().readQuestions();
             System.out.println(
                     String.format(" found %1$d returns", questions.size()));
-            assertEquals(324, questions.size());
+            assertEquals(330, questions.size());
 
             // assert expected values of record (first currently complete)
             //TOTAL_ENERGY_COST$Total Energy Cost (all energy supplies)$£$ERIC S08_01$The total cost of electricity, gas, oil, and coal from all sources (including utility supplier, local source, renewable source), net of any costs that are charged to other organisations for which the trust provides energy (see apportionment rules). $