s

.github/workflows/maven.yml

@@ -0,0 +1,33 @@
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ master,'evaluation' ]
+  pull_request:
+    branches: [ master,'evaluation' ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        fetch-depth: 0
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Run aLegalementDroitADesCongesPayesTest
+      run: mvn -B test -Dtest=com.ipi.jva350.aLegalementDroitADesCongesPayesTest --file pom.xml
+    - name: Run estJourOuvrableTest
+      run: mvn -B test -Dtest=com.ipi.jva350.estJourOuvrableTest --file pom.xml
+    - name: Run testCalculeJoursDeCongeDecomptesPourPlage
+      run: mvn -B test -Dtest=com.ipi.jva350.testCalculeJoursDeCongeDecomptesPourPlage --file pom.xml
+    - name: Run estDansPlageTest
+      run: mvn -B test -Dtest=com.ipi.jva350.estDansPlageTest --file pom.xml
+    - name: Run estjourFerieTest
+      run: mvn -B test -Dtest=com.ipi.jva350.estjourFerieTest --file pom.xml
+

.gitignore

@@ -26,3 +26,4 @@
 
 mvnw*
 .mvn
+/bin/

.metadata/.log

@@ -0,0 +1,34 @@
+!SESSION 2024-02-19 09:35:04.277 -----------------------------------------------
+eclipse.buildId=4.30.0.20231201-1200
+java.version=17.0.9
+java.vendor=Eclipse Adoptium
+BootLoader constants: OS=linux, ARCH=x86_64, WS=gtk, NL=fr_FR
+Framework arguments:  -product org.eclipse.epp.package.java.product
+Command-line arguments:  -os linux -ws gtk -arch x86_64 -product org.eclipse.epp.package.java.product
+
+!ENTRY ch.qos.logback.classic 1 0 2024-02-19 09:35:09.571
+!MESSAGE Activated before the state location was initialized. Retry after the state location is initialized.
+
+!ENTRY ch.qos.logback.classic 1 0 2024-02-19 09:36:30.615
+!MESSAGE Logback config file: /home/nicolas/Documents/code/java/ipi-jva350-tptd/.metadata/.plugins/org.eclipse.m2e.logback/logback.2.2.1.20231030-1438.xml
+
+!ENTRY org.eclipse.jface 2 0 2024-02-19 09:36:31.988
+!MESSAGE Keybinding conflicts occurred.  They may interfere with normal accelerator operation.
+!SUBENTRY 1 org.eclipse.jface 2 0 2024-02-19 09:36:31.988
+!MESSAGE A conflict occurred for CTRL+SHIFT+T:
+Binding(CTRL+SHIFT+T,
+	ParameterizedCommand(Command(org.eclipse.jdt.ui.navigate.open.type,Open Type,
+		Open a type in a Java editor,
+		Category(org.eclipse.ui.category.navigate,Navigate,null,true),
+		WorkbenchHandlerServiceHandler("org.eclipse.jdt.ui.navigate.open.type"),
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)
+Binding(CTRL+SHIFT+T,
+	ParameterizedCommand(Command(org.eclipse.lsp4e.symbolinworkspace,Go to Symbol in Workspace,
+		,
+		Category(org.eclipse.lsp4e.category,Language Servers,null,true),
+		WorkbenchHandlerServiceHandler("org.eclipse.lsp4e.symbolinworkspace"),
+		,,true),null),
+	org.eclipse.ui.defaultAcceleratorConfiguration,
+	org.eclipse.ui.contexts.window,,,system)

.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version

@@ -0,0 +1 @@
+

.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version

@@ -0,0 +1 @@
+

.metadata/.plugins/org.eclipse.jdt.core/javaLikeNames.txt

@@ -0,0 +1 @@
+java

.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<typeInfoHistroy/>

.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<qualifiedTypeNameHistroy/>

.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section name="Workbench">
+	<section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart">
+		<item key="group_libraries" value="true"/>
+		<item key="layout" value="2"/>
+		<item key="rootMode" value="1"/>
+		<item key="linkWithEditor" value="false"/>
+		<item key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#x0A;&lt;packageExplorer group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;1&quot; workingSetName=&quot;Aggregate for window 1708331793144&quot;&gt;&#x0A;&lt;customFilters userDefinedPatternsEnabled=&quot;false&quot;&gt;&#x0A;&lt;xmlDefinedFilters&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.StaticsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.buildship.ui.packageexplorer.filter.gradle.buildfolder&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.mylyn.java.ui.MembersFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.m2e.MavenModuleFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.buildship.ui.packageexplorer.filter.gradle.subProject&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.DeprecatedMembersFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LibraryFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.FieldsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;/xmlDefinedFilters&gt;&#x0A;&lt;/customFilters&gt;&#x0A;&lt;/packageExplorer&gt;"/>
+	</section>
+</section>

.metadata/.plugins/org.eclipse.m2e.logback/0.log

@@ -0,0 +1 @@
+2024-02-19 09:36:34,035 [Worker-5: Loading available Gradle versions] INFO  o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is not available. Remote download required.

.metadata/.plugins/org.eclipse.m2e.logback/logback.2.2.1.20231030-1438.xml

@@ -0,0 +1,41 @@
+<configuration scan="true">
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
+    </encoder>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>${org.eclipse.m2e.log.console.threshold:-OFF}</level> <!-- change to DEBUG to mimic '-consolelog' behaviour -->
+    </filter>
+  </appender>
+
+  <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <File>${org.eclipse.m2e.log.dir}/0.log</File>
+    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+      <FileNamePattern>${org.eclipse.m2e.log.dir}/%i.log</FileNamePattern>
+      <MinIndex>1</MinIndex>
+      <MaxIndex>10</MaxIndex>
+    </rollingPolicy>
+    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+      <MaxFileSize>10MB</MaxFileSize>
+    </triggeringPolicy>
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="EclipseLog" class="org.eclipse.m2e.logback.appender.EclipseLogAppender">
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>WARN</level>
+    </filter>
+  </appender>
+
+  <appender name="MavenConsoleLog" class="org.eclipse.m2e.logback.appender.MavenConsoleAppender">
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="FILE" />
+    <appender-ref ref="STDOUT" />
+    <appender-ref ref="EclipseLog" />
+    <appender-ref ref="MavenConsoleLog" />
+  </root>
+</configuration>

.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section name="Workbench">
+</section>

.metadata/.plugins/org.eclipse.ui.intro/introstate

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<state reopen="false"/>

.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workingSetManager>
+<workingSet editPageId="org.eclipse.jdt.internal.ui.DynamicSourcesWorkingSet" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1708331792720_0" label="Java Main Sources" name="Java Main Sources"/>
+<workingSet editPageId="org.eclipse.jdt.internal.ui.DynamicSourcesWorkingSet" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1708331792731_1" label="Java Test Sources" name="Java Test Sources"/>
+<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1708331793144_2" label="Window Working Set" name="Aggregate for window 1708331793144"/>
+</workingSetManager>

.metadata/version.ini

@@ -0,0 +1,3 @@
+#Mon Feb 19 09:36:30 CET 2024
+org.eclipse.core.runtime=2
+org.eclipse.platform=4.30.0.v20231201-0110

src/main/java/com/ipi/jva350/model/Entreprise.java

@@ -1,13 +1,15 @@
 package com.ipi.jva350.model;
 
+import java.io.Console;
+import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.util.*;
 
 public final class Entreprise {
 
     private static final Map<Integer, LocalDate> datePaque = new HashMap<>();
 
-    private Entreprise() {
+    public Entreprise() {
 
     }
 
@@ -64,13 +66,14 @@ public static List<LocalDate> joursFeries(LocalDate now){
                 LocalDate.of(now.getYear(), 11,11),
                 // 25 décembre Noël
                 LocalDate.of(now.getYear(), 12,25)
-
         );
     }
 
     public static boolean bissextile(int y) {
-        String tmp = String.valueOf(y);
-        if (tmp.charAt(2) == '1' || tmp.charAt(2) == '3' || tmp.charAt(2) == 5 || tmp.charAt(2) == '7' || tmp.charAt(2) == '9') {
+        if((y%100!=0 || y%400==0) && (y%4==0)) {
+        	return true;
+        }
+    	/*if (tmp.charAt(2) == '1' || tmp.charAt(2) == '3' || tmp.charAt(2) == 5 || tmp.charAt(2) == '7' || tmp.charAt(2) == '9') {
             if (tmp.charAt(3)=='2'||tmp.charAt(3)=='6') return true;
             else
                 return false;
@@ -79,7 +82,7 @@ public static boolean bissextile(int y) {
                 return false;
             }
             if (tmp.charAt(3)=='0'||tmp.charAt(3)=='4'||tmp.charAt(3)=='8')return true;
-        }
+        }*/
         return false;
     }
 
@@ -123,20 +126,30 @@ public static double proportionPondereeDuMois(LocalDate moisDuConge) {
     }
 
 
-    public static LocalDate getPremierJourAnneeDeConges(LocalDate d) {
-        return d == null ? null
-                : d.getMonthValue() > 5 ? LocalDate.of(d.getMonthValue(), 6, 1)
-                : LocalDate.of(d.getYear() - 1, 6, 1);
+    public static LocalDate getPremierJourAnneeDeConges(LocalDate date) {
+        if (date == null) {
+            return null;
+        } else {
+            int mois = date.getMonthValue();
+            int annee = date.getYear();
+
+            LocalDate premierJourConges = (mois > 5) ? LocalDate.of(annee, 6, 1) : LocalDate.of(annee - 1, 6, 1);
+
+            return premierJourConges;
+        }
     }
 
     public static boolean estJourFerie(LocalDate jour) {
-        int monEntier = (int) Entreprise.joursFeries(jour).stream().filter(d ->
-                d.equals(jour)).count();
-        int test = bissextile(jour.getYear()) ? 1 : 0;
-        if (test != 0 && !(monEntier > 1)) {
-            test--;
+        List<LocalDate> joursFeries = Entreprise.joursFeries(jour);
+
+        int nombreOccurrences = (int) joursFeries.stream().filter(d -> d.equals(jour)).count();
+        int ajustementBissextile = (bissextile(jour.getYear())) ? 1 : 0;
+
+        if (ajustementBissextile != 0 && nombreOccurrences <= 1) {
+            ajustementBissextile--;
         }
-        return monEntier != test;
+
+        return nombreOccurrences != ajustementBissextile;
     }
 
     /**
@@ -147,8 +160,10 @@ public static boolean estJourFerie(LocalDate jour) {
      * @return
      */
     public static boolean estDansPlage(LocalDate d, LocalDate debut, LocalDate fin) {
-        // à implémenter en TDD !
-        throw new RuntimeException("à implémenter en TDD !");
+    	Date dD = new Date(d.getYear() - 1900, d.getMonthValue() - 1, d.getDayOfMonth());
+    	Date debutD = new Date(debut.getYear() - 1900, debut.getMonthValue() - 1, debut.getDayOfMonth());
+    	Date fintD = new Date(fin.getYear() - 1900, fin.getMonthValue() - 1, fin.getDayOfMonth());
+    	return (debutD.getTime() < dD.getTime() && dD.getTime() < fintD.getTime());
     }
 
 }

src/main/java/com/ipi/jva350/model/SalarieAideADomicile.java

@@ -72,7 +72,7 @@ public SalarieAideADomicile(String nom, LocalDate moisDebutContrat, LocalDate mo
      * @return
      */
     public boolean aLegalementDroitADesCongesPayes() {
-        return this.getJoursTravaillesAnneeNMoins1() > 10;
+        return this.getJoursTravaillesAnneeNMoins1() >= 10;
     }
 
     /**

src/main/java/com/ipi/jva350/repository/SalarieAideADomicileRepository.java

@@ -11,5 +11,5 @@ public interface SalarieAideADomicileRepository extends JpaRepository<SalarieAid
     SalarieAideADomicile findByNom(String nom);
 
     @Query("select sum(congesPayesPrisAnneeNMoins1)/sum(congesPayesAcquisAnneeNMoins1) from SalarieAideADomicile")
-    Double partCongesPrisTotauxAnneeNMoins1();
+	 Double partCongesPrisTotauxAnneeNMoins1();
 }

src/main/java/com/ipi/jva350/service/SalarieAideADomicileService.java

@@ -18,10 +18,11 @@
 public class SalarieAideADomicileService {
 
     @Autowired
-    private SalarieAideADomicileRepository salarieAideADomicileRepository;
+    public static SalarieAideADomicileRepository salarieAideADomicileRepository;
 
     public SalarieAideADomicileService() {
     }
+
 
     /**
      * Créée un nouveau salarié en base de données.
@@ -58,7 +59,7 @@ public void creerSalarieAideADomicile(SalarieAideADomicile salarieAideADomicile)
      * @param dernierJourDeConge demandé
      * @return arrondi à l'entier le plus proche
      */
-    public long calculeLimiteEntrepriseCongesPermis(LocalDate moisEnCours, double congesPayesAcquisAnneeNMoins1,
+    public static long calculeLimiteEntrepriseCongesPermis(LocalDate moisEnCours, double congesPayesAcquisAnneeNMoins1,
                                                       LocalDate moisDebutContrat,
                                                       LocalDate premierJourDeConge, LocalDate dernierJourDeConge) {
         // proportion selon l'avancement dans l'année, pondérée avec poids plus gros sur juillet et août (20 vs 8) :

src/test/java/com/ipi/jva350/StepDefinitions.java

@@ -19,7 +19,6 @@ public class StepDefinitions {
     public void today_is_Sunday() {
         today = "Sunday";
     }
-
     @When("I ask whether it's Friday yet")
     public void i_ask_whether_it_s_Friday_yet() {
         actualAnswer = IsItFriday.isItFriday(today);
@@ -29,5 +28,4 @@ public void i_ask_whether_it_s_Friday_yet() {
     public void i_should_be_told(String expectedAnswer) {
         assertEquals(expectedAnswer, actualAnswer);
     }
-
 }

src/test/java/com/ipi/jva350/aLegalementDroitADesCongesPayesTest.java

@@ -0,0 +1,32 @@
+package com.ipi.jva350;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import com.ipi.jva350.model.SalarieAideADomicile;
+public class aLegalementDroitADesCongesPayesTest {
+	   @Test
+	    public void aLegalementDroitADesCongesPayes1(){
+	       // Given
+	       double joursTravaillesAnneeNMoins1=1;
+	       SalarieAideADomicile salarie=new SalarieAideADomicile();
+	       salarie.setJoursTravaillesAnneeNMoins1(joursTravaillesAnneeNMoins1);
+	       // When
+	       boolean joursTravaillesAnneeNMoins1OK=salarie.aLegalementDroitADesCongesPayes();
+	       // Then
+	       assertFalse(joursTravaillesAnneeNMoins1OK);
+	   }
+	   @Test
+	   public void aLegalementDroitADesCongesPayes90(){
+	      // Given
+	      double joursTravaillesAnneeNMoins1=90;
+	      SalarieAideADomicile salarie=new SalarieAideADomicile();
+	      salarie.setJoursTravaillesAnneeNMoins1(joursTravaillesAnneeNMoins1);
+	      // When
+	      boolean joursTravaillesAnneeNMoins1OK=salarie.aLegalementDroitADesCongesPayes();
+	      // Then
+	      assertTrue(joursTravaillesAnneeNMoins1OK);
+	   }
+}

src/test/java/com/ipi/jva350/calculeLimiteEntrepriseCongesPermis.java

@@ -0,0 +1,43 @@
+package com.ipi.jva350;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.time.LocalDate;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.ipi.jva350.repository.SalarieAideADomicileRepository;
+import com.ipi.jva350.service.SalarieAideADomicileService;
+
+@ExtendWith(MockitoExtension.class)
+public class calculeLimiteEntrepriseCongesPermis {
+    //Pour test unitaire MOCK
+    @Mock
+    private SalarieAideADomicileRepository salarieAideADomicileRepository;
+    @InjectMocks
+    private SalarieAideADomicileService salarieAideADomicileService = new SalarieAideADomicileService();
+	//je vois pas pourquoi il y a une erreur
+    /*@Test
+    public void testIntegrationServiceCalculeLimiteEntrepriseCongesPermis(){
+        // Given
+        LocalDate moisEnCours = LocalDate.of(2023,11,1);
+        double congePayeAquisAnneeNMoins1 = 25.00;
+        LocalDate moisDebutContrat = LocalDate.of(2023, 1, 12);
+        LocalDate premierJourConge = LocalDate.of(2024, 1, 26);
+        LocalDate dernierJourConge = LocalDate.of(2022, 1, 30);
+        // When
+        long res = SalarieAideADomicileService.calculeLimiteEntrepriseCongesPermis(
+                moisEnCours,
+                congePayeAquisAnneeNMoins1,
+                moisDebutContrat,
+                premierJourConge,
+                dernierJourConge);
+        // Then : assertions sur le vrai état du système
+        assertEquals(1, 1);
+    }*/
+
+}