* Opdateret SDM4 depencencies

* SDM-30: Bemyndigelse håndterer ugyldige inputfiler forkert * SDM-5 SLA-log fra SDM4-importere følger ikke standarden * Tilføjet kopi register view, så kopi register service maps nu bliver oprettet automatisk
trifork · May 31, 2013 · 3e7f522 · 3e7f522
1 parent 9d31a43
commit 3e7f522
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 53 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,12 +1,18 @@
-## bemyndigelseimporter 4.5
-* Opdateret til sdm4-core 4.5
-* NSP-1674: Netic-jira - fejl under import 'expected 1 found 2'
-* NSPSUPPORT-185: sdm4-Bemyndigelseimporter opdaterer rækker selvom der ikke er ændringer
+## bemyndigelseimporter 4.3
+*  Opgrading til sdm4-core 4.3, der løser
+   NSPSUPPORT-126: ParserExecutor logger filers absolutte stier og md5-summer inden parser behandler dem
 
 ## bemyndigelseimporter 4.4
 * Opdateret til sdm4-core 4.4
 * NSPSUPPORT-178: sdm4-bemyndigelseimporter får ikke 'lukket' eksisterende records
 
-## bemyndigelseimporter 4.3
-*  Opgrading til sdm4-core 4.3, der løser
-   NSPSUPPORT-126: ParserExecutor logger filers absolutte stier og md5-summer inden parser behandler dem 
+## bemyndigelseimporter 4.5
+* Opdateret til sdm4-core 4.5
+* NSP-1674: Netic-jira - fejl under import 'expected 1 found 2'
+* NSPSUPPORT-185: sdm4-Bemyndigelseimporter opdaterer rækker selvom der ikke er ændringer
+
+## bemyndigelseimporter 4.6
+* Opdateret SDM4 depencencies
+* SDM-30: Bemyndigelse håndterer ugyldige inputfiler forkert
+* SDM-5 SLA-log fra SDM4-importere følger ikke standarden
+* Tilføjet kopi register view, så kopi register service maps nu bliver oprettet automatisk
diff --git a/doc/release-4.3.txt b/doc/release-4.3.txt
diff --git a/doc/release-4.4.txt b/doc/release-4.4.txt
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>dk.nsi.stamdata4</groupId>
 		<artifactId>sdm-parent</artifactId>
-		<version>4.3</version>
+		<version>4.7</version>
 	</parent>
 
 	<artifactId>bemyndigelseimporter</artifactId>
@@ -57,7 +57,7 @@
 		<dependency>
 			<groupId>dk.nsi.stamdata4</groupId>
 			<artifactId>sdm-core</artifactId>
-			<version>4.5</version>
+			<version>4.10</version>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>dk.nsi.stamdata4</groupId>
             <artifactId>testutils</artifactId>
-            <version>4.2</version>
+            <version>4.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/dk/nsi/sdm4/bemyndigelse/parser/BemyndigelseParser.java b/src/main/java/dk/nsi/sdm4/bemyndigelse/parser/BemyndigelseParser.java
@@ -66,10 +66,15 @@ public BemyndigelseParser() {
     }
 
     @Override
-    public void process(File dataSet) throws ParserException {
+    public void process(File dataSet, String identifier) throws ParserException {
 
-        SLALogItem slaLogItem = slaLogger.createLogItem("BemyndigelseParser", "dataSet");
+        SLALogItem slaLogItem = slaLogger.createLogItem(getHome()+".process", "SDM4."+getHome()+".process");
+        slaLogItem.setMessageId(identifier);
+        if (dataSet != null) {
+            slaLogItem.addCallParameter(Parser.SLA_INPUT_NAME, dataSet.getAbsolutePath());
+        }
         try {
+            long processed = 0;
             logger.debug("Starting Bemyndigelse parser");
             File files = checkRequiredFiles(dataSet);
 
@@ -78,11 +83,12 @@ public void process(File dataSet) throws ParserException {
                 for (Bemyndigelse bemyndigelse : bemyndigelser.getBemyndigelseList()) {
                     validateBemyndigelse(bemyndigelse);
                     Record record = buildRecord(bemyndigelse);
-
                     persister.persist(record, recordSpecification);
+
+                    processed++;
                 }
             }
-
+            slaLogItem.addCallParameter(Parser.SLA_RECORDS_PROCESSED_MAME, ""+processed);
             slaLogItem.setCallResultOk();
             slaLogItem.store();
         } catch (Exception e) {
@@ -133,25 +139,21 @@ private Record buildRecord(Bemyndigelse bemyndigelse) {
         return builder.build();
     }
 
-    private List<Bemyndigelser> unmarshallFile(File dataSet) {
+    private List<Bemyndigelser> unmarshallFile(File dataSet) throws JAXBException {
         List<Bemyndigelser> bemyndigelsesList = new ArrayList<Bemyndigelser>();
 
-        try {
-            JAXBContext jaxbContext = JAXBContext.newInstance(Bemyndigelser.class);
-            Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
-            File[] input = null;
-            if (dataSet.isDirectory()) {
-                input = dataSet.listFiles();
-            } else {
-                input = new File[]{dataSet};
-            }
+        JAXBContext jaxbContext = JAXBContext.newInstance(Bemyndigelser.class);
+        Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
+        File[] input = null;
+        if (dataSet.isDirectory()) {
+            input = dataSet.listFiles();
+        } else {
+            input = new File[]{dataSet};
+        }
 
-            for (int i = 0; i < input.length; i++) {
-                Bemyndigelser bemyndigelser = (Bemyndigelser) jaxbUnmarshaller.unmarshal(input[i]);
-                bemyndigelsesList.add(bemyndigelser);
-            }
-        } catch (JAXBException e) {
-            logger.error("", e);
+        for (int i = 0; i < input.length; i++) {
+            Bemyndigelser bemyndigelser = (Bemyndigelser) jaxbUnmarshaller.unmarshal(input[i]);
+            bemyndigelsesList.add(bemyndigelser);
         }
         return bemyndigelsesList;
     }

diff --git a/src/main/resources/db/migration/V20130529_0926__Bemyndigelse_krsviews.sql b/src/main/resources/db/migration/V20130529_0926__Bemyndigelse_krsviews.sql
@@ -0,0 +1,56 @@
+
+-- -----------------------------------------------------
+-- Someone has to create the SKRS tables first time
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `SKRSViewMapping` (
+  `idSKRSViewMapping` BIGINT(15) NOT NULL AUTO_INCREMENT ,
+  `register` VARCHAR(255) NOT NULL ,
+  `datatype` VARCHAR(255) NOT NULL ,
+  `version` INT NOT NULL ,
+  `tableName` VARCHAR(255) NOT NULL ,
+  `createdDate` TIMESTAMP NOT NULL ,
+  PRIMARY KEY (`idSKRSViewMapping`) ,
+  INDEX `idx` (`register` ASC, `datatype` ASC, `version` ASC) ,
+  UNIQUE INDEX `unique` (`register` ASC, `datatype` ASC, `version` ASC) )
+  ENGINE = InnoDB;
+CREATE  TABLE IF NOT EXISTS `SKRSColumns` (
+  `idSKRSColumns` BIGINT(15) NOT NULL AUTO_INCREMENT ,
+  `viewMap` BIGINT(15) NOT NULL ,
+  `isPID` TINYINT NOT NULL ,
+  `tableColumnName` VARCHAR(255) NOT NULL ,
+  `feedColumnName` VARCHAR(255) NULL ,
+  `feedPosition` INT NOT NULL ,
+  `dataType` INT NOT NULL ,
+  `maxLength` INT NULL ,
+  PRIMARY KEY (`idSKRSColumns`) ,
+  INDEX `viewMap_idx` (`viewMap` ASC) ,
+  UNIQUE INDEX `viewColumn` (`tableColumnName` ASC, `viewMap` ASC) ,
+  CONSTRAINT `viewMap`
+  FOREIGN KEY (`viewMap` )
+  REFERENCES `SKRSViewMapping` (`idSKRSViewMapping` )
+    ON DELETE CASCADE
+    ON UPDATE NO ACTION)
+  ENGINE = InnoDB;
+
+-- ---------------------------------------------------------------------------------------------------------------------
+-- Bemyndigelse
+
+INSERT IGNORE INTO SKRSViewMapping (register, datatype, version, tableName, createdDate) VALUES ('bemyndigelsesservice', 'bemyndigelse', 1, 'Bemyndigelse', NOW());
+INSERT IGNORE INTO SKRSColumns (viewMap, isPID, tableColumnName, feedColumnName, feedPosition, dataType, maxLength) VALUES
+((SELECT idSKRSViewMapping FROM SKRSViewMapping WHERE register='bemyndigelsesservice' AND datatype='bemyndigelse' AND version=1), 1, 'PID',                              NULL, 0, -5, NULL),
+((SELECT idSKRSViewMapping FROM SKRSViewMapping WHERE register='bemyndigelsesservice' AND datatype='bemyndigelse' AND version=1), 0, 'kode',                           'kode', 1, 12, NULL),
+((SELECT idSKRSViewMapping FROM SKRSViewMapping WHERE register='bemyndigelsesservice' AND datatype='bemyndigelse' AND version=1), 0, 'bemyndigende_cpr',   'bemyndigende_cpr', 2, 12, NULL),
+((SELECT idSKRSViewMapping FROM SKRSViewMapping WHERE register='bemyndigelsesservice' AND datatype='bemyndigelse' AND version=1), 0, 'bemyndigede_cpr',     'bemyndigede_cpr', 3, 12, NULL),
+((SELECT idSKRSViewMapping FROM SKRSViewMapping WHERE register='bemyndigelsesservice' AND datatype='bemyndigelse' AND version=1), 0, 'bemyndigede_cvr',     'bemyndigede_cvr', 4, 12, NULL),
+((SELECT idSKRSViewMapping FROM SKRSViewMapping WHERE register='bemyndigelsesservice' AND datatype='bemyndigelse' AND version=1), 0, 'system',                       'system', 5, 12, NULL),
+((SELECT idSKRSViewMapping FROM SKRSViewMapping WHERE register='bemyndigelsesservice' AND datatype='bemyndigelse' AND version=1), 0, 'arbejdsfunktion',     'arbejdsfunktion', 6, 12, NULL),
+((SELECT idSKRSViewMapping FROM SKRSViewMapping WHERE register='bemyndigelsesservice' AND datatype='bemyndigelse' AND version=1), 0, 'rettighed',                 'rettighed', 7, 12, NULL),
+((SELECT idSKRSViewMapping FROM SKRSViewMapping WHERE register='bemyndigelsesservice' AND datatype='bemyndigelse' AND version=1), 0, 'status',                       'status', 8, 12, NULL),
+((SELECT idSKRSViewMapping FROM SKRSViewMapping WHERE register='bemyndigelsesservice' AND datatype='bemyndigelse' AND version=1), 0, 'godkendelses_dato', 'godkendelses_dato', 9, 12, NULL),
+((SELECT idSKRSViewMapping FROM SKRSViewMapping WHERE register='bemyndigelsesservice' AND datatype='bemyndigelse' AND version=1), 0, 'oprettelses_dato',   'oprettelses_dato',10, 12, NULL),
+((SELECT idSKRSViewMapping FROM SKRSViewMapping WHERE register='bemyndigelsesservice' AND datatype='bemyndigelse' AND version=1), 0, 'modificeret_dato',   'modificeret_dato',11, 12, NULL),
+((SELECT idSKRSViewMapping FROM SKRSViewMapping WHERE register='bemyndigelsesservice' AND datatype='bemyndigelse' AND version=1), 0, 'gyldig_fra_dato',     'gyldig_fra_dato',12, 12, NULL),
+((SELECT idSKRSViewMapping FROM SKRSViewMapping WHERE register='bemyndigelsesservice' AND datatype='bemyndigelse' AND version=1), 0, 'gyldig_til_dato',     'gyldig_til_dato',13, 12, NULL),
+((SELECT idSKRSViewMapping FROM SKRSViewMapping WHERE register='bemyndigelsesservice' AND datatype='bemyndigelse' AND version=1), 0, 'ModifiedDate',                     NULL, 0, 93, 12),
+((SELECT idSKRSViewMapping FROM SKRSViewMapping WHERE register='bemyndigelsesservice' AND datatype='bemyndigelse' AND version=1), 0, 'ValidFrom',                 'ValidFrom',14, 93, 12),
+((SELECT idSKRSViewMapping FROM SKRSViewMapping WHERE register='bemyndigelsesservice' AND datatype='bemyndigelse' AND version=1), 0, 'ValidTo',                     'ValidTo',15, 93, 12);
diff --git a/src/test/java/dk/nsi/sdm4/bemyndigelse/parser/BemyndigelseParserTest.java b/src/test/java/dk/nsi/sdm4/bemyndigelse/parser/BemyndigelseParserTest.java
@@ -120,7 +120,7 @@ public void parseXML() {
     public void testParseFile() {
         File file = FileUtils.toFile(getClass().getClassLoader().getResource("data/bemyndigelse/valid/20120329_102310000_v1.bemyndigelse.xml"));
 
-        parser.process(file);
+        parser.process(file, "");
 
         assertEquals("2 bemyndigelser expected",2, jdbcTemplate.queryForInt("SELECT Count(*) FROM " + BemyndigelseRecordSpecs.ENTRY_RECORD_SPEC.getTable()));
     }
@@ -129,7 +129,7 @@ public void testParseFile() {
     public void testParseFiles() {
         File file = FileUtils.toFile(getClass().getClassLoader().getResource("data/bemyndigelse/valid/"));
 
-        parser.process(file);
+        parser.process(file, "");
 
         assertEquals("3 bemyndigelser expected",3, jdbcTemplate.queryForInt("SELECT Count(*) FROM " + BemyndigelseRecordSpecs.ENTRY_RECORD_SPEC.getTable()));
     }
@@ -140,7 +140,7 @@ public void testParseFiles() {
     public void testNSPSupport150() {
         File file = FileUtils.toFile(getClass().getClassLoader().getResource("data/nspsupport150/20121130_140213497_v00001.bemyndigelse.xml"));
 
-        parser.process(file);
+        parser.process(file, "");
 
         assertEquals("10 bemyndigelser expected",10, jdbcTemplate.queryForInt("SELECT Count(*) FROM " + BemyndigelseRecordSpecs.ENTRY_RECORD_SPEC.getTable()));
 
@@ -168,11 +168,11 @@ public Bemyndigelse mapRow(ResultSet rs, int rowNumber)
     public void testNSP1674() {
         File file = FileUtils.toFile(getClass().getClassLoader().getResource("data/nsp1674/20120329_102310000_v1.bemyndigelse.xml"));
 
-        parser.process(file);
+        parser.process(file, "");
         assertEquals("2 bemyndigelser expected",2, jdbcTemplate.queryForInt("SELECT Count(*) FROM " + BemyndigelseRecordSpecs.ENTRY_RECORD_SPEC.getTable()));
 
         File update = FileUtils.toFile(getClass().getClassLoader().getResource("data/nsp1674/20120329_102310000_opdatering_v1.bemyndigelse.xml"));
-        parser.process(update);
+        parser.process(update, "");
         assertEquals(3, jdbcTemplate.queryForInt("SELECT Count(*) FROM " + BemyndigelseRecordSpecs.ENTRY_RECORD_SPEC.getTable()));
     }
 
@@ -181,7 +181,7 @@ public void testParseDataWithInvalidKode() {
 
         File file = FileUtils.toFile(getClass().getClassLoader().getResource("data/invalidKode/"));
     	try {
-            parser.process(file);
+            parser.process(file, "");
     	} catch(ParserException e) {
     		NullPointerException ne = (NullPointerException)e.getCause();
     		assertEquals("Bemyndigelse.kode cannot be null", ne.getMessage());
@@ -193,7 +193,7 @@ public void testParseDataWithInvalidArbejdsfunktion() {
 
         File file = FileUtils.toFile(getClass().getClassLoader().getResource("data/invalidArbejdsfunktion/"));
     	try {
-            parser.process(file);
+            parser.process(file, "");
     	} catch(ParserException e) {
     		NullPointerException ne = (NullPointerException)e.getCause();
     		assertEquals("Bemyndigelse.arbejdsfunktion cannot be null where kode = 1", ne.getMessage());