Commit 92742a22 by kasmi

fix

parent b6e1c697
...@@ -313,9 +313,10 @@ public static final String customerKey = "univairmer.tours"; // Univairmer*/ ...@@ -313,9 +313,10 @@ public static final String customerKey = "univairmer.tours"; // Univairmer*/
}) })
.bean(UnmarshallingJAXB.class, "fromHotelAvailabilityResponse(${body})") .bean(UnmarshallingJAXB.class, "fromHotelAvailabilityResponse(${body})")
.log("ResponseMarshllerQuote --------------- : \n ${body}") // .log("ResponseMarshllerQuote --------------- : \n ${body}")
.process(new com.fractalite.hermes.teldar.parsers.ParserQuotesresponse()) .process(new com.fractalite.hermes.teldar.parsers.ParserQuotesresponse())
.log("bodyquoteeee --------------- : \n ${body}"); // .log("bodyquoteeee --------------- : \n ${body}")
;
/***************** HotelDetailsInfo *******************/ /***************** HotelDetailsInfo *******************/
......
...@@ -7,7 +7,9 @@ import java.util.ArrayList; ...@@ -7,7 +7,9 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Currency; import java.util.Currency;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathExpressionException;
...@@ -70,17 +72,61 @@ public class ParserQuotesresponse extends TeldarParsers { ...@@ -70,17 +72,61 @@ public class ParserQuotesresponse extends TeldarParsers {
requestForQuote = getHotelQuotes(resp.getAvailResponse(), exchange); requestForQuote = getHotelQuotes(resp.getAvailResponse(), exchange);
exchange.getIn().setBody(requestForQuote, RequestForQuote.class); exchange.getIn().setBody(requestForQuote, RequestForQuote.class);
exchange.getIn().setHeader("HermesPartnerId", "teldar"); exchange.getIn().setHeader("HermesPartnerId", "teldar");
logger.info("End TELDAR ParseHotelQuotesResponse Processor......." + ObjectToXml.printXML(requestForQuote)); logger.info("End TELDAR ParseHotelQuotesResponse Processor.......");// + ObjectToXml.printXML(requestForQuote));
} }
private RequestForQuote getHotelQuotes(AvailabilityResponse teldarHotel, Exchange exchange) private RequestForQuote getHotelQuotes(AvailabilityResponse teldarHotel, Exchange exchange)
throws XPathExpressionException { throws XPathExpressionException {
QuoteTemplate quoteTemplate = exchange.getProperty("hermesquery", QuoteTemplate.class); QuoteTemplate quoteTemplate = exchange.getProperty("hermesquery", QuoteTemplate.class);
ObjectToXml.printXML("QuoteTemplate "+ObjectToXml.printXML(quoteTemplate));
LocalDate checkin = quoteTemplate.getTrip().getContent(HotelStay.class).get(0).getCheckin(); LocalDate checkin = quoteTemplate.getTrip().getContent(HotelStay.class).get(0).getCheckin();
LocalDate checkout = quoteTemplate.getTrip().getContent(HotelStay.class).get(0).getCheckout(); LocalDate checkout = quoteTemplate.getTrip().getContent(HotelStay.class).get(0).getCheckout();
RequestForQuote requestForQuote = new RequestForQuote(quoteTemplate); RequestForQuote requestForQuote = new RequestForQuote(quoteTemplate);
int roomnbr=0;
logger.info("-----Room "+ObjectToXml.printXML(quoteTemplate));
/*for( StayItem2 stayIem: quoteTemplate.getPricing().getItems(StayItem2.class))
{
logger.info("-----Room "+roomnbr++);
for(Room rm : stayIem.getRooms())
{
for(Traveller tr : rm.getGuests(PaxType.CHILD))
{
logger.info("child found "+tr.getAge());
}
}
}*/
Map<String,Map<Integer,Byte>> quoteAges= new HashMap<String,Map<Integer, Byte>>();
int roomIndex=0;
for(Room rms:quoteTemplate.getTrip().getContent(HotelStay.class).get(0).getRooms())
{
Map children =new HashMap<Integer, Byte>();
int i=0;// index in the room
String key=rms.getGuests(PaxType.ADULT).size()+","+rms.getGuests(PaxType.CHILD).size();
for(Traveller tr:rms.getGuests())
{
if(tr.getClassification()==PaxType.CHILD)
{
logger.info("Room "+key+" puting age "+ tr.getAge()+" index "+i);
children.put(i, tr.getAge());
i++;
}
}
/*if(tr.getClassification()==PaxType.INFANT)
{
quoteAges.put(0, tr.getAge());
i++;
}*/
quoteAges.put(key, children);
roomIndex++;
}
roomIndex=0;
if (teldarHotel != null && teldarHotel.getHotelResponse() != null && !teldarHotel.getHotelResponse().isEmpty()) { if (teldarHotel != null && teldarHotel.getHotelResponse() != null && !teldarHotel.getHotelResponse().isEmpty()) {
logger.info(" \n 12teldarHotel" + teldarHotel + "̣ size " +teldarHotel.getHotelResponse().size()); logger.info(" \n 12teldarHotel" + teldarHotel + "̣ size " +teldarHotel.getHotelResponse().size());
for (HotelResponse respHotel : teldarHotel.getHotelResponse()) { for (HotelResponse respHotel : teldarHotel.getHotelResponse()) {
...@@ -179,27 +225,32 @@ public class ParserQuotesresponse extends TeldarParsers { ...@@ -179,27 +225,32 @@ public class ParserQuotesresponse extends TeldarParsers {
Quote quote = new Quote(Currency.getInstance("EUR")); Quote quote = new Quote(Currency.getInstance("EUR"));
Room room = null; Room room = null;
RoomType hermesRoomType = null; RoomType hermesRoomType = null;
for (int ad = 0; ad < roomOffer.getAdultsCount(); ad++) { for (int ad = 0; ad < roomOffer.getAdultsCount(); ad++) {
trs.add(new Traveller(PaxType.ADULT)); trs.add(new Traveller(PaxType.ADULT));
} }
String roomkey=roomOffer.getAdultsCount()+","+roomOffer.getChildrenCount();
int travellerCount=0; int travellerCount=0;
List<Integer> childrenAges = new ArrayList<Integer>(); List<Integer> childrenAges = new ArrayList<Integer>();
//Child child = new Child(); //Child child = new Child();
int j=0;
for (int ch = 0; ch < roomOffer.getChildrenCount(); ch++) { for (int ch = 0; ch < roomOffer.getChildrenCount(); ch++) {
//if (child.getAge()<2) //if (child.getAge()<2)
{ {
Traveller traveller = new Traveller(PaxType.CHILD, Byte.parseByte("10")); Traveller traveller = new Traveller(PaxType.CHILD, quoteAges.get(roomkey).get(j));
traveller.setId(Integer.toString(++travellerCount)); traveller.setId(Integer.toString(++travellerCount));
// traveller.setClassification(PaxType.CHILD); // traveller.setClassification(PaxType.CHILD);
trs.add(traveller); trs.add(traveller);
childrenAges.add(10); logger.info("Room "+roomkey+" getting age index "+j);
childrenAges.add(Integer.parseInt(""+quoteAges.get(roomkey).get(j)));
j++;
} }
} }
CodeNamePair board = null; CodeNamePair board = null;
if (roomOffer != null) { if (roomOffer != null) {
if (roomOffer.getRoomType() != null && roomOffer.getRoomType().getCode() != null if (roomOffer.getRoomType() != null && roomOffer.getRoomType().getCode() != null
...@@ -309,8 +360,9 @@ public class ParserQuotesresponse extends TeldarParsers { ...@@ -309,8 +360,9 @@ public class ParserQuotesresponse extends TeldarParsers {
requestForQuote.getQuotes().add(quote); requestForQuote.getQuotes().add(quote);
} }
} }
roomIndex++;
} }
} }
} }
......
Manifest-Version: 1.0
Bnd-LastModified: 1669751870709
Build-Jdk-Spec: 11
Bundle-ManifestVersion: 2
Bundle-Name: tdr
Bundle-SymbolicName: tldd-hotels
Bundle-Version: 0.0.1.SNAPSHOT
Created-By: Apache Maven Bundle Plugin 5.1.8
Export-Package: com.gekko_holding.webservice.v2_4;version="0.0.1";uses:=
"javax.xml.bind,javax.xml.bind.annotation,javax.xml.namespace,javax.xml
.ws",com.fractalite.hermes.teldar.parsers;version="0.0.1";uses:="com.fr
actalite.models.travel.stay,javax.xml.parsers,javax.xml.xpath,org.apach
e.camel,org.slf4j,org.springframework.stereotype,org.xml.sax",com.fract
alite.hermes.teldar.tools;version="0.0.1";uses:="com.fractalite.models.
travel.stay,javax.xml.bind.annotation",com.fractalite.hermes.teldar.cfg
;version="0.0.1";uses:="com.fractalite.hermes.services.stay,javax.xml.p
arsers,org.apache.camel.builder,org.w3c.dom,org.xml.sax",com.fractalite
.hermes.teldar.Marshaller;version="0.0.1";uses:="com.gekko_holding.webs
ervice.v2_4,org.apache.camel,org.springframework.stereotype",com.fracta
lite.hermes.teldar.services;version="0.0.1";uses:="com.fractalite.model
s.commerce,com.fractalite.models.travel.stay,com.gekko_holding.webservi
ce.v2_4,javax.xml.datatype,org.apache.camel,org.slf4j"
Import-Package: org.apache.camel;version="[2.8,3)",org.apache.camel.mode
l;version="[2.8,3)",org.apache.camel.model.language;version="[2.8,3)",o
rg.slf4j;version="[1.6,2)",org.xml.sax,org.joda.time;version="[1.5,2)",
org.joda.time.format;version="[1.5,2)",javax.xml.bind;version="[2.2,3)"
,javax.xml.bind.annotation;version="[2.2,3)",javax.xml.datatype,javax.x
ml.namespace,javax.xml.parsers,javax.xml.soap;version="[1.3,2)",javax.x
ml.transform,javax.xml.transform.dom,javax.xml.transform.stream,javax.x
ml.ws;version="[2.2,3)",javax.xml.xpath,org.apache.camel.builder;versio
n="[2.8,3)",com.fractalite.hermes.services.stay;version="[0.1,1)",com.f
ractalite.hermes.teldar.Marshaller;version="[0.0,1)",com.fractalite.her
mes.teldar.parsers;version="[0.0,1)",com.fractalite.hermes.teldar.servi
ces;version="[0.0,1)",com.fractalite.hermes.teldar.tools;version="[0.0,
1)",com.fractalite.models.commerce;version="[0.0,1)",com.fractalite.mod
els.common;version="[0.0,1)",com.fractalite.models.travel;version="[0.0
,1)",com.fractalite.models.travel.stay;version="[0.0,1)",com.gekko_hold
ing.webservice.v2_4;version="[0.0,1)",com.giata.desthotel.mapping;versi
on="[0.0,1)",com.google.i18n.phonenumbers,org.apache.camel.component.ht
tp4;version="[2.8,3)",org.apache.camel.converter.jaxb;version="[2.8,3)"
,org.apache.camel.spi;version="[2.8,3)",org.apache.servicemix.camel.nmr
,org.apache.servicemix.nmr.api,org.codehaus.jackson.map;version="[1.8,2
)",org.springframework.stereotype;version="[3.0,4)",org.w3c.dom,org.apa
che.camel.model.config;version="[2.8,3)",org.apache.camel.model.datafor
mat;version="[2.8,3)",org.apache.camel.model.loadbalancer;version="[2.8
,3)",org.springframework.beans.factory.config;version="[3.0,4)"
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.6))"
Tool: Bnd-6.3.1.202206071316
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment