Skip to content

Commit

Permalink
Revert "[Bundle] Bundle Orchestrator - Batches (#3260)"
Browse files Browse the repository at this point in the history
This reverts commit 0bdea5e.
  • Loading branch information
fhibf committed Jun 5, 2023
1 parent 0bdea5e commit 62e16d2
Show file tree
Hide file tree
Showing 105 changed files with 395 additions and 3,268 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
// -------------------------------------------------------------------------------------------------

namespace Microsoft.Health.Fhir.Client
namespace Microsoft.Health.Fhir.Api.Configs
{
public enum FhirBundleProcessingLogic
public class BundleConfiguration
{
Sequential = 0,
Parallel = 1,
public int EntryLimit { get; set; }
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using Microsoft.Health.Test.Utilities;
using Xunit;

namespace Microsoft.Health.Fhir.Core.UnitTests.Features.Persistence
namespace Microsoft.Health.Fhir.Core.UnitTests.Persistence
{
[Trait(Traits.OwningTeam, OwningTeam.Fhir)]
[Trait(Traits.Category, Categories.DomainLogicValidation)]
Expand Down
17 changes: 0 additions & 17 deletions src/Microsoft.Health.Fhir.Core/Configs/BundleConfiguration.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Microsoft.Health.Fhir.Core.Features.Context
{
public class AccessControlContext : ICloneable
public class AccessControlContext
{
/// <summary>
/// Value indicated whether or not fine grained access control policies should be applied
Expand Down Expand Up @@ -40,28 +40,5 @@ public class AccessControlContext : ICloneable
/// identifies the user's compartment. Searches will be restricted to this compartment.
/// </summary>
public string CompartmentId { get; set; } = null;

public object Clone()
{
AccessControlContext clone = new AccessControlContext()
{
ApplyFineGrainedAccessControl = ApplyFineGrainedAccessControl,
FhirUserClaim = FhirUserClaim,
CompartmentResourceType = CompartmentResourceType,
CompartmentId = CompartmentId,
};

foreach (string clinicalScope in ClinicalScopes)
{
clone.ClinicalScopes.Add(clinicalScope);
}

foreach (ScopeRestriction scopeRestriction in AllowedResourceActions)
{
clone.AllowedResourceActions.Add(scopeRestriction);
}

return clone;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -75,43 +75,5 @@ public FhirRequestContext(
public IDictionary<string, object> Properties => _properties ??= new Dictionary<string, object>();

public AccessControlContext AccessControlContext { get; set; } = new AccessControlContext();

public object Clone()
{
KeyValuePair<string, StringValues>[] requestHeaders = new KeyValuePair<string, StringValues>[RequestHeaders.Count];
RequestHeaders.CopyTo(requestHeaders, 0);

KeyValuePair<string, StringValues>[] responseHeaders = new KeyValuePair<string, StringValues>[ResponseHeaders.Count];
ResponseHeaders.CopyTo(responseHeaders, 0);

FhirRequestContext clone = new FhirRequestContext(
Method,
_uriString,
_baseUriString,
CorrelationId,
requestHeaders: new Dictionary<string, StringValues>(requestHeaders),
responseHeaders: new Dictionary<string, StringValues>(responseHeaders));

clone.RouteName = RouteName;
clone.AuditEventType = AuditEventType;
clone.Principal = Principal.Clone();
clone.ResourceType = ResourceType;
clone.IncludePartiallyIndexedSearchParams = IncludePartiallyIndexedSearchParams;
clone.ExecutingBatchOrTransaction = ExecutingBatchOrTransaction;
clone.IsBackgroundTask = IsBackgroundTask;
clone.AccessControlContext = (AccessControlContext)AccessControlContext.Clone();

foreach (OperationOutcomeIssue bundleIssue in BundleIssues)
{
clone.BundleIssues.Add(bundleIssue);
}

foreach (KeyValuePair<string, object> property in Properties)
{
clone.Properties.Add(property);
}

return clone;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
// -------------------------------------------------------------------------------------------------

using System;
using System.Collections.Generic;
using Microsoft.Health.Core.Features.Context;
using Microsoft.Health.Fhir.Core.Models;

namespace Microsoft.Health.Fhir.Core.Features.Context
{
public interface IFhirRequestContext : IRequestContext, ICloneable
public interface IFhirRequestContext : IRequestContext
{
string ResourceType { get; set; }

Expand Down

This file was deleted.

Loading

0 comments on commit 62e16d2

Please sign in to comment.