Gstione customKey

Leonardo Vannucci

2019-04-03 84d99d0f0700b2a19f504b21b1747275251305d8

Gstione customKey

 dg1cloud-core/src/main/java/it/digione/dg1cloud/model/RegDocument.java
..
..
@@ -53,6 +53,9 @@
53
53
 	@Column(name="secret_key")
54
54
 	private String secretKey;
55
55
 	
56
+	@Column(name="custom_key")
57
+	private String customKey;
58
+	
56
59
 	public RegDocument() {
57
60
 	}
58
61
 	
..
..
@@ -153,11 +156,19 @@
153
156
 		this.secretKey = secretKey;
154
157
 	}
155
158
 
159
+	public String getCustomKey() {
160
+		return customKey;
161
+	}
162
+
163
+	public void setCustomKey(String customKey) {
164
+		this.customKey = customKey;
165
+	}
166
+
156
167
 	@Override
157
168
 	public String toString() {
158
169
 		return "RegDocument [documentId=" + documentId + ", created=" + created + ", createdBy=" + createdBy
159
170
 				+ ", modified=" + modified + ", modifiedBy=" + modifiedBy + ", fileHash=" + fileHash + ", filePath="
160
-				+ filePath + ", fileSize=" + fileSize + ", dueDate=" + dueDate + "]";
171
+				+ filePath + ", fileSize=" + fileSize + ", dueDate=" + dueDate + ", customKey=" + customKey + "]";
161
172
 	}
162
173
 	
163
174
 }
 dg1cloud-core/src/main/java/it/digione/dg1cloud/pojo/UploadedFileDescriptor.java
..
..
@@ -8,6 +8,7 @@
8
8
 	private String sha256;
9
9
 	private Date dueDate; //Data nel formato ISO-8601 - es: 2018-07-27T18:25:43.511Z
10
10
 	private String secretKey;
11
+	private String customKey;
11
12
 	
12
13
 	public String getFileName() {
13
14
 		return fileName;
..
..
@@ -33,4 +34,10 @@
33
34
 	public void setSecretKey(String secretKey) {
34
35
 		this.secretKey = secretKey;
35
36
 	}
37
+	public String getCustomKey() {
38
+		return customKey;
39
+	}
40
+	public void setCustomKey(String customKey) {
41
+		this.customKey = customKey;
42
+	}
36
43
 }
 dg1cloud-core/src/main/java/it/digione/dg1cloud/repository/RegDocumentRepository.java
..
..
@@ -15,9 +15,12 @@
15
15
 @Transactional( propagation = Propagation.REQUIRED )
16
16
 public interface RegDocumentRepository extends JpaRepository<RegDocument, Long> {
17
17
 	
18
-	@Query("SELECT d FROM RegDocument d WHERE d.fileHash = :fileHash and d.fileName = :fileName")
19
-	RegDocument findOneByHashAndName(@Param("fileHash") String fileHash, @Param("fileName") String fileName);
18
+	@Query("SELECT d FROM RegDocument d WHERE d.fileHash = :fileHash and d.fileName = :fileName and d.createdBy = :userName")
19
+	RegDocument findOneByHashAndName(@Param("fileHash") String fileHash, @Param("fileName") String fileName, @Param("userName") String userName);
20
20
 	
21
21
 	@Query("SELECT d FROM RegDocument d WHERE CURRENT_DATE > d.dueDate")
22
22
 	List<RegDocument> findAllRegDocumentExpired();
23
+	
24
+	@Query("SELECT d FROM RegDocument d WHERE d.customKey = :customKey")
25
+	RegDocument findOneByCustomKey(@Param("customKey") String customKey);
23
26
 }
 dg1cloud-core/src/main/java/it/digione/dg1cloud/service/CloudService.java
..
..
@@ -18,6 +18,7 @@
18
18
 import org.apache.commons.codec.digest.DigestUtils;
19
19
 import org.apache.commons.io.FileUtils;
20
20
 import org.apache.commons.io.FilenameUtils;
21
+import org.apache.logging.log4j.util.Strings;
21
22
 import org.slf4j.Logger;
22
23
 import org.slf4j.LoggerFactory;
23
24
 import org.springframework.beans.factory.annotation.Autowired;
..
..
@@ -165,10 +166,17 @@
165
166
 			throw new RuntimeException("Errore caricamento classe dal json del descrittore", e);
166
167
 		}
167
168
 		
168
-		logger.debug("Controllo esistenza file sul db");
169
-		RegDocument regDocument = regDocumentRepository.findOneByHashAndName(uploadedFileDescriptor.getSha256(), uploadedFileDescriptor.getFileName());
170
-		
171
169
 		String userName = cloudFileDescriptor.getParentFile().getName();
170
+		
171
+		RegDocument regDocument = null;
172
+		if ( Strings.isBlank(uploadedFileDescriptor.getCustomKey()) == false ) {
173
+			logger.debug("Controllo esistenza file sul db tramite customKey {}", uploadedFileDescriptor.getCustomKey());
174
+			regDocument = regDocumentRepository.findOneByCustomKey(uploadedFileDescriptor.getCustomKey());
175
+		} else {
176
+			logger.debug("Controllo esistenza file sul db");
177
+			regDocument = regDocumentRepository.findOneByHashAndName(uploadedFileDescriptor.getSha256(),
178
+					uploadedFileDescriptor.getFileName(), userName);
179
+		}
172
180
 		
173
181
 		File uploadedFile = new File(getUploadedFilePath(cloudFileDescriptorPath));
174
182
 		
..
..
@@ -177,19 +185,20 @@
177
185
 			logger.debug("Creazione nuovo record per il documento da conservare");
178
186
 			regDocument = new RegDocument();
179
187
 			regDocument.setCreatedBy(userName);
180
-			regDocument.setModifiedBy(userName);
181
-			regDocument.setFileHash(uploadedFileDescriptor.getSha256());
182
-			regDocument.setFileName(uploadedFileDescriptor.getFileName());
183
-			regDocument.setFileSize(uploadedFile.length());
184
-			regDocument.setDueDate(uploadedFileDescriptor.getDueDate());
185
-			regDocument.setFilePath("");
186
-			regDocument.setSecretKey(uploadedFileDescriptor.getSecretKey());
187
-			
188
-			regDocumentRepository.save(regDocument);
189
-			
190
188
 		} else {
191
189
 			logger.debug("Trovato 1 record per il documento da memorizzare");
192
190
 		}
191
+		
192
+		regDocument.setModifiedBy(userName);
193
+		regDocument.setFileHash(uploadedFileDescriptor.getSha256());
194
+		regDocument.setFileName(uploadedFileDescriptor.getFileName());
195
+		regDocument.setFileSize(uploadedFile.length());
196
+		regDocument.setDueDate(uploadedFileDescriptor.getDueDate());
197
+		regDocument.setFilePath("");
198
+		regDocument.setSecretKey(uploadedFileDescriptor.getSecretKey());
199
+		regDocument.setCustomKey(uploadedFileDescriptor.getCustomKey());
200
+		
201
+		regDocumentRepository.save(regDocument);
193
202
 		
194
203
 		try {
195
204
 			moveUploadedFileToStorage(uploadedFile.getAbsolutePath(), regDocument);
..
..
@@ -216,8 +225,6 @@
216
225
 	private void moveUploadedFileToStorage( String source, RegDocument regDocument ) throws IOException {
217
226
 		logger.debug("Spostamento file nello storage");
218
227
 		
219
-		String sha256Descriptor = regDocument.getFileHash();
220
-		
221
228
 		File sourceFile = new File(source);
222
229
 		File destinationFile = new File(generateStoragePath(regDocument));
223
230
 		
..
..
@@ -226,15 +233,8 @@
226
233
 			FileUtils.forceMkdirParent(destinationFile);
227
234
 			FileUtils.copyFile(sourceFile, destinationFile);
228
235
 		} else {
229
-			logger.debug("Il file risulta gia' presente nello storage. Verifico l'integrita'");
230
-			FileInputStream fis = new FileInputStream(destinationFile);
231
-			String hash = DigestUtils.sha256Hex(fis);
232
-			fis.close();
233
-			if ( sha256Descriptor.equalsIgnoreCase(hash) == false ) {
234
-				throw new IllegalStateException("L'hash del file nello storage non corrisponde con l'hash dichiarato nel descrittore del file:\n\t" +
235
-					"hash file inviato: " + hash + "\n\t" +
236
-					"hash dichiarato nel descrittore: " + sha256Descriptor);
237
-			}
236
+			logger.debug("Il file risulta gia' presente nello storage. Aggiorno il file");
237
+			FileUtils.copyFile(sourceFile, destinationFile);
238
238
 		}
239
239
 		
240
240
 		regDocument.setFilePath(destinationFile.getAbsolutePath());
 dg1cloud-core/src/main/resources/application.properties
..
..
@@ -13,6 +13,7 @@
13
13
 
14
14
 spring.jmx.default-domain=dg1cloud
15
15
 
16
+spring.flyway.enabled=true
16
17
 #server.address=vannux.grupposistematica.it
17
18
 server.error.include-stacktrace=always
18
19