Skip to content
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
๏ปฟ// FIXME: Update this file to be null safe and then delete the line below
#nullable disable

using Bit.Api.Dirt.Models.Response;
using Bit.Api.Models.Response;
using Bit.Api.Utilities;
using Bit.Api.Utilities.DiagnosticTools;
Expand All @@ -17,7 +18,7 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;

namespace Bit.Api.Controllers;
namespace Bit.Api.Dirt.Controllers;

[Route("events")]
[Authorize("Application")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Bit.Core.Models.Api;
using Bit.Core.Models.Data;

namespace Bit.Api.Models.Response;
namespace Bit.Api.Dirt.Models.Response;

public class EventResponseModel : ResponseModel
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
๏ปฟ
using System.Net;
using Bit.Api.Models.Public.Request;
๏ปฟusing System.Net;
using Bit.Api.Dirt.Public.Models;
using Bit.Api.Models.Public.Response;
using Bit.Api.Utilities.DiagnosticTools;
using Bit.Core.Context;
Expand All @@ -12,7 +11,7 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;

namespace Bit.Api.Public.Controllers;
namespace Bit.Api.Dirt.Public.Controllers;

[Route("public/events")]
[Authorize("Organization")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using Bit.Core.Exceptions;

namespace Bit.Api.Models.Public.Request;
namespace Bit.Api.Dirt.Public.Models;

public class EventFilterRequestModel
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
๏ปฟusing System.ComponentModel.DataAnnotations;
using Bit.Api.Models.Public.Response;
using Bit.Core.Enums;
using Bit.Core.Models.Data;

namespace Bit.Api.Models.Public.Response;
namespace Bit.Api.Dirt.Public.Models;

/// <summary>
/// An event log.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
๏ปฟ// FIXME: Update this file to be null safe and then delete the line below
#nullable disable

using Bit.Api.Dirt.Models.Response;
using Bit.Api.Models.Response;
using Bit.Api.Utilities;
using Bit.Core.Exceptions;
Expand Down
4 changes: 2 additions & 2 deletions src/Api/Utilities/DiagnosticTools/EventDiagnosticLogger.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
๏ปฟusing Bit.Api.Models.Public.Request;
๏ปฟusing Bit.Api.Dirt.Public.Models;
using Bit.Api.Models.Public.Response;
using Bit.Core;
using Bit.Core.Services;
Expand Down Expand Up @@ -49,7 +49,7 @@ public static void LogAggregateData(
this ILogger logger,
IFeatureService featureService,
Guid organizationId,
IEnumerable<Bit.Api.Models.Response.EventResponseModel> data,
IEnumerable<Dirt.Models.Response.EventResponseModel> data,
string? continuationToken,
DateTime? queryStart = null,
DateTime? queryEnd = null)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
๏ปฟusing Bit.Api.Models.Public.Request;
๏ปฟusing Bit.Api.Dirt.Public.Models;
using Bit.Api.Models.Public.Response;
using Bit.Api.Utilities.DiagnosticTools;
using Bit.Core;
Expand Down Expand Up @@ -155,7 +155,7 @@ public void LogAggregateData_WithInternalResponse_EmptyData_LogsZeroCount(
var featureService = Substitute.For<IFeatureService>();
featureService.IsEnabled(FeatureFlagKeys.EventDiagnosticLogging).Returns(true);

Bit.Api.Models.Response.EventResponseModel[] emptyEvents = [];
Api.Dirt.Models.Response.EventResponseModel[] emptyEvents = [];

// Act
logger.LogAggregateData(featureService, organizationId, emptyEvents, null, null, null);
Expand Down Expand Up @@ -188,7 +188,7 @@ public void LogAggregateData_WithInternalResponse_FeatureFlagEnabled_LogsInforma
var oldestEvent = Substitute.For<IEvent>();
oldestEvent.Date.Returns(DateTime.UtcNow.AddDays(-2));

var events = new List<Bit.Api.Models.Response.EventResponseModel>
var events = new List<Api.Dirt.Models.Response.EventResponseModel>
{
new (newestEvent),
new (middleEvent),
Expand Down
Loading