From 4c5c9cf2b339a9ead36fefa9ed1e746828fcbdfa Mon Sep 17 00:00:00 2001
From: yann <yann_tho@outlook.fr>
Date: Sun, 27 Dec 2020 15:07:15 +0100
Subject: [PATCH] modif sur les datas csv

---
 ProjetGenieLogicielLoto.iml                | 47 +++++++++++-----------
 src/main/java/fr/myny/data/DataCsv.java    | 13 ++++--
 src/main/java/fr/myny/data/ImportData.java |  2 +-
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/ProjetGenieLogicielLoto.iml b/ProjetGenieLogicielLoto.iml
index 4766121..79671bd 100644
--- a/ProjetGenieLogicielLoto.iml
+++ b/ProjetGenieLogicielLoto.iml
@@ -1,25 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_13">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.25" level="project" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_13">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.25" level="project" />
+  </component>
 </module>
\ No newline at end of file
diff --git a/src/main/java/fr/myny/data/DataCsv.java b/src/main/java/fr/myny/data/DataCsv.java
index a6411cf..d7f6300 100644
--- a/src/main/java/fr/myny/data/DataCsv.java
+++ b/src/main/java/fr/myny/data/DataCsv.java
@@ -8,19 +8,22 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 public class DataCsv {
+
+    protected String destination;
+
     /**
      * Le constructeur de DataCsv
      */
     public DataCsv(){
-
+        this.destination = "src/test/resources/CsvFile";
     }
 
     /**
      * La methode de recuperation dun fichier csv
+     * @param fileZip : nom suivit du chemin du fichier zip
      */
     public void getCsv(String fileZip) throws IOException{
-        //"src/main/resources/loto_201911.zip"
-        File desDir = new File("src/main/resources/");
+        File desDir = new File(destination);
         byte[] buffer = new byte[1024];
         ZipInputStream zis = new ZipInputStream(new FileInputStream(fileZip));
         ZipEntry zipEntry = zis.getNextEntry();
@@ -50,7 +53,9 @@ public class DataCsv {
     }
 
     /**
-     * Methode d'extraction de fichier zip
+     * Methode verifiant si l extraction a bien ete faite
+     * @param destinationDir : chemin de destination
+     * @param zipEntry : zip cible
      */
      public File newFile(File destinationDir, ZipEntry zipEntry) throws IOException{
          File destFile = new File(destinationDir, zipEntry.getName());
diff --git a/src/main/java/fr/myny/data/ImportData.java b/src/main/java/fr/myny/data/ImportData.java
index 19cd60c..35e3508 100644
--- a/src/main/java/fr/myny/data/ImportData.java
+++ b/src/main/java/fr/myny/data/ImportData.java
@@ -15,7 +15,7 @@ public class ImportData {
      */
     ImportData(){
         this.url = "https://www.fdj.fr/jeux-de-tirage/loto/statistiques";
-        this.repDes = "src/test/resources/";
+        this.repDes = "src/test/resources/Download/";
     }
 
     /**