-
Notifications
You must be signed in to change notification settings - Fork 2
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.
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
[FEC-88] Migrating test data model Inventory Entry #703
Open
jmcreasman
wants to merge
17
commits into
main
Choose a base branch
from
FEC-87-migrated-test-data-model-inventory-entry
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
986b29f
feat(inventory entry): update test data model migrating to new implem…
jmcreasman 0ccb365
feat(inventory entry): add changeset
jmcreasman 561d643
feat(inventory entry): fix error
jmcreasman 7213a80
feat(inventory entry): fix TS errors
jmcreasman c64602d
feat(inventory entry): fix TS error
jmcreasman c67857a
feat(inventory entry): update tests
jmcreasman 952ee72
feat(inventory entry): update tests
jmcreasman 9e3eb9a
refactor(inventory-entry): ts types adjustments and supplychannel fie…
CarlosCortizasCT 3df930b
feat(inventory entry): remove unneeded transformer and generator files
jmcreasman 6242dd5
feat(inventory entry): update with migrating the draft
jmcreasman 47cb2dc
feat(inventory entry): remove unused imports
jmcreasman f4d89be
feat(inventory entry): fix tests
jmcreasman 4b41f56
Update .changeset/metal-mice-sit.md
jmcreasman cbeea9a
feat(inventory entry): update presets with new implementation part 1
jmcreasman a08f5d9
feat(inventory entry): update presets with new implementation part 2
jmcreasman f063954
feat(inventory entry): update based on PR feedback
jmcreasman 8ea98a2
feat(inventory entry): remove commented out code
jmcreasman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
--- | ||
'@commercetools-test-data/inventory-entry': minor | ||
--- | ||
|
||
Refactored `InventoryEntry` and `InventoryEntryDraft` models to use the new implementation patterns. | ||
This means the existing models are now deprecated (though we still support them for backwards compatibility) and consumers should move to the new ones implemented: | ||
* `InventoryEntryRest` | ||
* `InventoryEntryGraphql` | ||
* `InventoryEntryDraftRest` | ||
* `InventoryEntryDraftGraphql` |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,114 @@ | ||
import { | ||
InventoryEntry, | ||
InventoryEntryRest, | ||
InventoryEntryGraphql, | ||
} from './index'; | ||
|
||
describe('InventoryEntry model builders', () => { | ||
it('builds a REST model', () => { | ||
const restModel = InventoryEntryRest.random().build(); | ||
|
||
expect(restModel).toEqual( | ||
expect.objectContaining({ | ||
id: expect.any(String), | ||
key: expect.any(String), | ||
version: expect.any(Number), | ||
createdAt: expect.any(String), | ||
createdBy: expect.any(Object), | ||
lastModifiedAt: expect.any(String), | ||
lastModifiedBy: expect.any(Object), | ||
sku: expect.any(String), | ||
quantityOnStock: expect.any(Number), | ||
restockableInDays: expect.any(Number), | ||
availableQuantity: expect.any(Number), | ||
expectedDelivery: expect.any(String), | ||
supplyChannel: expect.any(Object), | ||
custom: null, | ||
}) | ||
); | ||
}); | ||
|
||
it('builds a GraphQL model', () => { | ||
const graphqlModel = InventoryEntryGraphql.random().build(); | ||
|
||
expect(graphqlModel).toMatchObject( | ||
expect.objectContaining({ | ||
id: expect.any(String), | ||
key: expect.any(String), | ||
version: expect.any(Number), | ||
createdAt: expect.any(String), | ||
createdBy: expect.any(Object), | ||
lastModifiedAt: expect.any(String), | ||
lastModifiedBy: expect.any(Object), | ||
sku: expect.any(String), | ||
quantityOnStock: expect.any(Number), | ||
restockableInDays: expect.any(Number), | ||
availableQuantity: expect.any(Number), | ||
expectedDelivery: expect.any(String), | ||
supplyChannel: expect.objectContaining({ | ||
__typename: 'Channel', | ||
address: expect.objectContaining({ | ||
country: expect.any(String), | ||
}), | ||
}), | ||
supplyChannelRef: expect.objectContaining({ | ||
__typename: 'Reference', | ||
id: expect.any(String), | ||
typeId: 'channel', | ||
}), | ||
custom: null, | ||
__typename: 'InventoryEntry', | ||
}) | ||
); | ||
}); | ||
}); | ||
|
||
describe('InventoryEntry model compatibility builders', () => { | ||
it('builds a REST model', () => { | ||
const restModel = InventoryEntry.random().buildRest(); | ||
|
||
expect(restModel).toEqual( | ||
expect.objectContaining({ | ||
id: expect.any(String), | ||
key: expect.any(String), | ||
version: expect.any(Number), | ||
createdAt: expect.any(String), | ||
createdBy: expect.any(Object), | ||
lastModifiedAt: expect.any(String), | ||
lastModifiedBy: expect.any(Object), | ||
sku: expect.any(String), | ||
quantityOnStock: expect.any(Number), | ||
restockableInDays: expect.any(Number), | ||
availableQuantity: expect.any(Number), | ||
expectedDelivery: expect.any(String), | ||
supplyChannel: expect.any(Object), | ||
custom: null, | ||
}) | ||
); | ||
}); | ||
|
||
it('builds a GraphQL model', () => { | ||
const graphqlModel = InventoryEntry.random().buildGraphql(); | ||
|
||
expect(graphqlModel).toMatchObject( | ||
expect.objectContaining({ | ||
id: expect.any(String), | ||
key: expect.any(String), | ||
version: expect.any(Number), | ||
createdAt: expect.any(String), | ||
createdBy: expect.any(Object), | ||
lastModifiedAt: expect.any(String), | ||
lastModifiedBy: expect.any(Object), | ||
sku: expect.any(String), | ||
availableQuantity: expect.any(Number), | ||
quantityOnStock: expect.any(Number), | ||
restockableInDays: expect.any(Number), | ||
expectedDelivery: expect.any(String), | ||
supplyChannel: expect.objectContaining({ | ||
__typename: 'Channel', | ||
}), | ||
custom: null, | ||
}) | ||
); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
import { | ||
createCompatibilityBuilder, | ||
createSpecializedBuilder, | ||
TModelFieldsConfig, | ||
} from '@commercetools-test-data/core'; | ||
import { restFieldsConfig, graphqlFieldsConfig } from './fields-config'; | ||
import type { | ||
TCreateInventoryEntryBuilder, | ||
TInventoryEntryRest, | ||
TInventoryEntryGraphql, | ||
} from './types'; | ||
|
||
export const RestModelBuilder: TCreateInventoryEntryBuilder< | ||
TInventoryEntryRest | ||
> = () => | ||
createSpecializedBuilder({ | ||
name: 'InventoryEntryRestBuilder', | ||
type: 'rest', | ||
modelFieldsConfig: restFieldsConfig, | ||
}); | ||
|
||
export const GraphqlModelBuilder: TCreateInventoryEntryBuilder< | ||
TInventoryEntryGraphql | ||
> = () => | ||
createSpecializedBuilder({ | ||
name: 'InventoryEntryGraphqlBuilder', | ||
type: 'graphql', | ||
modelFieldsConfig: graphqlFieldsConfig, | ||
}); | ||
|
||
export const CompatInventoryEntryModelBuilder = < | ||
TInventoryEntryModel extends | ||
| TInventoryEntryRest | ||
| TInventoryEntryGraphql = TInventoryEntryRest, | ||
>() => | ||
createCompatibilityBuilder<TInventoryEntryModel>({ | ||
name: 'InventoryEntryCompatBuilder', | ||
modelFieldsConfig: { | ||
rest: restFieldsConfig as TModelFieldsConfig<TInventoryEntryModel>, | ||
graphql: graphqlFieldsConfig as TModelFieldsConfig<TInventoryEntryModel>, | ||
}, | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
import { ChannelGraphql } from '@commercetools-test-data/channel'; | ||
import { | ||
ClientLogging, | ||
Reference, | ||
TReferenceGraphql, | ||
} from '@commercetools-test-data/commons'; | ||
import { | ||
fake, | ||
sequence, | ||
type TModelFieldsConfig, | ||
} from '@commercetools-test-data/core'; | ||
import { createRelatedDates } from '@commercetools-test-data/utils'; | ||
import type { TInventoryEntryGraphql, TInventoryEntryRest } from './types'; | ||
|
||
const [getOlderDate, getNewerDate, getFutureDate] = createRelatedDates(); | ||
|
||
const commonFieldsConfig = { | ||
id: fake((f) => f.string.uuid()), | ||
version: sequence(), | ||
createdAt: fake(getOlderDate), | ||
createdBy: fake(() => ClientLogging.random()), | ||
lastModifiedAt: fake(getNewerDate), | ||
lastModifiedBy: fake(() => ClientLogging.random()), | ||
key: fake((f) => f.lorem.slug(2)), | ||
sku: fake((f) => f.lorem.words()), | ||
quantityOnStock: fake((f) => f.number.int()), | ||
availableQuantity: fake((f) => f.number.int()), | ||
restockableInDays: fake((f) => f.number.int()), | ||
expectedDelivery: fake(getFutureDate), | ||
custom: null, | ||
}; | ||
export const restFieldsConfig: TModelFieldsConfig<TInventoryEntryRest> = { | ||
fields: { | ||
...commonFieldsConfig, | ||
supplyChannel: fake(() => Reference.presets.channelReference()), | ||
}, | ||
}; | ||
export const graphqlFieldsConfig: TModelFieldsConfig<TInventoryEntryGraphql> = { | ||
fields: { | ||
...commonFieldsConfig, | ||
__typename: 'InventoryEntry', | ||
supplyChannel: fake(() => ChannelGraphql.random()), | ||
supplyChannelRef: fake((f) => Reference.presets.channelReference()), | ||
}, | ||
postBuild: (model) => { | ||
const supplyChannelRef = model.supplyChannel | ||
? Reference.presets | ||
.channelReference() | ||
.id(model.supplyChannel.id) | ||
.buildGraphql<TReferenceGraphql<'channel'>>() | ||
: null; | ||
return { | ||
supplyChannelRef, | ||
}; | ||
}, | ||
}; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -1,6 +1,27 @@ | ||||||
import { | ||||||
RestModelBuilder, | ||||||
GraphqlModelBuilder, | ||||||
CompatInventoryEntryModelBuilder, | ||||||
} from './builders'; | ||||||
import * as modelPresets from './presets'; | ||||||
|
||||||
export * as InventoryEntryDraft from './inventory-entry-draft'; | ||||||
CarlosCortizasCT marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We need to export the three models with heir own names:
Suggested change
|
||||||
export * as InventoryEntry from '.'; | ||||||
|
||||||
export { default as random } from './builder'; | ||||||
export { default as presets } from './presets'; | ||||||
export * from './types'; | ||||||
|
||||||
export const InventoryEntryRest = { | ||||||
random: RestModelBuilder, | ||||||
presets: modelPresets.restPresets, | ||||||
}; | ||||||
|
||||||
export const InventoryEntryGraphql = { | ||||||
random: GraphqlModelBuilder, | ||||||
presets: modelPresets.graphqlPresets, | ||||||
}; | ||||||
|
||||||
/** | ||||||
* @deprecated Use `InventoryEntryRest` or `InventoryEntryGraphql` exported models instead of `InventoryEntry`. | ||||||
*/ | ||||||
export const random = CompatInventoryEntryModelBuilder; | ||||||
export const presets = modelPresets.graphqlPresets; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not 100% sure if I did this part correctly?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me 👍