Merge branch 'PRMP-1444' into PRMP-1445

steph-torres-nhs · steph-torres-nhs · commit dc9dba8f5172 · 2026-02-18T11:55:18.000Z
diff --git a/infrastructure/dynamo_db.tf b/infrastructure/dynamo_db.tf
@@ -607,31 +607,31 @@ module "user_restriction_table" {
       type = "S"
     },
     {
-      name = "RestrictedSmartCardId"
+      name = "RestrictedSmartCard"
       type = "S"
     },
     {
       name = "NhsNumber"
       type = "S"
     },
     {
-      name = "OdsCode"
+      name = "Custodian"
       type = "S"
     },
     {
       name = "Created"
       type = "N"
     },
     {
-      name = "CreatorSmartCardId"
+      name = "CreatorSmartCard"
       type = "S"
     }
   ]
 
   global_secondary_indexes = [
     {
-      name            = "RestrictedSmartCardIdIndex"
-      hash_key        = "RestrictedSmartCardId"
+      name            = "RestrictedSmartCardIndex"
+      hash_key        = "RestrictedSmartCard"
       range_key       = "Created"
       projection_type = "ALL"
     },
@@ -642,20 +642,20 @@ module "user_restriction_table" {
       projection_type = "ALL"
     },
     {
-      name            = "OdsCodeNhsNumberIndex"
-      hash_key        = "OdsCode"
+      name            = "CustodianByNhsNumberIndex"
+      hash_key        = "Custodian"
       range_key       = "NhsNumber"
       projection_type = "ALL"
     },
     {
-      name            = "OdsCodeSmartCardIdIndex"
-      hash_key        = "OdsCode"
-      range_key       = "RestrictedSmartCardId"
+      name            = "CustodianBySmartCardIndex"
+      hash_key        = "Custodian"
+      range_key       = "RestrictedSmartCard"
       projection_type = "ALL"
     },
     {
       name            = "CreatorIndex"
-      hash_key        = "CreatorSmartCardId"
+      hash_key        = "CreatorSmartCard"
       range_key       = "Created"
       projection_type = "ALL"
     }

Original file line number	Diff line number	Diff line change
`@@ -607,31 +607,31 @@ module "user_restriction_table" {`
`607`	`607`	`type = "S"`
`608`	`608`	`},`
`609`	`609`	`{`
`610`		`- name = "RestrictedSmartCardId"`
	`610`	`+ name = "RestrictedSmartCard"`
`611`	`611`	`type = "S"`
`612`	`612`	`},`
`613`	`613`	`{`
`614`	`614`	`name = "NhsNumber"`
`615`	`615`	`type = "S"`
`616`	`616`	`},`
`617`	`617`	`{`
`618`		`- name = "OdsCode"`
	`618`	`+ name = "Custodian"`
`619`	`619`	`type = "S"`
`620`	`620`	`},`
`621`	`621`	`{`
`622`	`622`	`name = "Created"`
`623`	`623`	`type = "N"`
`624`	`624`	`},`
`625`	`625`	`{`
`626`		`- name = "CreatorSmartCardId"`
	`626`	`+ name = "CreatorSmartCard"`
`627`	`627`	`type = "S"`
`628`	`628`	`}`
`629`	`629`	`]`
`630`	`630`
`631`	`631`	`global_secondary_indexes = [`
`632`	`632`	`{`
`633`		`- name = "RestrictedSmartCardIdIndex"`
`634`		`- hash_key = "RestrictedSmartCardId"`
	`633`	`+ name = "RestrictedSmartCardIndex"`
	`634`	`+ hash_key = "RestrictedSmartCard"`
`635`	`635`	`range_key = "Created"`
`636`	`636`	`projection_type = "ALL"`
`637`	`637`	`},`
`@@ -642,20 +642,20 @@ module "user_restriction_table" {`
`642`	`642`	`projection_type = "ALL"`
`643`	`643`	`},`
`644`	`644`	`{`
`645`		`- name = "OdsCodeNhsNumberIndex"`
`646`		`- hash_key = "OdsCode"`
	`645`	`+ name = "CustodianByNhsNumberIndex"`
	`646`	`+ hash_key = "Custodian"`
`647`	`647`	`range_key = "NhsNumber"`
`648`	`648`	`projection_type = "ALL"`
`649`	`649`	`},`
`650`	`650`	`{`
`651`		`- name = "OdsCodeSmartCardIdIndex"`
`652`		`- hash_key = "OdsCode"`
`653`		`- range_key = "RestrictedSmartCardId"`
	`651`	`+ name = "CustodianBySmartCardIndex"`
	`652`	`+ hash_key = "Custodian"`
	`653`	`+ range_key = "RestrictedSmartCard"`
`654`	`654`	`projection_type = "ALL"`
`655`	`655`	`},`
`656`	`656`	`{`
`657`	`657`	`name = "CreatorIndex"`
`658`		`- hash_key = "CreatorSmartCardId"`
	`658`	`+ hash_key = "CreatorSmartCard"`
`659`	`659`	`range_key = "Created"`
`660`	`660`	`projection_type = "ALL"`
`661`	`661`	`}`