Skip to content

Commit

Permalink
Merge pull request #132 from abes-esr/develop
Browse files Browse the repository at this point in the history
Merge dev dans test
  • Loading branch information
SamuelQuetin authored Nov 27, 2024
2 parents 4e30e92 + 51ea500 commit c019e71
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</parent>
<groupId>fr.abes</groupId>
<artifactId>best-ppn-api</artifactId>
<version>1.0.6</version>
<version>1.0.7-SNAPSHOT</version>
<packaging>jar</packaging>
<name>best-ppn-api</name>
<description>Api de calcul du best ppn pour bacon</description>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/fr/abes/bestppn/service/BestPpnService.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ public BestPpn getBestPpn(LigneKbartDto kbart, String provider, boolean isForced
feedPpnListFromDoi(doi, provider, ppnElecScoredList, ppnPrintResultList);
}

if (ppnElecScoredList.isEmpty() && ppnPrintResultList.isEmpty() && kbart.getPublicationType().equals(PUBLICATION_TYPE.monograph.toString())) {
feedPpnListFromDat(kbart, ppnElecScoredList, ppnPrintResultList, provider);
}
//if (ppnElecScoredList.isEmpty() && ppnPrintResultList.isEmpty() && kbart.getPublicationType().equals(PUBLICATION_TYPE.monograph.toString())) {
// feedPpnListFromDat(kbart, ppnElecScoredList, ppnPrintResultList, provider);
//}

return getBestPpnByScore(kbart, ppnElecScoredList, ppnPrintResultList, isForced);
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/fr/abes/bestppn/service/BestPpnServiceTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ void getBestPpnTest04() throws IOException, URISyntaxException {
}


@Test
/* @Test
@DisplayName("Test 1 printFromDat ")
void getBestPpnTest06() throws IOException, BestPpnException, URISyntaxException {
String provider = "";
Expand Down Expand Up @@ -391,7 +391,7 @@ void getBestPpnTest06() throws IOException, BestPpnException, URISyntaxException
// Vérification
Assertions.assertEquals("300000002", result.getPpn());
Assertions.assertEquals(DESTINATION_TOPIC.PRINT_PPN_SUDOC, result.getDestination());
}
}*/

@Test
@DisplayName("Test printFromPrint & 0 printFromDat ")
Expand Down

0 comments on commit c019e71

Please sign in to comment.