Add "careplus_integration_enabled_at" field to Patient

jf-x-dev · jf-x-dev · commit 3f333a5f9f04 · 2026-04-22T21:25:40.000+01:00
* Will be used by Automated Careplus reports

Jira-Issue: MAV-XXX
diff --git a/app/models/team.rb b/app/models/team.rb
@@ -5,6 +5,7 @@
 # Table name: teams
 #
 #  id                              :bigint           not null, primary key
+#  careplus_integration_enabled_at :datetime
 #  careplus_namespace              :string
 #  careplus_password               :string
 #  careplus_staff_code             :string
@@ -30,10 +31,11 @@
 #
 # Indexes
 #
-#  index_teams_on_name             (name) UNIQUE
-#  index_teams_on_organisation_id  (organisation_id)
-#  index_teams_on_programme_types  (programme_types) USING gin
-#  index_teams_on_workgroup        (workgroup) UNIQUE
+#  index_teams_on_careplus_integration_enabled_at  (careplus_integration_enabled_at)
+#  index_teams_on_name                             (name) UNIQUE
+#  index_teams_on_organisation_id                  (organisation_id)
+#  index_teams_on_programme_types                  (programme_types) USING gin
+#  index_teams_on_workgroup                        (workgroup) UNIQUE
 #
 # Foreign Keys
 #
@@ -99,8 +101,12 @@ class Team < ApplicationRecord
             .where.not(careplus_username: nil)
             .where.not(careplus_password: nil)
         end
+  scope :careplus_integration_enabled,
+        -> { where.not(careplus_integration_enabled_at: nil) }
   scope :eligible_for_automated_careplus_reports,
-        -> { careplus_enabled.has_careplus_credentials }
+        -> do
+          careplus_enabled.has_careplus_credentials.careplus_integration_enabled
+        end
 
   enum :type,
        { point_of_care: 0, national_reporting: 1, support: 2 },
@@ -174,6 +180,7 @@ def careplus_enabled?
 
   def eligible_for_automated_careplus_reports?
     careplus_enabled? && careplus_username.present? &&
-      careplus_password.present? && careplus_namespace.present?
+      careplus_password.present? && careplus_namespace.present? &&
+      careplus_integration_enabled_at.present?
   end
 end
diff --git a/db/migrate/20260422121000_add_careplus_integration_enabled_at_for_team.rb b/db/migrate/20260422121000_add_careplus_integration_enabled_at_for_team.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddCareplusIntegrationEnabledAtForTeam < ActiveRecord::Migration[8.1]
+  def change
+    add_column :teams, :careplus_integration_enabled_at, :datetime
+    add_index :teams, :careplus_integration_enabled_at
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2026_04_22_120000) do
+ActiveRecord::Schema[8.1].define(version: 2026_04_22_121000) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
   enable_extension "pg_trgm"
@@ -906,6 +906,7 @@
   end
 
   create_table "teams", force: :cascade do |t|
+    t.datetime "careplus_integration_enabled_at"
     t.string "careplus_namespace"
     t.string "careplus_password"
     t.string "careplus_staff_code"
@@ -928,6 +929,7 @@
     t.integer "type", null: false
     t.datetime "updated_at", null: false
     t.string "workgroup", null: false
+    t.index ["careplus_integration_enabled_at"], name: "index_teams_on_careplus_integration_enabled_at"
     t.index ["name"], name: "index_teams_on_name", unique: true
     t.index ["organisation_id"], name: "index_teams_on_organisation_id"
     t.index ["programme_types"], name: "index_teams_on_programme_types", using: :gin
diff --git a/spec/factories/teams.rb b/spec/factories/teams.rb
@@ -5,6 +5,7 @@
 # Table name: teams
 #
 #  id                              :bigint           not null, primary key
+#  careplus_integration_enabled_at :datetime
 #  careplus_namespace              :string
 #  careplus_password               :string
 #  careplus_staff_code             :string
@@ -30,10 +31,11 @@
 #
 # Indexes
 #
-#  index_teams_on_name             (name) UNIQUE
-#  index_teams_on_organisation_id  (organisation_id)
-#  index_teams_on_programme_types  (programme_types) USING gin
-#  index_teams_on_workgroup        (workgroup) UNIQUE
+#  index_teams_on_careplus_integration_enabled_at  (careplus_integration_enabled_at)
+#  index_teams_on_name                             (name) UNIQUE
+#  index_teams_on_organisation_id                  (organisation_id)
+#  index_teams_on_programme_types                  (programme_types) USING gin
+#  index_teams_on_workgroup                        (workgroup) UNIQUE
 #
 # Foreign Keys
 #
@@ -93,6 +95,7 @@
     end
 
     trait :with_careplus_enabled do
+      careplus_integration_enabled_at { Time.current }
       careplus_namespace { "MOCK" }
       careplus_staff_code { "LW5PM" }
       careplus_staff_type { "IN" }
diff --git a/spec/models/team_spec.rb b/spec/models/team_spec.rb
@@ -5,6 +5,7 @@
 # Table name: teams
 #
 #  id                              :bigint           not null, primary key
+#  careplus_integration_enabled_at :datetime
 #  careplus_namespace              :string
 #  careplus_password               :string
 #  careplus_staff_code             :string
@@ -30,10 +31,11 @@
 #
 # Indexes
 #
-#  index_teams_on_name             (name) UNIQUE
-#  index_teams_on_organisation_id  (organisation_id)
-#  index_teams_on_programme_types  (programme_types) USING gin
-#  index_teams_on_workgroup        (workgroup) UNIQUE
+#  index_teams_on_careplus_integration_enabled_at  (careplus_integration_enabled_at)
+#  index_teams_on_name                             (name) UNIQUE
+#  index_teams_on_organisation_id                  (organisation_id)
+#  index_teams_on_programme_types                  (programme_types) USING gin
+#  index_teams_on_workgroup                        (workgroup) UNIQUE
 #
 # Foreign Keys
 #
@@ -175,6 +177,11 @@
       create(:team, :with_careplus_enabled, careplus_username: nil)
       create(:team, :with_careplus_enabled, careplus_password: nil)
       create(:team, :with_careplus_enabled, careplus_namespace: nil)
+      create(
+        :team,
+        :with_careplus_enabled,
+        careplus_integration_enabled_at: nil
+      )
       create(
         :team,
         careplus_username: "careplus_user",
@@ -227,6 +234,18 @@
       it { should be(false) }
     end
 
+    context "when CarePlus integration has not been enabled yet" do
+      let(:team) do
+        create(
+          :team,
+          :with_careplus_enabled,
+          careplus_integration_enabled_at: nil
+        )
+      end
+
+      it { should be(false) }
+    end
+
     context "when CarePlus export fields are missing" do
       let(:team) do
         create(

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`# Table name: teams`
`6`	`6`	`#`
`7`	`7`	`# id :bigint not null, primary key`
	`8`	`+# careplus_integration_enabled_at :datetime`
`8`	`9`	`# careplus_namespace :string`
`9`	`10`	`# careplus_password :string`
`10`	`11`	`# careplus_staff_code :string`
`@@ -30,10 +31,11 @@`
`30`	`31`	`#`
`31`	`32`	`# Indexes`
`32`	`33`	`#`
`33`		`-# index_teams_on_name (name) UNIQUE`
`34`		`-# index_teams_on_organisation_id (organisation_id)`
`35`		`-# index_teams_on_programme_types (programme_types) USING gin`
`36`		`-# index_teams_on_workgroup (workgroup) UNIQUE`
	`34`	`+# index_teams_on_careplus_integration_enabled_at (careplus_integration_enabled_at)`
	`35`	`+# index_teams_on_name (name) UNIQUE`
	`36`	`+# index_teams_on_organisation_id (organisation_id)`
	`37`	`+# index_teams_on_programme_types (programme_types) USING gin`
	`38`	`+# index_teams_on_workgroup (workgroup) UNIQUE`
`37`	`39`	`#`
`38`	`40`	`# Foreign Keys`
`39`	`41`	`#`
`@@ -93,6 +95,7 @@`
`93`	`95`	`end`
`94`	`96`
`95`	`97`	`trait :with_careplus_enabled do`
	`98`	`+ careplus_integration_enabled_at { Time.current }`
`96`	`99`	`careplus_namespace { "MOCK" }`
`97`	`100`	`careplus_staff_code { "LW5PM" }`
`98`	`101`	`careplus_staff_type { "IN" }`