Refactor DB repositories for EF

Signed-off-by: Victor Chang <[email protected]>

Author: mocsharp

src/Database/Api/IInformaticsGatewayRepository.cs

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2022 MONAI Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Microsoft.Extensions.Logging;
+
+namespace Monai.Deploy.InformaticsGateway.Database.Api
+{
+    public static partial class Log
+    {
+        [LoggerMessage(EventId = 9000, Level = LogLevel.Error, Message = "Error adding item {type} to the database.")]
+        public static partial void ErrorAddItem(this ILogger logger, string @type, Exception ex);
+
+        [LoggerMessage(EventId = 9001, Level = LogLevel.Error, Message = "Error updating item {type} in the database.")]
+        public static partial void ErrorUpdateItem(this ILogger logger, string @type, Exception ex);
+
+        [LoggerMessage(EventId = 9002, Level = LogLevel.Error, Message = "Error deleting item {type} from the database.")]
+        public static partial void ErrorDeleteItem(this ILogger logger, string @type, Exception ex);
+    }
+}

src/Database/Api/Log.9000.cs

@@ -17,7 +17,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <RootNamespace>Monai.Deploy.InformaticsGateway.Database.Repositories</RootNamespace>
+    <RootNamespace>Monai.Deploy.InformaticsGateway.Database.Api</RootNamespace>
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -31,10 +31,12 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
+    <PackageReference Include="Polly" Version="7.2.3" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\Api\Monai.Deploy.InformaticsGateway.Api.csproj" />
+    <ProjectReference Include="..\..\Configuration\Monai.Deploy.InformaticsGateway.Configuration.csproj" />
   </ItemGroup>
 
 </Project>

src/Database/Api/Monai.Deploy.InformaticsGateway.Database.Api.csproj

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 MONAI Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System.Linq.Expressions;
+using Monai.Deploy.InformaticsGateway.Api;
+
+namespace Monai.Deploy.InformaticsGateway.Database.Api.Repositories
+{
+    public interface IDestinationApplicationEntityRepository
+    {
+        Task<List<DestinationApplicationEntity>> ToListAsync(CancellationToken cancellationToken = default);
+
+        Task<DestinationApplicationEntity?> FindByNameAsync(string name, CancellationToken cancellationToken = default);
+
+        Task<DestinationApplicationEntity> AddAsync(DestinationApplicationEntity item, CancellationToken cancellationToken = default);
+
+        Task<DestinationApplicationEntity> UpdateAsync(DestinationApplicationEntity entity, CancellationToken cancellationToken = default);
+
+        Task<DestinationApplicationEntity> RemoveAsync(DestinationApplicationEntity entity, CancellationToken cancellationToken = default);
+
+        Task<bool> ContainsAsync(Expression<Func<DestinationApplicationEntity, bool>> predicate, CancellationToken cancellationToken = default);
+    }
+}

src/Database/Api/Repositories/IDestinationApplicationEntityRepository.cs

@@ -2,7 +2,7 @@
  * Copyright 2021-2022 MONAI Consortium
  * Copyright 2019-2021 NVIDIA Corporation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License", CancellationToken cancellationToken = default);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -15,12 +15,9 @@
  * limitations under the License.
  */
 
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 using Monai.Deploy.InformaticsGateway.Api.Rest;
 
-namespace Monai.Deploy.InformaticsGateway.Repositories
+namespace Monai.Deploy.InformaticsGateway.Database.Api.Repositories
 {
     /// <summary>
     /// Interface for access stored inference requests.
@@ -31,7 +28,7 @@ public interface IInferenceRequestRepository
         /// Adds new inference request to the repository.
         /// </summary>
         /// <param name="inferenceRequest">The inference request to be added.</param>
-        Task Add(InferenceRequest inferenceRequest);
+        Task AddAsync(InferenceRequest inferenceRequest, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Updates an inference request's status.
@@ -40,39 +37,39 @@ public interface IInferenceRequestRepository
         /// </summary>
         /// <param name="inferenceRequest">The inference request to be updated.</param>
         /// <param name="status">Current status of the inference request.</param>
-        Task Update(InferenceRequest inferenceRequest, InferenceRequestStatus status);
+        Task UpdateAsync(InferenceRequest inferenceRequest, InferenceRequestStatus status, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// <c>Take</c> returns the next pending inference request for data retrieval.
         /// The default implementation blocks the call until a pending inference request is available for process.
         /// </summary>
         /// <param name="cancellationToken">cancellation token used to cancel the action.</param>
         /// <returns><see cref="InferenceRequest"/></returns>
-        Task<InferenceRequest> Take(CancellationToken cancellationToken);
+        Task<InferenceRequest> TakeAsync(CancellationToken cancellationToken = default);
 
         /// <summary>
         /// <c>Get</c> returns the specified inference request.
         /// </summary>
         /// <param name="transactionId">The transactionId of the request.</param>
-        InferenceRequest GetInferenceRequest(string transactionId);
+        Task<InferenceRequest?> GetInferenceRequestAsync(string transactionId, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// <c>Get</c> returns the specified inference request.
         /// </summary>
         /// <param name="inferenceRequestId">The internal ID of the request.</param>
-        Task<InferenceRequest> GetInferenceRequest(Guid inferenceRequestId);
+        Task<InferenceRequest?> GetInferenceRequestAsync(Guid inferenceRequestId, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// <c>Exists</c> checks whether if an existing request with the same transaction ID exists.
         /// </summary>
         /// <param name="transactionId"></param>
         /// <returns></returns>
-        bool Exists(string transactionId);
+        Task<bool> ExistsAsync(string transactionId, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// <c>GetStatus</c> returns the status of the specified inference request.
         /// </summary>
         /// <param name="transactionId">The transactionId from the original request.</param>
-        Task<InferenceStatusResponse> GetStatus(string transactionId);
+        Task<InferenceStatusResponse?> GetStatusAsync(string transactionId, CancellationToken cancellationToken = default);
     }
 }

src/InformaticsGateway/Repositories/IInferenceRequestRepository.cs renamed to src/Database/Api/Repositories/IInferenceRequestRepository.cs

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 MONAI Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System.Linq.Expressions;
+using Monai.Deploy.InformaticsGateway.Api;
+
+namespace Monai.Deploy.InformaticsGateway.Database.Api.Repositories
+{
+    public interface IMonaiApplicationEntityRepository
+    {
+        Task<List<MonaiApplicationEntity>> ToListAsync(CancellationToken cancellationToken = default);
+
+        Task<MonaiApplicationEntity?> FindByNameAsync(string name, CancellationToken cancellationToken = default);
+
+        Task<MonaiApplicationEntity> AddAsync(MonaiApplicationEntity item, CancellationToken cancellationToken = default);
+
+        Task<MonaiApplicationEntity> UpdateAsync(MonaiApplicationEntity entity, CancellationToken cancellationToken = default);
+
+        Task<MonaiApplicationEntity> RemoveAsync(MonaiApplicationEntity entity, CancellationToken cancellationToken = default);
+
+        Task<bool> ContainsAsync(Expression<Func<MonaiApplicationEntity, bool>> predicate, CancellationToken cancellationToken = default);
+    }
+}

src/Database/Api/Repositories/IMonaiApplicationEntityRepository.cs

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2022 MONAI Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System.Linq.Expressions;
+using Monai.Deploy.InformaticsGateway.Api.Storage;
+
+namespace Monai.Deploy.InformaticsGateway.Database.Api.Repositories
+{
+    public interface IPayloadRepository
+    {
+        Task<List<Payload>> ToListAsync(CancellationToken cancellationToken = default);
+
+        Task<Payload> AddAsync(Payload item, CancellationToken cancellationToken = default);
+
+        Task<Payload> UpdateAsync(Payload entity, CancellationToken cancellationToken = default);
+
+        Task<Payload> RemoveAsync(Payload entity, CancellationToken cancellationToken = default);
+
+        Task<bool> ContainsAsync(Expression<Func<Payload, bool>> predicate, CancellationToken cancellationToken = default);
+
+        Task<int> RemovePendingPayloadsAsync(CancellationToken cancellationToken = default);
+
+        Task<List<Payload>> GetPayloadsInStateAsync(CancellationToken cancellationToken = default, params Payload.PayloadState[] states);
+    }
+}

src/Database/Api/Repositories/IPayloadRepository.cs

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 MONAI Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System.Linq.Expressions;
+using Monai.Deploy.InformaticsGateway.Api;
+
+namespace Monai.Deploy.InformaticsGateway.Database.Api.Repositories
+{
+    public interface ISourceApplicationEntityRepository
+    {
+        Task<List<SourceApplicationEntity>> ToListAsync(CancellationToken cancellationToken = default);
+
+        Task<SourceApplicationEntity?> FindByNameAsync(string name, CancellationToken cancellationToken = default);
+
+        Task<SourceApplicationEntity> AddAsync(SourceApplicationEntity item, CancellationToken cancellationToken = default);
+
+        Task<SourceApplicationEntity> UpdateAsync(SourceApplicationEntity entity, CancellationToken cancellationToken = default);
+
+        Task<SourceApplicationEntity> RemoveAsync(SourceApplicationEntity entity, CancellationToken cancellationToken = default);
+
+        Task<bool> ContainsAsync(Expression<Func<SourceApplicationEntity, bool>> predicate, CancellationToken cancellationToken = default);
+    }
+}