Skip to content

Merge to Main for Release - #330

Merged
nmorasb merged 384 commits into
mainfrom
develop
Jan 27, 2026
Merged

Merge to Main for Release#330
nmorasb merged 384 commits into
mainfrom
develop

Conversation

@nmorasb

@nmorasb nmorasb commented Jan 26, 2026

Copy link
Copy Markdown
Contributor

MADiE PR Template

Jira Ticket: MAT-9570
(Optional) Related Tickets:

Summary

All Submissions

  • This PR has the JIRA linked.
  • Required tests are included.
  • No extemporaneous files are included (i.e. Complied files or testing results).
  • This PR is merging into the correct branch.
  • All Documentation needed for this PR is Complete (or noted in a TODO or other Ticket).
  • Any breaking changes or failing automations are noted by placing a comment on this PR.

DevSecOps

If there is a question if this PR has a security or infrastructure impact, please contact the Security or DevOps engineer assigned to this project to discuss it further.

  • This PR has NO significant security impact (i.e Changing auth methods, Adding a new user type, Adding a required but vulnerable package).

Reviewers

By Approving this PR you are attesting to the following:

  • Code is maintainable and reusable, reuses existing code and infrastructure where appropriate, and accomplishes the task’s purpose.
  • The tests appropriately test the new code, including edge cases.
  • If you have any concerns they are brought up either to the developer assigned, security engineer, or leads.

sb-cecilialiu and others added 30 commits July 12, 2024 06:46
@sb-cecilialiu
Merge pull request #225 from MeasureAuthoringTool/MAT-7451_unableToVe…
6ced276 
…rsionQDMMeasure

MAT-7451 unable to version qdm measure when there is Ambiguous field …
@sb-prateekkeerthi
MAT-6506 cleaning up old sde and rav fields
6223502
@sb-prateekkeerthi
Merge pull request #226 from MeasureAuthoringTool/MAT-6506/cleanUpOld…
cda09a3 
…SDEAndRavFields

MAT-6506 cleaning up old sde and rav fields
@nmorasb
MAT-6409: add support for Include in Report Type and remove old, unus…
0215dfe 
…ed classes
@nmorasb
MAT-6409: merge develop and update pom version
8fc765b
@nmorasb
MAT-6409: style/build change
7fb43e0
@nmorasb
Merge pull request #227 from MeasureAuthoringTool/feature/MAT-6409-sd…
32f3e75 
…e-includeInReportType

Feature/mat 6409 sde include in report type
@sb-cecilialiu
MAT-7155 wrong type for EncounterPerformed:diagnoses
9ccdad3
@sb-prateekkeerthi
MAT-7355 added additional action message filed
6caebf5
@sb-prateekkeerthi
Merge pull request #229 from MeasureAuthoringTool/MAT-7355/auditLogAs…
94624af 
…sociateCmsID

MAT-7355 added additional action message filed
@sb-cecilialiu
MAT-7155 add DiagnosisComponent for EncounterPerformed
65269a3
@sb-cecilialiu
Merge remote-tracking branch 'origin' into MAT-7155_shiftTestCaesDates
71d6467
@sb-cecilialiu
MAT-7155 bump up version
f594851
@sb-cecilialiu
MAT-7155 change rank to Integer
b7f0a66
@sb-cecilialiu
Merge pull request #228 from MeasureAuthoringTool/MAT-7155_shiftTestC…
e03ca21 
…aesDates

MAT-7155 wrong type for EncounterPerformed:diagnoses
@sb-prateekkeerthi
MAT-7514 changed the experimental data type
4f13d8d
@sb-prateekkeerthi
Merge pull request #230 from MeasureAuthoringTool/MAT-7514/changingEx…
cc68b3b 
…perimentalDataType

MAT-7514 changed the experimental data type
@adongare
MAT-7060 add active flag to library model
7a3a98b
@adongare
Merge pull request #231 from MeasureAuthoringTool/MAT-7060
4b3f091 
MAT-7060 add active flag to library model
@adongare
MAT-7060 add model for included libraries
b1c64e3
@adongare
Merge pull request #232 from MeasureAuthoringTool/MAT-7060
04d91bf 
MAT-7060 add model for included libraries
@adongare
MAT-6746 add contractor annotations to support serialization
d17bda6
@adongare
Merge branch 'develop' into MAT-7060
9040f78
@adongare
MAT-6746 added dto for LibraryUsage
7f9d509
@adongare
Merge pull request #233 from MeasureAuthoringTool/MAT-7060
24e3951 
MAT-7060 add constructor annotations to support serialization, moved LibraryUsage dto to models
@sb-cecilialiu
MAT-7501 support QiCore 6.0.0
f2eaae0
@sb-cecilialiu
MAT-7507 ignore extendedData for Bonnie imported test cases
f913364
@mcmcphillips
Merge pull request #234 from MeasureAuthoringTool/MAT-7507_ignoreExte…
2533e2e 
…ndedData

MAT-7507 ignore extendedData for Bonnie imported test cases
mcmcphillips
MAT-7492: Add baseConfiguration typing
c5b7ca5
mcmcphillips
MAT-4792: Bump pom
be97fd5
nmorasb and others added 26 commits October 30, 2025 12:21
@nmorasb
MAT-9145: add first draft of user DTOs
4d65ede
@nmorasb
Merge pull request #318 from MeasureAuthoringTool/feature/MAT-9145-ad…
4a4bb8c 
…d-user-models

MAT-9145: add first draft of user models
@sb-cecilialiu
MAT-8913 add CqlLibraryLockInfo
2c1573d
@sb-cecilialiu
Merge pull request #319 from MeasureAuthoringTool/MAT-8913_addIndicat…
a52d1a9 
…or4LockedLibrary

MAT-8913 add CqlLibraryLockInfo
@nmorasb
MAT-9147: add new user status for when a user's details fail to updat…
9352cf8 
…e due to system error
@nmorasb
Merge pull request #321 from MeasureAuthoringTool/feature/MAT-9147-us…
1193e3c 
…er-status-suspended

MAT-9147: add new user status for when a user's details fail to updat…
@RohitKandimalla
MAT-9276 Adding a flag for test case object to identify changes for t…
f677c23 
…est case json
@RohitKandimalla
Merge pull request #322 from MeasureAuthoringTool/feature/MAT-9276
b904af6 
MAT-9276 Adding a flag for test case object to identify changes for t…
@jkotanchik-SB
MAT-8331: Add validation to Measure to restrict the length of the Mea…
86ba870 
…sure CQL Library name to 64 chars or less.
@jkotanchik-SB
Merge pull request #323 from MeasureAuthoringTool/feature/mat-8331-me…
157de8b 
…asure-lib-name-length-limit

MAT-8331: Measure CQL Library Name Length Limit
@nmorasb
MAT-9425: first pass at adding new composite flag, update measure sco…
071b539 
…ring, composite scoring, and some validations and tests
@nmorasb
MAT-9425: remove some debug logic
4589d82
@nmorasb
MAT-9425: codacy fixes
dabf833
@nmorasb
MAT-9425: add validator enum for composite flag to measure
ddbc280
@nmorasb
MAT-9425: PR comments
9ca538a
@nmorasb
Merge pull request #324 from MeasureAuthoringTool/feature/MAT-9425-co…
3187594 
…mposite-updates

Feature/mat 9425 composite updates
@RohitKandimalla
MAT-7469 Adding title attribute to manifest options
3c91a8d
@RohitKandimalla
Merge branch 'develop' into feature/MAT-7469
bc9ec0f 
# Conflicts:
#	pom.xml
@RohitKandimalla
ignoring bin folder and also removed package-lock
9b1ac6a
@RohitKandimalla
ignoring bin folder and also removed package-lock
097ec6f
@RohitKandimalla
Merge pull request #325 from MeasureAuthoringTool/feature/MAT-7469
818a458 
MAT-7469 Adding title attribute to manifest options
@sb-prateekkeerthi
MAT-9447 remove validations for composite measure
09ca71e
@sb-prateekkeerthi
Merge pull request #328 from MeasureAuthoringTool/MAT-9447/removeVali…
c34cf10 
…dationForCompositeMeasures

MAT-9447 remove validations for composite measure
@nmorasb
MAT-9570: update QICore versions
97d5f06
@nmorasb
MAT-9570: POM release version
6acbd04
@nmorasb
Merge pull request #329 from MeasureAuthoringTool/feature/MAT-9570-qi…
fca9a15 
…core-7.0.2

MAT-9570: update QICore versions
@nmorasb
nmorasb requested a review from a team January 26, 2026 22:01
@nmorasb
nmorasb merged commit d469d49 into main Jan 27, 2026
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sb-prateekkeerthi sb-prateekkeerthi sb-prateekkeerthi approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.