changed teh occurance date to start and end date for the saveUserItinerary creation api and sending all the data of host in the get by id api
This commit is contained in:
@@ -447,6 +447,45 @@ export class HostService {
|
||||
select: {
|
||||
id: true,
|
||||
logoPath: true,
|
||||
companyName: true,
|
||||
address1: true,
|
||||
address2: true,
|
||||
pinCode: true,
|
||||
isSubsidairy: true,
|
||||
registrationNumber: true,
|
||||
panNumber: true,
|
||||
gstNumber: true,
|
||||
formationDate: true,
|
||||
companyTypeXid: true,
|
||||
companyTypes: {
|
||||
select: {
|
||||
id: true,
|
||||
companyTypeName: true
|
||||
}
|
||||
},
|
||||
websiteUrl: true,
|
||||
instagramUrl: true,
|
||||
facebookUrl: true,
|
||||
linkedinUrl: true,
|
||||
twitterUrl: true,
|
||||
stepper: true,
|
||||
hostStatusInternal: true,
|
||||
hostStatusDisplay: true,
|
||||
adminStatusInternal: true,
|
||||
adminStatusDisplay: true,
|
||||
amStatus: true,
|
||||
agreementAccepted: true,
|
||||
assignedOn: true,
|
||||
agreementStartDate: true,
|
||||
isApproved: true,
|
||||
durationNumber: true,
|
||||
durationFrequency: true,
|
||||
isCommisionBase: true,
|
||||
commisionPer: true,
|
||||
amountPerBooking: true,
|
||||
payoutDurationNum: true,
|
||||
payoutDurationFrequency: true,
|
||||
referencedBy: true,
|
||||
hostParent: {
|
||||
select: {
|
||||
id: true,
|
||||
|
||||
@@ -68,14 +68,18 @@ export const handler = safeHandler(async (
|
||||
}
|
||||
|
||||
if (isCustomItineraryType) {
|
||||
const customStartDate = activity.startDate || activity.occurenceDate;
|
||||
const customEndDate = activity.endDate || activity.occurenceDate;
|
||||
|
||||
if (
|
||||
!activity.occurenceDate ||
|
||||
!customStartDate ||
|
||||
!customEndDate ||
|
||||
!activity.selectedStartTime ||
|
||||
!activity.selectedEndTime
|
||||
) {
|
||||
throw new ApiError(
|
||||
400,
|
||||
`${itineraryType} items must include occurenceDate, selectedStartTime and selectedEndTime.`,
|
||||
`${itineraryType} items must include startDate, endDate, selectedStartTime and selectedEndTime.`,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -139,6 +143,8 @@ export const handler = safeHandler(async (
|
||||
activity.kmForNextPoint !== null
|
||||
? Number(activity.kmForNextPoint)
|
||||
: undefined,
|
||||
startDate: activity.startDate ?? activity.occurenceDate,
|
||||
endDate: activity.endDate ?? activity.occurenceDate,
|
||||
occurenceDate: activity.occurenceDate,
|
||||
selectedStartTime: activity.selectedStartTime,
|
||||
selectedEndTime: activity.selectedEndTime,
|
||||
|
||||
@@ -466,6 +466,8 @@ export class ItineraryService {
|
||||
modeOfTravel: string;
|
||||
travelTimeBetweenPointsMins: number;
|
||||
kmForNextPoint?: number;
|
||||
startDate?: string;
|
||||
endDate?: string;
|
||||
occurenceDate?: string;
|
||||
selectedStartTime?: string;
|
||||
selectedEndTime?: string;
|
||||
@@ -546,23 +548,29 @@ export class ItineraryService {
|
||||
itineraryType === 'STAY' || itineraryType === 'FREE_TIME';
|
||||
|
||||
if (isCustomItineraryType) {
|
||||
const customStartDate =
|
||||
activityItem.startDate || activityItem.occurenceDate;
|
||||
const customEndDate =
|
||||
activityItem.endDate || activityItem.occurenceDate;
|
||||
|
||||
if (
|
||||
!activityItem.occurenceDate ||
|
||||
!customStartDate ||
|
||||
!customEndDate ||
|
||||
!activityItem.selectedStartTime ||
|
||||
!activityItem.selectedEndTime
|
||||
) {
|
||||
throw new ApiError(
|
||||
400,
|
||||
`${itineraryType} items must include occurenceDate, selectedStartTime and selectedEndTime.`,
|
||||
`${itineraryType} items must include startDate, endDate, selectedStartTime and selectedEndTime.`,
|
||||
);
|
||||
}
|
||||
|
||||
const customStartDateTime = combineDateAndTime(
|
||||
activityItem.occurenceDate,
|
||||
customStartDate,
|
||||
activityItem.selectedStartTime,
|
||||
);
|
||||
const customEndDateTime = combineDateAndTime(
|
||||
activityItem.occurenceDate,
|
||||
customEndDate,
|
||||
activityItem.selectedEndTime,
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user