dock_health_api 0.5.7 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60108cba91179c4029f17053daa0ee7cde2e6a067e48e35461db07e8c2bcefc0
-  data.tar.gz: 49fd631f9c4f65bc3bdf7570848dad0f6da8a387b67bf65e0b0ff1d2ae8feb31
+  metadata.gz: 3d1832a40bbc54875371a1f819afe18ea48072ba29254aac0fbf4d535cbbf25d
+  data.tar.gz: faa6758f0cd9b27186921934898640fa7833360d47106a4b2d740d94aef26106
 SHA512:
-  metadata.gz: 839de68118bab1fb66bc0136ac1d5f53e8585cbcd97a393bd59a767357c94ee8d19c11df84f014c9ccccd0e1829d67a0087ab596fbaa8227d138572b52e26e83
-  data.tar.gz: '0498a398b03fe384825157e1ee6d0135315443edb6ba97d5dd330a5e9d057eff3cf8a70d73e60ffad2231a01e528197046f5bdb9b4c68561626403106dcabd3f'
+  metadata.gz: 49846f61f1b202289521fbacc162e63f976378692f7152c496c37ddff66b87cf9b1bdc2e26f32b251d7db619f84b2dfddbbfa3a9c4042846577f9c95fea78e20
+  data.tar.gz: 7e79857806c080d7f5bf156a1438befead22c8ee3f07984ca0f73357bdb94ec36071815c251039c3543b101da27cfa3a4b8142fdbd607acce0580adf4de92b4a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dock_health_api (0.5.7)
+    dock_health_api (0.5.9)
       oauth2 (~> 1.4)
       ostruct
       rspec (~> 3.0)

data/README.md

@@ -126,6 +126,19 @@ params = { userId: "<user id>", organizationId: "<organization id>" }
 DockHealthApi::Organization::User.update(params)
 # Delete User from Organization
 DockHealthApi::Organization::User.delete({id: "< user id >"})
+
+# Get Specific Comment
+DockHealthApi::Task::Comment.get("<comment id>")
+# List comments for a specific task
+DockHealthApi::Task::Comment.list(taskIdentifier: "<task id>")
+# Create comment for a specific task
+params = { comment: "comment text here", task: { type: "TASK", id: "<task id>" }}
+DockHealthApi::Task::Comment.create(params)
+# Update specific comment
+params = { comment: "comment text here", id: "<comment id>" }
+DockHealthApi::Task::Comment.update(params)
+# Delete a specific comment
+DockHealthApi::Task::Comment.delete(id: "<comment id>")
 ```
 
 # Patient Data Format

data/lib/dock_health_api/client.rb

@@ -6,17 +6,13 @@ module DockHealthApi
     BUFFER = 120
 
     include Singleton
-    
+
     attr_reader :config
 
     def initialize
       @config = DockHealthApi.config
     end
 
-    def active_client
-      instance
-    end
-
     def connection
       @connection ||= OAuth2::Client.new(config.api_key, config.api_secret, token_url: config.token_url, raise_errors: false)
     end
@@ -35,10 +31,18 @@ module DockHealthApi
     end
 
     def iframe_token_connection
-      get_iframe_token
+      get_iframe_token if @iframe_token_connection.nil? || iframe_token_about_to_expire?
       @iframe_token_connection
     end
 
+    def iframe_token_expiration_time
+      @iframe_token_expiration_time ||= Time.now + @iframe_token_connection.expires_in
+    end
+
+    def iframe_token_about_to_expire?
+      Time.now + BUFFER > iframe_token_expiration_time
+    end
+
     def token
       @token ||= token_connection.token
     end
@@ -56,8 +60,8 @@ module DockHealthApi
     def get_iframe_token
       @iframe_token_connection = connection.client_credentials.get_token(scope:"dockhealth/system.embedded.launch")
       return @iframe_token_connection if @iframe_token_connection.nil?
-      DockHealthApi.iframe_token = @iframe_token_connection.token
-      DockHealthApi.iframe_token_expires_at = Time.now + @iframe_token_connection.expires_in
+      @iframe_token_expiration_time = Time.now + @iframe_token_connection.expires_in
+      @iframe_token_connection
     end
   end
 end

data/lib/dock_health_api/config.rb

@@ -8,10 +8,6 @@ module DockHealthApi
       :org_id,
       :user_id,
       :api,
-      :iframe_token,
-      :token,
-      :iframe_token_expires_at,
-      :token_expires_at,
       :debug,
       :iframe_base_url
   end

data/lib/dock_health_api/resources/task.rb

@@ -16,5 +16,11 @@ module DockHealthApi
         "#{Task.resource_url}/group"
       end
     end
+
+    class Comment < Task
+      def self.resource_url
+        "#{Task.resource_url}/comment"
+      end
+    end    
   end
 end

data/lib/dock_health_api/version.rb

@@ -1,3 +1,3 @@
 module DockHealthApi
-  VERSION = "0.5.7"
+  VERSION = "0.5.9"
 end

data/lib/dock_health_api.rb

@@ -45,24 +45,19 @@ module DockHealthApi
     def_delegators :@config, :org_id, :org_id=
     def_delegators :@config, :user_id, :user_id=
     def_delegators :@config, :api, :api=
-    def_delegators :@config, :iframe_token, :iframe_token=
-    def_delegators :@config, :iframe_token_expires_at, :iframe_token_expires_at=
-    def_delegators :@config, :token, :token=
-    def_delegators :@config, :token_expires_at, :token_expires_at=
     def_delegators :@config, :debug, :debug=
     def_delegators :@config, :iframe_base_url, :iframe_base_url=
 
     def receive_iframe_token
-      Client.instance.iframe_token_connection if iframe_token_expired?
+      @receive_iframe_token ||= Client.instance.iframe_token_connection
     end
 
-    def iframe_token_expired?
-      return Time.now > self.iframe_token_expires_at if self.iframe_token_expires_at
-      true
+    def iframe_token
+      receive_iframe_token.token
     end
 
     def iframe_url(arg={})
-      DockHealthApi.receive_iframe_token
+      receive_iframe_token
       dock_user_id = arg[:user_id]
       view_type = arg[:view_type]
       target_type = arg[:target_type]

data/spec/task_comment_spec.rb

@@ -0,0 +1,72 @@
+require 'dock_health_api'
+require 'spec_helper'
+
+RSpec.describe DockHealthApi::Task::Comment do
+  let(:tasklistid) {DockHealthApi::TaskList.list.last["id"]}
+  let(:task) { DockHealthApi::Task.create({ description: "test foobar", taskList: { type: "DEVELOPER", id: tasklistid } }) }
+  let(:params) { { comment: "initial comment", task: { type: "TASK", id: task["id"] }} }
+  let!(:comment) { DockHealthApi::Task::Comment.create(params) }
+
+  describe "#create" do
+    context "create new task comment" do
+      let(:new_comment_params) { { comment: "new comment", task: { type: "TASK", id: task["id"] }} }
+        
+      it "should create new task comment" do
+        initial_count = DockHealthApi::Task::Comment.list(taskIdentifier: task["id"]).count
+        response = DockHealthApi::Task::Comment.create(new_comment_params)
+        final_count = DockHealthApi::Task::Comment.list(taskIdentifier: task["id"]).count
+        expect(response["comment"]).to eq(new_comment_params[:comment])
+        expect(final_count - initial_count).to eq(1)
+      end
+    end
+  end
+
+  describe "#list" do
+    context "list task comment by criteria" do
+      it "should list all task comments by criteria" do
+        response = DockHealthApi::Task::Comment.list(taskIdentifier: task["id"])
+        expect(response.last.is_a?(DockHealthApi::Task::Comment))
+      end
+    end
+  end
+
+  describe "#get" do
+    context "get a specific task comment" do
+      it "should get the correct task comment" do
+        response = DockHealthApi::Task::Comment.get(comment["id"])
+        expect(response["comment"]).to eq(params[:comment])
+      end
+    end
+
+    context "get task comment with wrong id" do
+      it "should return 404" do
+        wrong_id = "a" * 36
+        response = DockHealthApi::Task::Comment.get(wrong_id)
+        expect(response["status"]).to eq(500)
+      end
+    end
+  end
+
+  describe "#update" do
+    context "update existing task comment" do
+      it "should update existing task comment" do
+        update_params = { comment: "updated text", id: comment["id"] }
+        response = DockHealthApi::Task::Comment.update(update_params)
+        expect(response["comment"]).to eq(update_params[:comment])
+        updated_task = DockHealthApi::Task::Comment.get(comment["id"])
+        expect(updated_task["comment"]).to eq(update_params[:comment])
+      end
+    end
+  end
+
+  describe "#delete" do
+    context "Delete existing task comment" do
+      it "should delete existing task comment" do
+        initial_count = DockHealthApi::Task::Comment.list(taskIdentifier: task["id"]).count
+        response = DockHealthApi::Task::Comment.delete(id: comment["id"])
+        final_count = DockHealthApi::Task::Comment.list(taskIdentifier: task["id"]).count
+        expect(initial_count - final_count).to eq(1)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dock_health_api
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.9
 platform: ruby
 authors:
 - Robert Magomero
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-19 00:00:00.000000000 Z
+date: 2023-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -127,6 +127,7 @@ files:
 - spec/organization.rb
 - spec/patient_spec.rb
 - spec/spec_helper.rb
+- spec/task_comment_spec.rb
 - spec/task_group_spec.rb
 - spec/task_spec.rb
 - spec/tasklist_spec.rb