Merge branch 'feature/fhir-dialogue-1' into develop

dermatologist · Oct 8, 2020 · 0272a48 · 0272a48
2 parents aa26868 + e57279a
commit 0272a48
Show file tree

Hide file tree

Showing 27 changed files with 426 additions and 35 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,36 @@
+{
+   // Use IntelliSense to find out which attributes exist for C# debugging
+   // Use hover for the description of the existing attributes
+   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+   "version": "0.2.0",
+   "configurations": [
+        {
+            "name": ".NET Core Launch (web)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/FhirSearchSkillBot/bin/Debug/netcoreapp3.1/FhirSearchSkillBot.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/FhirSearchSkillBot",
+            "stopAtEntry": false,
+            // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
+            "serverReadyAction": {
+                "action": "openExternally",
+                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+            },
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "sourceFileMap": {
+                "/Views": "${workspaceFolder}/Views"
+            }
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:pickProcess}"
+        }
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,42 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/FhirSearchSkillBot/FhirSearchSkillBot.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/FhirSearchSkillBot/FhirSearchSkillBot.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "${workspaceFolder}/FhirSearchSkillBot/FhirSearchSkillBot.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}
diff --git a/DialogRootBot/AdapterWithErrorHandler.cs b/DialogRootBot/AdapterWithErrorHandler.cs
@@ -11,11 +11,11 @@
 using Microsoft.Bot.Builder.TraceExtensions;
 using Microsoft.Bot.Connector.Authentication;
 using Microsoft.Bot.Schema;
-using Nuchange.HealthBots.SimpleRootBot.Bots;
+using SimpleRootBot.Bots;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
-namespace Nuchange.HealthBots.SimpleRootBot
+namespace SimpleRootBot
 {
     public class AdapterWithErrorHandler : BotFrameworkHttpAdapter
     {

diff --git a/DialogRootBot/Authentication/AllowedSkillsClaimsValidator.cs b/DialogRootBot/Authentication/AllowedSkillsClaimsValidator.cs
@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using Microsoft.Bot.Connector.Authentication;
 
-namespace Nuchange.HealthBots.SimpleRootBot.Authentication
+namespace SimpleRootBot.Authentication
 {
     /// <summary>
     /// Sample claims validator that loads an allowed list from configuration if present

diff --git a/DialogRootBot/Bots/RootBot.cs b/DialogRootBot/Bots/RootBot.cs
@@ -14,7 +14,7 @@
 using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
 
-namespace Nuchange.HealthBots.SimpleRootBot.Bots
+namespace SimpleRootBot.Bots
 {
     public class RootBot : ActivityHandler
     {

diff --git a/DialogRootBot/Controllers/BotController.cs b/DialogRootBot/Controllers/BotController.cs
@@ -6,7 +6,7 @@
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Integration.AspNet.Core;
 
-namespace Nuchange.HealthBots.SimpleRootBot.Controllers
+namespace SimpleRootBot.Controllers
 {
     // This ASP Controller is created to handle a request. Dependency Injection will provide the Adapter and IBot
     // implementation at runtime. Multiple different IBot implementations running at different endpoints can be

diff --git a/DialogRootBot/Controllers/SkillController.cs b/DialogRootBot/Controllers/SkillController.cs
@@ -6,7 +6,7 @@
 using Microsoft.Bot.Builder.Integration.AspNet.Core;
 using Microsoft.Bot.Builder.Skills;
 
-namespace Nuchange.HealthBots.SimpleRootBot.Controllers
+namespace SimpleRootBot.Controllers
 {
     /// <summary>
     /// A controller that handles skill replies to the bot.

diff --git a/DialogRootBot/DialogRootBot.csproj b/DialogRootBot/DialogRootBot.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
-    <AssemblyName>Nuchange.HealthBots.SimpleRootBot</AssemblyName>
-    <RootNamespace>Nuchange.HealthBots.SimpleRootBot</RootNamespace>
+    <AssemblyName>SimpleRootBot</AssemblyName>
+    <RootNamespace>SimpleRootBot</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/DialogRootBot/Program.cs b/DialogRootBot/Program.cs
@@ -5,7 +5,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
-namespace Nuchange.HealthBots.SimpleRootBot
+namespace SimpleRootBot
 {
     public class Program
     {

diff --git a/DialogRootBot/SkillConversationIdFactory.cs b/DialogRootBot/SkillConversationIdFactory.cs
@@ -8,7 +8,7 @@
 using Microsoft.Bot.Schema;
 using Newtonsoft.Json;
 
-namespace Nuchange.HealthBots.SimpleRootBot
+namespace SimpleRootBot
 {
     /// <summary>
     /// A <see cref="SkillConversationIdFactory"/> that uses an in memory <see cref="ConcurrentDictionary{TKey,TValue}"/>

diff --git a/DialogRootBot/SkillsConfiguration.cs b/DialogRootBot/SkillsConfiguration.cs
@@ -6,7 +6,7 @@
 using Microsoft.Bot.Builder.Skills;
 using Microsoft.Extensions.Configuration;
 
-namespace Nuchange.HealthBots.SimpleRootBot
+namespace SimpleRootBot
 {
     /// <summary>
     /// A helper class that loads Skills information from configuration.

diff --git a/DialogRootBot/Startup.cs b/DialogRootBot/Startup.cs
@@ -9,12 +9,12 @@
 using Microsoft.Bot.Builder.Integration.AspNet.Core.Skills;
 using Microsoft.Bot.Builder.Skills;
 using Microsoft.Bot.Connector.Authentication;
-using Nuchange.HealthBots.SimpleRootBot.Authentication;
-using Nuchange.HealthBots.SimpleRootBot.Bots;
+using SimpleRootBot.Authentication;
+using SimpleRootBot.Bots;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-namespace Nuchange.HealthBots.SimpleRootBot
+namespace SimpleRootBot
 {
     public class Startup
     {

diff --git a/FhirSearchSkillBot.testing/FhirSearchModelTest.cs b/FhirSearchSkillBot.testing/FhirSearchModelTest.cs
@@ -0,0 +1,35 @@
+using System;
+using Xunit;
+using FhirSearchSkillBot.Models; 
+namespace FhirSearchSkillBot.testing
+{
+    public class FhirSearchModelTest
+    {
+        [Fact]
+        public void TestModel()
+        {
+            var _fhirSearchModel = new FhirSearchModel();
+            // Default setting in model constructor
+            // _fhirSearchModel.BaseUrl = @"http://hapi.fhir.org/baseR4/";
+            _fhirSearchModel.Patient = "585457";
+            _fhirSearchModel.SearchResource = "Encounter";
+            _fhirSearchModel.SearchParam.Add("_date");
+            _fhirSearchModel.SearchQualifier.Add("=");
+            _fhirSearchModel.SearchValue.Add("12-03-2020");
+            Console.Write(_fhirSearchModel.FhirSearchString);
+        }
+
+        [Fact]
+        public void TestApi()
+        {
+            var _fhirSearchModel = new FhirSearchModel();
+            // _fhirSearchModel.BaseUrl = @"http://hapi.fhir.org/baseR4/";
+            _fhirSearchModel.Patient = "585457";
+            _fhirSearchModel.SearchResource = "Encounter";
+            _fhirSearchModel.SearchParam.Add("_date");
+            _fhirSearchModel.SearchQualifier.Add("=");
+            _fhirSearchModel.SearchValue.Add("12-03-2020");
+            Console.Write(_fhirSearchModel.FhirSearch);
+        }
+    }
+}
diff --git a/FhirSearchSkillBot.testing/FhirSearchSkillBot.testing.csproj b/FhirSearchSkillBot.testing/FhirSearchSkillBot.testing.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="coverlet.collector" Version="1.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\FhirSearchSkillBot\FhirSearchSkillBot.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/FhirSearchSkillBot.testing/UnitTest1.cs b/FhirSearchSkillBot.testing/UnitTest1.cs
@@ -0,0 +1,14 @@
+using System;
+using Xunit;
+
+namespace FhirSearchSkillBot.testing
+{
+    public class UnitTest1
+    {
+        [Fact]
+        public void Test1()
+        {
+
+        }
+    }
+}
diff --git a/FhirSearchSkillBot/Authentication/AllowedCallersClaimsValidator.cs b/FhirSearchSkillBot/Authentication/AllowedCallersClaimsValidator.cs
@@ -8,7 +8,7 @@
 using Microsoft.Bot.Connector.Authentication;
 using Microsoft.Extensions.Configuration;
 
-namespace Nuchange.HealthBots.FhirSearchSkillBot.Authentication
+namespace FhirSearchSkillBot.Authentication
 {
     /// <summary>
     /// Sample claims validator that loads an allowed list from configuration if present

diff --git a/FhirSearchSkillBot/Bots/FhirSearchBot.cs b/FhirSearchSkillBot/Bots/FhirSearchBot.cs
@@ -9,7 +9,7 @@
 using Microsoft.Extensions.Logging;
 
 
-namespace Nuchange.HealthBots.FhirSearchSkillBot.Bots
+namespace FhirSearchSkillBot.Bots
 {
     // This IBot implementation can run any type of Dialog. The use of type parameterization is to allows multiple different bots
     // to be run at different endpoints within the same project. This can be achieved by defining distinct Controller types

diff --git a/FhirSearchSkillBot/Controllers/BotController.cs b/FhirSearchSkillBot/Controllers/BotController.cs
@@ -6,7 +6,7 @@
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Integration.AspNet.Core;
 
-namespace Nuchange.HealthBots.FhirSearchSkillBot.Controllers
+namespace FhirSearchSkillBot.Controllers
 {
     // This ASP Controller is created to handle a request. Dependency Injection will provide the Adapter and IBot
     // implementation at runtime. Multiple different IBot implementations running at different endpoints can be