Skip to content

Commit

Permalink
fix(locksmith): swapped values
Browse files Browse the repository at this point in the history
  • Loading branch information
julien51 committed May 17, 2024
1 parent dcfd8ee commit f4a1c77
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
8 changes: 7 additions & 1 deletion locksmith/__tests__/operations/eventOperations.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ describe('eventOperations', () => {
})

it('should not override previously set event data', async () => {
expect.assertions(3)
expect.assertions(5)
const eventParams = getEventFixture({
data: {
name: 'my party',
Expand All @@ -97,6 +97,9 @@ describe('eventOperations', () => {
})
const [event] = await saveEvent(eventParams, '0x123')
expect(event.data.ticket.event_end_date).toEqual('2024-05-22')
expect(event.data.ticket.event_address).toEqual(
'29 Little W 12th St, New York, NY 10014, USA'
)

const [sameEvent] = await saveEvent(
{
Expand All @@ -113,6 +116,9 @@ describe('eventOperations', () => {
)
expect(sameEvent.slug).toEqual(event.slug)
expect(sameEvent.data.ticket.event_end_date).toEqual('2024-05-22')
expect(sameEvent.data.ticket.event_address).toEqual(
'Central Park, New York, NY 10014, USA'
)
})

it('should save requiresAppoval when applicable', async () => {
Expand Down
9 changes: 6 additions & 3 deletions locksmith/src/operations/eventOperations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,12 @@ export const saveEvent = async (
where: { slug },
})
if (previousEvent) {
data = defaultsDeep(previousEvent.data, {
...parsed.data,
})
data = defaultsDeep(
{
...parsed.data,
},
previousEvent.data
)
} else {
data = {
...parsed.data,
Expand Down

0 comments on commit f4a1c77

Please sign in to comment.