Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev dans test #131

Merged
merged 3 commits into from
Nov 25, 2024
Merged

Merge dev dans test #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c10ace
Version 1.0.6-SNAPSHOT [skip ci]
Nov 25, 2024
e95e3cb
FIX : Ajout exception dans calcul best ppn
pierre-maraval Nov 25, 2024
42da38e
Merge remote-tracking branch 'origin/develop' into develop
pierre-maraval Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
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.5</version>
<version>1.0.6-SNAPSHOT</version>
<packaging>jar</packaging>
<name>best-ppn-api</name>
<description>Api de calcul du best ppn pour bacon</description>
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/fr/abes/bestppn/service/KbartService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import fr.abes.bestppn.model.entity.bacon.ProviderPackage;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestClientException;

import java.io.IOException;
import java.net.URISyntaxException;
Expand Down Expand Up @@ -70,7 +71,7 @@ public void processConsumerRecord(LigneKbartDto ligneFromKafka, String providerN
workInProgress.get(filename).addKbartToSend(ligneFromKafka);
//quel que soit le résultat du calcul du best ppn on met à jour le timestamp correspondant à la consommation du message
workInProgress.get(filename).setTimestamp(Calendar.getInstance().getTimeInMillis());
} catch (IOException | BestPpnException | URISyntaxException ex) {
} catch (IOException | BestPpnException | URISyntaxException | RestClientException ex) {
if (isForced) {
this.workInProgress.get(filename).addKbartToSend(ligneFromKafka);
} else {
Expand Down
Loading