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

Jump to bottom

accept:IEEE754Compatible=true by default #1089

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

accept:IEEE754Compatible=true by default #1089

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b7339ba
accept:IEEE754Compatible=true by default
sjvans Jun 18, 2024
e57320c
accept: '*/*' for cds^7
sjvans Jun 18, 2024
403cacd
Apply suggestions from code review
sjvans Jun 18, 2024
8ffc0c8
Merge branch 'main' into accept-IEEE754Compatible=true
johannes-vogel Nov 5, 2024
a63558b
Update package.json
johannes-vogel Nov 5, 2024
a09c298
decimal precision
johannes-vogel Nov 5, 2024
ee8cc79
Merge branch 'main' into accept-IEEE754Compatible=true
danjoa Nov 6, 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
42 changes: 20 additions & 22 deletions test/odata.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const { GET, POST, PATCH, axios, expect } = cds.test(__dirname+'/..')
const EDIT = (url) => POST (url+'/TravelService.draftEdit',{})
const SAVE = (url) => POST (url+'/TravelService.draftActivate')
axios.defaults.headers['content-type'] = 'application/json;IEEE754Compatible=true' // REVISIT: can be removed when @sap/cds 5.1.5 is released?
axios.defaults.headers.accept = 'application/json;IEEE754Compatible=true' //> for cds^7; decimals and int64s as strings with cds^8 to ensure precision
axios.defaults.auth = { username: 'alice', password: 'admin' }

describe ("Basic Querying", () => {
Expand Down Expand Up @@ -43,7 +44,7 @@ describe ("Basic Querying", () => {
describe('Basic OData', () => {

it('serves $metadata documents in v4', async () => {
const { headers, status, data } = await GET `/processor/$metadata`
const { headers, status, data } = await GET(`/processor/$metadata`, { headers: { accept: '*/*' } }) //> for cds^7
expect(status).to.equal(200)
expect(headers).to.contain({
// 'content-type': 'application/xml', //> fails with 'application/xml;charset=utf-8', which is set by express
Expand All @@ -58,7 +59,7 @@ describe('Basic OData', () => {
const { data } = await GET(`/processor/Travel?$filter=TravelUUID eq '00667221A8E4645C17002DF03754AB66'`)
expect(data.value).to.containSubset([{
BeginDate: '2023-08-02',
BookingFee: 60,
BookingFee: '60',
createdAt: expectedValue => /2023-07-16T18:42:07\.000(0000)?Z/.test(expectedValue), // timestamp precision increase with cds^7
createdBy: 'Hansmann',
CurrencyCode_code: 'SGD',
Expand All @@ -71,7 +72,7 @@ describe('Basic OData', () => {
LastChangedBy: 'Deichgraeber',
to_Agency_AgencyID: '070029',
to_Customer_CustomerID: '000318',
TotalPrice: 23439,
TotalPrice: '23439',
TravelID: 175,
TravelStatus_code: 'A',
TravelUUID: '00667221A8E4645C17002DF03754AB66'
Expand Down Expand Up @@ -100,7 +101,7 @@ describe('Basic OData', () => {
})

it('supports $value requests', async () => {
const { data } = await GET `/processor/Travel(TravelUUID='52657221A8E4645C17002DF03754AB66',IsActiveEntity=true)/to_Customer/LastName/$value`
const { data } = await GET(`/processor/Travel(TravelUUID='52657221A8E4645C17002DF03754AB66',IsActiveEntity=true)/to_Customer/LastName/$value`, { headers: { accept: '*/*' } }) //> for cds^7
expect(data).to.equal('Prinz')
})

Expand Down Expand Up @@ -134,7 +135,7 @@ describe('Basic OData', () => {
})

const { data: newTravel } = await SAVE (`/processor/Travel(TravelUUID='${newDraft.TravelUUID}',IsActiveEntity=false)`)
expect(newTravel).to.contain({ TravelID: 4134, TotalPrice: 11 })
expect(newTravel).to.contain({ TravelID: 4134, TotalPrice: '11' })
})

it ('re-calculates totals after booking fee changed', async ()=>{
Expand All @@ -144,30 +145,27 @@ describe('Basic OData', () => {
let Supplement = `/processor/BookingSupplement(BookSupplUUID='85D87221A8E4645C17002DF03754AB66',IsActiveEntity=false)`

let { data:draft } = await EDIT (Travel4133)
expect(draft).to.containSubset({
TotalPrice: 7375,
TravelID: 4133,
})
expect(draft).to.containSubset({ TravelID: 4133, TotalPrice: '7375' })

// Ensure it is not in accepted state as that would disallow changing
await POST (Draft +`/TravelService.rejectTravel`)
await PATCH (Draft, { BeginDate: '2222-01-01', EndDate: '2222-01-02' })

// Change the Travel's Booking Fee
await PATCH (Draft, { BookingFee: '120' })
await expect_totals (7475)
await expect_totals ('7475')

// Change a Booking's Flight Price
await PATCH (Booking, { FlightPrice: '1657' })
await expect_totals (5475)
await expect_totals ('5475')

// Change a Supplements's Price
await PATCH (Supplement, { Price: '220' })
await expect_totals (5675)
await expect_totals ('5675')

// Save Draft
await SAVE (Draft)
await expect_totals (5675, 'IsActiveEntity=true')
await expect_totals ('5675', 'IsActiveEntity=true')

async function expect_totals (expected, _active = 'IsActiveEntity=false') {
let { data: { TotalPrice } } = await GET (`/processor/Travel(TravelUUID='76757221A8E4645C17002DF03754AB66',${_active})?
Expand All @@ -179,37 +177,37 @@ describe('Basic OData', () => {

it('deduct discount multiple times does not end up in error', async () => {
const { data: res1 } = await GET `/processor/Travel(TravelUUID='52657221A8E4645C17002DF03754AB66',IsActiveEntity=true)`
expect(res1).to.contain({ TotalPrice: 900, BookingFee: 20 })
expect(res1).to.contain({ TotalPrice: '900', BookingFee: '20' })

const { data: res2 } = await POST(
`/processor/Travel(TravelUUID='52657221A8E4645C17002DF03754AB66',IsActiveEntity=true)/TravelService.deductDiscount`,
{ percent: 11 }
)
expect(res2).to.contain({ TotalPrice: 897.8, BookingFee: 17.8 })
expect(res2).to.contain({ TotalPrice: '897.8', BookingFee: '17.8' })

const { data: res3 } = await POST(
`/processor/Travel(TravelUUID='52657221A8E4645C17002DF03754AB66',IsActiveEntity=true)/TravelService.deductDiscount`,
{ percent: 11 }
)
expect(res3).to.contain({ TotalPrice: 895.842, BookingFee: 15.842 })
expect(res3).to.contain({ TotalPrice: '895.842', BookingFee: '15.842' })

const { data: res4 } = await POST(
`/processor/Travel(TravelUUID='52657221A8E4645C17002DF03754AB66',IsActiveEntity=true)/TravelService.deductDiscount`,
{ percent: 11 }
)
// rounded to 3 decimals
expect(res4).to.contain({ TotalPrice: 894.099, BookingFee: 14.099 })
expect(res4).to.contain({ TotalPrice: '894.099', BookingFee: '14.099' })
})

it('allows deducting discounts on drafts as well', async ()=>{
const Active = `/processor/Travel(TravelUUID='93657221A8E4645C17002DF03754AB66',IsActiveEntity=true)`
const Draft = `/processor/Travel(TravelUUID='93657221A8E4645C17002DF03754AB66',IsActiveEntity=false)`

const { data:res0 } = await GET (Active)
expect(res0).to.contain({ TravelID:66, TotalPrice: 729, BookingFee: 10 })
expect(res0).to.contain({ TravelID: 66, TotalPrice: '729', BookingFee: '10' })

const { data:res1 } = await EDIT (Active)
expect(res1).to.contain({ TotalPrice: 729, BookingFee: 10 })
expect(res1).to.contain({ TotalPrice: '729', BookingFee: '10' })

// Change the Travel's dates to avoid validation errors
const today = new Date().toISOString().split('T')[0]
Expand All @@ -218,15 +216,15 @@ describe('Basic OData', () => {
await PATCH (Draft, { EndDate: tomorrow })

const { data:res2 } = await POST (`${Draft}/TravelService.deductDiscount`, { percent: 50 })
expect(res2).to.contain({ TotalPrice: 724, BookingFee: 5 })
expect(res2).to.contain({ TotalPrice: '724', BookingFee: '5' })

const { data:res3 } = await GET (Draft)
expect(res3).to.contain({ TotalPrice: 724, BookingFee: 5 })
expect(res3).to.contain({ TotalPrice: '724', BookingFee: '5' })

await SAVE (Draft)

const { data:res4 } = await GET (Active)
expect(res4).to.contain({ TotalPrice: 724, BookingFee: 5 })
expect(res4).to.contain({ TotalPrice: '724', BookingFee: '5' })
})

})
Loading