refactor: merge digital and entries packages to 1 packages named entries

src/Api/Api.csproj

@@ -24,4 +24,8 @@
  <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
  </ItemGroup>
 
+ <ItemGroup>
+ <Folder Include="Controllers\Payload\Requests\DigitalFile" />
+ </ItemGroup>
+
 </Project>

src/Api/Controllers/BinController.cs

@@ -1,7 +1,7 @@
 using Application.Common.Interfaces;
 using Application.Common.Models;
 using Application.Common.Models.Dtos.Digital;
-using Application.Digital.Commands;
+using Application.Entries.Commands;
 using Application.Identity;
 using Infrastructure.Identity.Authorization;
 using Microsoft.AspNetCore.Mvc;

src/Api/Controllers/EntriesController.cs

@@ -1,16 +1,15 @@
-using Api.Controllers.Payload.Requests.DigitalFile;
 using Api.Controllers.Payload.Requests.Entries;
 using Application.Common.Exceptions;
 using Application.Common.Interfaces;
 using Application.Common.Models;
 using Application.Common.Models.Dtos.Digital;
-using Application.Digital.Commands;
-using Application.Digital.Queries;
+using Application.Entries.Commands;
+using Application.Entries.Queries;
 using Application.Identity;
 using FluentValidation.Results;
 using Infrastructure.Identity.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using GetAllEntriesPaginatedQueryParameters = Api.Controllers.Payload.Requests.DigitalFile.GetAllEntriesPaginatedQueryParameters;
+using GetAllEntriesPaginatedQueryParameters = Api.Controllers.Payload.Requests.Entries.GetAllEntriesPaginatedQueryParameters;
 
 namespace Api.Controllers;
 

src/Api/Controllers/Payload/Requests/Entries/GetAllEntriesPaginatedQueryParameters.cs

@@ -1,12 +1,9 @@
-namespace Api.Controllers.Payload.Requests.Entries;
+namespace Api.Controllers.Payload.Requests.Entries;
 
 /// <summary>
 /// Get All Entries Paginated Query Parameters
 /// </summary>
 public class GetAllEntriesPaginatedQueryParameters : PaginatedQueryParameters
 {
- /// <summary>
- /// Entry id
- /// </summary>
- public Guid? EntryId { get; set; }
+ public string EntryPath { get; set; }
 }

src/Api/Controllers/Payload/Requests/Entries/GetAllSharedEntriesPaginatedQueryParameters.cs

@@ -0,0 +1,12 @@
+namespace Api.Controllers.Payload.Requests.Entries;
+
+/// <summary>
+/// Get All Shared Entries Paginated Query Parameters
+/// </summary>
+public class GetAllSharedEntriesPaginatedQueryParameters : PaginatedQueryParameters
+{
+ /// <summary>
+ /// Entry id
+ /// </summary>
+ public Guid? EntryId { get; set; }
+}

src/Api/Controllers/Payload/Requests/DigitalFile/ShareEntryPermissionRequest.cs → src/Api/Controllers/Payload/Requests/Entries/ShareEntryPermissionRequest.cs

@@ -1,4 +1,4 @@
-namespace Api.Controllers.Payload.Requests.DigitalFile;
+namespace Api.Controllers.Payload.Requests.Entries;
 
 public class ShareEntryPermissionRequest
 {

src/Api/Controllers/Payload/Requests/DigitalFile/UploadDigitalFileRequest.cs → src/Api/Controllers/Payload/Requests/Entries/UploadDigitalFileRequest.cs

@@ -1,4 +1,4 @@
-namespace Api.Controllers.Payload.Requests.DigitalFile;
+namespace Api.Controllers.Payload.Requests.Entries;
 
 /// <summary>
 /// 

src/Api/Controllers/Payload/Requests/DigitalFile/UploadSharedEntryRequest.cs → src/Api/Controllers/Payload/Requests/Entries/UploadSharedEntryRequest.cs

@@ -1,4 +1,4 @@
-namespace Api.Controllers.Payload.Requests.DigitalFile;
+namespace Api.Controllers.Payload.Requests.Entries;
 
 /// <summary>
 /// 

src/Api/Controllers/SharedController.cs

@@ -1,18 +1,16 @@
-using Api.Controllers.Payload.Requests.DigitalFile;
 using Api.Controllers.Payload.Requests.Entries;
 using Application.Common.Exceptions;
 using Api.Controllers.Payload.Requests.Users;
 using Application.Common.Interfaces;
 using Application.Common.Models;
 using Application.Common.Models.Dtos.Digital;
-using Application.Digital.Commands;
+using Application.Entries.Commands;
 using Application.Entries.Queries;
 using Application.Identity;
 using FluentValidation.Results;
 using Application.Users.Queries;
 using Infrastructure.Identity.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using GetAllEntriesPaginatedQueryParameters = Api.Controllers.Payload.Requests.Entries.GetAllEntriesPaginatedQueryParameters;
 
 namespace Api.Controllers;
 
@@ -53,7 +51,7 @@ public async Task<ActionResult> DownloadSharedFile([FromRoute] Guid entryId)
  [RequiresRole(IdentityData.Roles.Employee)]
  [HttpGet("entries")]
  public async Task<ActionResult<PaginatedList<EntryDto>>> GetAll(
- [FromQuery] GetAllEntriesPaginatedQueryParameters queryParameters)
+ [FromQuery] GetAllSharedEntriesPaginatedQueryParameters queryParameters)
  {
  var currentUser = _currentUserService.GetCurrentUser();
  var query = new GetAllSharedEntriesPaginated.Query()

src/Application/Digital/Commands/DeleteBinEntry.cs → src/Application/Entries/Commands/DeleteBinEntry.cs

@@ -5,9 +5,8 @@
 using Domain.Entities;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
-using NodaTime;
 
-namespace Application.Digital.Commands;
+namespace Application.Entries.Commands;
 
 public class DeleteBinEntry
 {

src/Application/Digital/Commands/DownloadDigitalFile.cs → src/Application/Entries/Commands/DownloadDigitalFile.cs

@@ -1,13 +1,10 @@
 using Application.Common.Exceptions;
 using Application.Common.Interfaces;
-using Application.Common.Models.Dtos;
 using Application.Common.Models.Operations;
-using AutoMapper;
-using Domain.Entities;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
-namespace Application.Digital.Commands;
+namespace Application.Entries.Commands;
 
 public class DownloadDigitalFile
 {

src/Application/Digital/Commands/MoveEntryToBin.cs → src/Application/Entries/Commands/MoveEntryToBin.cs

@@ -7,7 +7,7 @@
 using Microsoft.EntityFrameworkCore;
 using NodaTime;
 
-namespace Application.Digital.Commands;
+namespace Application.Entries.Commands;
 
 public class MoveEntryToBin
 {

src/Application/Digital/Commands/RestoreBinEntry.cs → src/Application/Entries/Commands/RestoreBinEntry.cs

@@ -1,6 +1,5 @@
 using Application.Common.Exceptions;
 using Application.Common.Interfaces;
-using Application.Common.Models;
 using Application.Common.Models.Dtos.Digital;
 using AutoMapper;
 using Domain.Entities;
@@ -9,7 +8,7 @@
 using Microsoft.EntityFrameworkCore;
 using NodaTime;
 
-namespace Application.Digital.Commands;
+namespace Application.Entries.Commands;
 
 public class RestoreBinEntry
 {

src/Application/Digital/Commands/ShareEntry.cs → src/Application/Entries/Commands/ShareEntry.cs

@@ -10,7 +10,7 @@
 using Microsoft.EntityFrameworkCore;
 using NodaTime;
 
-namespace Application.Digital.Commands;
+namespace Application.Entries.Commands;
 
 public class ShareEntry
 {

src/Application/Digital/Commands/UpdateEntry.cs → src/Application/Entries/Commands/UpdateEntry.cs

@@ -3,12 +3,11 @@
 using Application.Common.Models.Dtos.Digital;
 using Application.Common.Models.Operations;
 using AutoMapper;
-using Domain.Entities;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 using NodaTime;
 
-namespace Application.Digital.Commands;
+namespace Application.Entries.Commands;
 
 public class UpdateEntry
 {

src/Application/Digital/Commands/UploadDigitalFile.cs → src/Application/Entries/Commands/UploadDigitalFile.cs

@@ -10,7 +10,7 @@
 using Microsoft.EntityFrameworkCore;
 using NodaTime;
 
-namespace Application.Digital.Commands;
+namespace Application.Entries.Commands;
 
 public class UploadDigitalFile {
  public class Validator : AbstractValidator<Command>

src/Application/Digital/Commands/UploadSharedEntry.cs → src/Application/Entries/Commands/UploadSharedEntry.cs

@@ -10,7 +10,7 @@
 using Microsoft.EntityFrameworkCore;
 using NodaTime;
 
-namespace Application.Digital.Commands;
+namespace Application.Entries.Commands;
 
 public class UploadSharedEntry
 {

src/Application/Digital/Queries/GetAllEntriesPaginated.cs → src/Application/Entries/Queries/GetAllEntriesPaginated.cs

@@ -7,7 +7,7 @@
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
-namespace Application.Digital.Queries;
+namespace Application.Entries.Queries;
 
 public class GetAllEntriesPaginated
 {

src/Application/Digital/Queries/GetEntryById.cs → src/Application/Entries/Queries/GetEntryById.cs

@@ -4,7 +4,7 @@
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
-namespace Application.Digital.Queries;
+namespace Application.Entries.Queries;
 
 public class GetEntryById
 {