From 361d5140c524c5849c2fca7ce76aabacc6fe8b33 Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Fri, 13 Nov 2026 10:07:29 +0000 Subject: [PATCH] CO-3029 Default Attribute Collector Person Roles to Active and require status on create --- app/src/Model/Table/PersonRolesTable.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/src/Model/Table/PersonRolesTable.php b/app/src/Model/Table/PersonRolesTable.php index 0d4c63adc..07e428bf1 100644 --- a/app/src/Model/Table/PersonRolesTable.php +++ b/app/src/Model/Table/PersonRolesTable.php @@ -743,6 +743,7 @@ public function validationDefault(Validator $validator): Validator { $validator->add('status', [ 'content' => ['rule' => ['inList', StatusEnum::getConstValues()]] ]); + $validator->requirePresence('status', 'create'); $validator->notEmptyString('status'); $validator->add('ordr', [ @@ -772,6 +773,10 @@ public function validationDefault(Validator $validator): Validator { * Attribute Collector; when null a new Role is always created * @param int|null $couId COU of the Petition; when set it overrides any collected COU * + * A new Role with no collected status defaults to Active; beforeMarshal() then + * applies AR-PersonRole-4 (Pending Activation for a future Valid From). The status of an + * existing Role is left unchanged. + * * @return PersonRole The saved Role * @throws \Cake\Datasource\Exception\RecordNotFoundException If an issue occurs during saving * @since COmanage Registry v5.1.0 @@ -799,6 +804,11 @@ public function saveAttributeCollectorPetitionAttributes(int $personId, array $f return $this->saveOrFail($existingRole); } + if(empty($role['status'])) { + // Default new Roles to Active; beforeMarshal() applies AR-PersonRole-4 + $role['status'] = StatusEnum::Active; + } + return $this->saveOrFail($this->newEntity($role)); } } \ No newline at end of file