From 9712ba05a636302c13dbfac95ed2f4ddd609d3c1 Mon Sep 17 00:00:00 2001
From: Benn Oshrin <boshrin@users.noreply.github.com>
Date: Wed, 6 Dec 2023 14:40:05 -0500
Subject: [PATCH 1/2] Fix retrieval of matchgrid configuration (CO-2728)
---
app/src/Lib/Match/MatchService.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/app/src/Lib/Match/MatchService.php b/app/src/Lib/Match/MatchService.php
index 5928c32f..cf33fb5e 100644
--- a/app/src/Lib/Match/MatchService.php
+++ b/app/src/Lib/Match/MatchService.php
@@ -1012,7 +1012,10 @@ public function setConfig(int $matchgridId) {
],
'MatchgridSettings',
'PotentialRules' => [
- 'RuleAttributes' => ['Attributes' => 'AttributeGroups'],
+ 'RuleAttributes' => [
+ 'Attributes' => 'AttributeGroups',
+ 'CrosscheckAttributes' => 'AttributeGroups'
+ ],
'sort' => ['PotentialRules.ordr' => 'ASC']
]])
->firstOrFail();
From 9c47ccbb80bdf861129ecc1478ea771afa19e0f1 Mon Sep 17 00:00:00 2001
From: Shayna Atkinson <satkinson@sphericalcowgroup.com>
Date: Thu, 7 Dec 2023 17:18:56 -0500
Subject: [PATCH 2/2] Bump version to 1.2.1
---
app/config/VERSION | 2 +-
container/aws_buildspec.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/config/VERSION b/app/config/VERSION
index 26aaba0e..6085e946 100644
--- a/app/config/VERSION
+++ b/app/config/VERSION
@@ -1 +1 @@
-1.2.0
+1.2.1
diff --git a/container/aws_buildspec.yml b/container/aws_buildspec.yml
index f08ef961..c755f3e0 100644
--- a/container/aws_buildspec.yml
+++ b/container/aws_buildspec.yml
@@ -3,7 +3,7 @@ version: 0.2
env:
shell: bash
variables:
- LABEL: "1.2.0"
+ LABEL: "1.2.1"
exported-variables:
- LABEL