diff --git a/app/controllers/api/v4/cvd_risks_controller.rb b/app/controllers/api/v4/cvd_risks_controller.rb index d5d88bd2d7..144b5cdbf9 100644 --- a/app/controllers/api/v4/cvd_risks_controller.rb +++ b/app/controllers/api/v4/cvd_risks_controller.rb @@ -32,6 +32,7 @@ def cvd_risk_params :id, :patient_id, :risk_score, + :deleted_at, :created_at, :updated_at ) diff --git a/app/schema/api/v4/models.rb b/app/schema/api/v4/models.rb index e3b8024439..83caed3a8b 100644 --- a/app/schema/api/v4/models.rb +++ b/app/schema/api/v4/models.rb @@ -22,7 +22,8 @@ def cvd_risk properties: { id: {"$ref" => "#/definitions/uuid"}, patient_id: {"$ref" => "#/definitions/uuid"}, - risk_score: {type: :number}, + risk_score: {"$ref" => "#/definitions/non_empty_string"}, + deleted_at: {"$ref" => "#/definitions/nullable_timestamp"}, created_at: {"$ref" => "#/definitions/timestamp"}, updated_at: {"$ref" => "#/definitions/timestamp"} }, diff --git a/app/validators/api/v4/cvd_risk_payload_validator.rb b/app/validators/api/v4/cvd_risk_payload_validator.rb index 8ab65b7618..bc51971ebd 100644 --- a/app/validators/api/v4/cvd_risk_payload_validator.rb +++ b/app/validators/api/v4/cvd_risk_payload_validator.rb @@ -1,5 +1,5 @@ class Api::V4::CvdRiskPayloadValidator < Api::V4::PayloadValidator - attr_accessor :id, :patient_id, :risk_score, :created_at, :updated_at + attr_accessor :id, :patient_id, :risk_score, :deleted_at, :created_at, :updated_at validate :validate_schema diff --git a/db/migrate/20241210092449_change_cvd_risk_score_to_string.rb b/db/migrate/20241210092449_change_cvd_risk_score_to_string.rb new file mode 100644 index 0000000000..95d75600cf --- /dev/null +++ b/db/migrate/20241210092449_change_cvd_risk_score_to_string.rb @@ -0,0 +1,5 @@ +class ChangeCvdRiskScoreToString < ActiveRecord::Migration[6.1] + def change + change_column(:cvd_risks, :risk_score, :string) + end +end diff --git a/db/structure.sql b/db/structure.sql index 51613b7fc9..6f539e03de 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -593,7 +593,7 @@ ALTER SEQUENCE public.cphc_migration_error_logs_id_seq OWNED BY public.cphc_migr CREATE TABLE public.cvd_risks ( id uuid DEFAULT gen_random_uuid() NOT NULL, - risk_score integer, + risk_score character varying, patient_id uuid NOT NULL, deleted_at timestamp without time zone, device_created_at timestamp without time zone, @@ -7858,6 +7858,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('20241125155649'), ('20241126111757'), ('20241129212725'), -('20241204155510'); +('20241204155510'), +('20241210092449'); diff --git a/spec/factories/cvd_risks.rb b/spec/factories/cvd_risks.rb index 45298a784c..52a33be038 100644 --- a/spec/factories/cvd_risks.rb +++ b/spec/factories/cvd_risks.rb @@ -2,7 +2,7 @@ factory :cvd_risk do id { SecureRandom.uuid } patient - risk_score { 42 } + risk_score { "42" } device_created_at { Time.current } device_updated_at { Time.current } diff --git a/swagger/v4/swagger.json b/swagger/v4/swagger.json index 0afd7e50c8..17d6e645d4 100644 --- a/swagger/v4/swagger.json +++ b/swagger/v4/swagger.json @@ -1898,7 +1898,10 @@ "$ref": "#/definitions/uuid" }, "risk_score": { - "type": "number" + "$ref": "#/definitions/non_empty_string" + }, + "deleted_at": { + "$ref": "#/definitions/nullable_timestamp" }, "created_at": { "$ref": "#/definitions/timestamp"