Skip to content

Commit

Permalink
Merge pull request #48 from abes-esr/402-message-erreur-faux
Browse files Browse the repository at this point in the history
Correction ppn notice imprimee
  • Loading branch information
SamuelQuetin authored Apr 17, 2024
2 parents b2d532f + a154927 commit 1d487da
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/main/java/fr/abes/kafkatosudoc/kafka/KbartListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,8 @@ public void listenKbartToDeleteFromKafka(ConsumerRecord<String, GenericRecord> p

/**
* @param ligneKbart : enregistrement dans Kafka
*/
**/

@KafkaListener(topics = {"${topic.name.source.kbart.exnihilo}"}, groupId = "${topic.groupid.source.exnihilo}", containerFactory = "kafkaKbartListenerContainerFactory")
public void listenKbartFromKafkaExNihilo(ConsumerRecord<String, LigneKbartConnect> ligneKbart) {
log.debug("Entrée dans création ex nihilo");
Expand Down Expand Up @@ -367,15 +368,17 @@ public void listenKbartFromKafkaImprime(ConsumerRecord<String, LigneKbartImprime
String packageName = CheckFiles.getPackageFromFilename(filename);
SudocService service = new SudocService();
NoticeConcrete noticeElec = null;
String ppn = "";
try {
//authentification sur la base maitre du sudoc pour récupérer la notice imprimée
service.authenticate(serveurSudoc, portSudoc, loginSudoc, passwordSudoc);

if (this.workInProgressMapImprime.get(filename).getListeNotices() != null && !this.workInProgressMapImprime.get(filename).getListeNotices().isEmpty()) {
for (LigneKbartImprime ligneKbartImprime : this.workInProgressMapImprime.get(filename).getListeNotices()) {
ppn = ligneKbartImprime.getPpn().toString();
KbartAndImprimeDto kbartAndImprimeDto = new KbartAndImprimeDto();
kbartAndImprimeDto.setKbart(mapper.map(ligneKbartImprime, LigneKbartImprime.class));
kbartAndImprimeDto.setNotice(service.getNoticeFromPpn(ligneKbartImprime.getPpn().toString()));
kbartAndImprimeDto.setNotice(service.getNoticeFromPpn(ppn));
noticeElec = mapper.map(kbartAndImprimeDto, NoticeConcrete.class);
//Ajout provider display name en 214 $c 2è occurrence
String providerDisplay = baconService.getProviderDisplayName(provider);
Expand All @@ -391,7 +394,7 @@ public void listenKbartFromKafkaImprime(ConsumerRecord<String, LigneKbartImprime
}
} catch (CBSException | ZoneException e) {
log.error(e.getMessage());
this.workInProgressMapImprime.get(filename).addErrorMessagesImprime(lignesKbart.value().getPpn().toString(), noticeElec != null ? noticeElec.getNoticeBiblio().toString() : "pas de notice trouvée", e.getMessage());
this.workInProgressMapImprime.get(filename).addErrorMessagesImprime(ppn, noticeElec != null ? noticeElec.getNoticeBiblio().toString() : "pas de notice trouvée", e.getMessage());
} finally {
try {
// On déconnecte du Sudoc, on envoie les messages d'erreurs s'il y a des erreurs et on supprime le WorkInProgress
Expand Down

0 comments on commit 1d487da

Please sign in to comment.