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.

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

Update to offer management schema #533

Merged
merged 10 commits into from
Oct 30, 2018
Merged

Update to offer management schema #533

merged 10 commits into from
Oct 30, 2018

Conversation

jbeckert
Copy link
Contributor

@jbeckert jbeckert commented Oct 12, 2018

moved "required" from property definition to allOf schema clauses
numerous corrections of typos and some examples that didn't validate
some file formatting (line breaks)

jbeckert and others added 7 commits September 6, 2018 17:21
Merge from adobe/xdm master
* 'master' of https://github.com/adobe/xdm: (27 commits)
  [ci skip] updating documentation
  Update profilestitch.schema.json
  Correct two errors with profile stitching First error: Accidentally replaced reference to profile stitching in segment membership with Identity array instead of modifying profile stitch Second error: Didn't have profile stitching as an array. It was only an array in the examples, but that got "corrected" to match the schema.
  [ci skip] updating documentation
  update version, changelog, and docs for 0.9.5
  [ci skip] updating documentation
  Fix format by lint
  Restructure nested objs to use $ref
  [ci skip] updating documentation
  [ci skip] updating documentation
  keeping original 'xdm:type' field as deprecated to avoid #472 being a breaking change
  changed uri format to uri-reference
  Modified action type enum values
  [ci skip] updating documentation
  create distinct fields for different cases of birth date
  minor comments ingested
  [ci skip] updating documentation
  fixing example
  BUG - fix broken schema format in ExperienceEvent
  [ci skip] updating documentation
  ...

# Resolved Conflicts:
#	extensions/adobe/experience/offer-management/capping-constraint.schema.json
#	extensions/adobe/experience/offer-management/eligibility-rule.example.1.json
#	extensions/adobe/experience/offer-management/eligibility-rule.schema.json
#	extensions/adobe/experience/offer-management/model-usage.schema.json
#	extensions/adobe/experience/offer-management/offer-activity.schema.json
#	extensions/adobe/experience/offer-management/offer-filter.schema.json
#	extensions/adobe/experience/offer-management/offer-placement.schema.json
#	extensions/adobe/experience/offer-management/offer-representation.example.1.json
#	extensions/adobe/experience/offer-management/offer-representation.example.2.json
#	extensions/adobe/experience/offer-management/offer-representation.example.3.json
#	extensions/adobe/experience/offer-management/offer-representation.schema.json
#	extensions/adobe/experience/offer-management/offer.schema.json
#	extensions/adobe/experience/offer-management/personalized-offer.schema.json
#	extensions/adobe/experience/offer-management/selection-constraint.schema.json
* 'master' of https://github.com/adobe/xdm:
  [ci skip] updating documentation
  [ci skip] updating documentation
  [ci skip] updating documentation
  Add journeyAI object to profile extension
  Fixed eventID description, and bash scripts permissions
  * update titles as suggested by Klaasjan
  [trivial] Updating titles so that they no longer collide
  Changed "businessReason" to "eventID"
  Rename journeyaiscores file to follow naming convention
  Add profile extension to add Journey AI email channel scores
  Rename scores fields and change title for Fatigue
  JSON Schemas for Journey AI Fatigue and Score schemas
  Fixed typo in transactionID
Script does not belong to public repo
Merge from adobe/master (0.9.6 and higher)
@jbeckert jbeckert changed the title Update to schema, adding offer decision event Update to offer management schema Oct 12, 2018
Remove decision event schema and examples
* 'master' of https://github.com/jbeckert/xdm: (42 commits)
  [ci skip] updating documentation
  Update CHANGELOG.md
  updating docs for 0.9.6
  updating changelog, version for 0.9.6
  [ci skip] updating documentation
  [ci skip] updating documentation
  [ci skip] updating documentation
  [ci skip] updating documentation
  Also rename example file
  [ci skip] updating documentation
  removing minLength contraint on measure ids
  Fix uri format/data type and rename file name
  Corrected example
  [ci skip] updating documentation
  [ci skip] updating documentation
  fix lint issues
  update xdmType to include map
  backing out storage hint tag
  [ci skip] updating documentation
  Update meta.schema.json
  ...
@cdegroot-adobe
Copy link
Contributor

@jbeckert - Thanks for the cleanup and improvements, much appreciated. It will take me some time to review in detail. I will start doing so right away.

Copy link
Collaborator

@kstreeter kstreeter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doc & example improvement and some minor refactoring that doesn't change the semantics or cause a breaking change, approved.

@kstreeter kstreeter added this to the 0.9.7 milestone Oct 29, 2018
@kstreeter kstreeter merged commit 14940af into adobe:master Oct 30, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants