diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj index d45ec98c..4505ce9f 100644 --- a/src/Api/Api.csproj +++ b/src/Api/Api.csproj @@ -24,4 +24,8 @@ + + + + diff --git a/src/Api/Controllers/BinController.cs b/src/Api/Controllers/BinController.cs index f6555727..81d37689 100644 --- a/src/Api/Controllers/BinController.cs +++ b/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; diff --git a/src/Api/Controllers/EntriesController.cs b/src/Api/Controllers/EntriesController.cs index 1dcc63f4..12ea545d 100644 --- a/src/Api/Controllers/EntriesController.cs +++ b/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; diff --git a/src/Api/Controllers/Payload/Requests/DigitalFile/GetAllEntriesPaginatedQueryParameters.cs b/src/Api/Controllers/Payload/Requests/DigitalFile/GetAllEntriesPaginatedQueryParameters.cs deleted file mode 100644 index 873bd222..00000000 --- a/src/Api/Controllers/Payload/Requests/DigitalFile/GetAllEntriesPaginatedQueryParameters.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Api.Controllers.Payload.Requests.DigitalFile; - -/// -/// Get All Entries Paginated Query Parameters -/// -public class GetAllEntriesPaginatedQueryParameters : PaginatedQueryParameters -{ - public string EntryPath { get; set; } -} \ No newline at end of file diff --git a/src/Api/Controllers/Payload/Requests/Entries/GetAllEntriesPaginatedQueryParameters.cs b/src/Api/Controllers/Payload/Requests/Entries/GetAllEntriesPaginatedQueryParameters.cs index 7fb1d6bc..462cbbc0 100644 --- a/src/Api/Controllers/Payload/Requests/Entries/GetAllEntriesPaginatedQueryParameters.cs +++ b/src/Api/Controllers/Payload/Requests/Entries/GetAllEntriesPaginatedQueryParameters.cs @@ -1,12 +1,9 @@ -namespace Api.Controllers.Payload.Requests.Entries; +namespace Api.Controllers.Payload.Requests.Entries; /// /// Get All Entries Paginated Query Parameters /// public class GetAllEntriesPaginatedQueryParameters : PaginatedQueryParameters { - /// - /// Entry id - /// - public Guid? EntryId { get; set; } + public string EntryPath { get; set; } } \ No newline at end of file diff --git a/src/Api/Controllers/Payload/Requests/Entries/GetAllSharedEntriesPaginatedQueryParameters.cs b/src/Api/Controllers/Payload/Requests/Entries/GetAllSharedEntriesPaginatedQueryParameters.cs new file mode 100644 index 00000000..309f67c6 --- /dev/null +++ b/src/Api/Controllers/Payload/Requests/Entries/GetAllSharedEntriesPaginatedQueryParameters.cs @@ -0,0 +1,12 @@ +namespace Api.Controllers.Payload.Requests.Entries; + +/// +/// Get All Shared Entries Paginated Query Parameters +/// +public class GetAllSharedEntriesPaginatedQueryParameters : PaginatedQueryParameters +{ + /// + /// Entry id + /// + public Guid? EntryId { get; set; } +} \ No newline at end of file diff --git a/src/Api/Controllers/Payload/Requests/DigitalFile/ShareEntryPermissionRequest.cs b/src/Api/Controllers/Payload/Requests/Entries/ShareEntryPermissionRequest.cs similarity index 84% rename from src/Api/Controllers/Payload/Requests/DigitalFile/ShareEntryPermissionRequest.cs rename to src/Api/Controllers/Payload/Requests/Entries/ShareEntryPermissionRequest.cs index 5a01d6c4..ac50c522 100644 --- a/src/Api/Controllers/Payload/Requests/DigitalFile/ShareEntryPermissionRequest.cs +++ b/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 { diff --git a/src/Api/Controllers/Payload/Requests/DigitalFile/UploadDigitalFileRequest.cs b/src/Api/Controllers/Payload/Requests/Entries/UploadDigitalFileRequest.cs similarity index 81% rename from src/Api/Controllers/Payload/Requests/DigitalFile/UploadDigitalFileRequest.cs rename to src/Api/Controllers/Payload/Requests/Entries/UploadDigitalFileRequest.cs index 08f04215..ff4ddbf9 100644 --- a/src/Api/Controllers/Payload/Requests/DigitalFile/UploadDigitalFileRequest.cs +++ b/src/Api/Controllers/Payload/Requests/Entries/UploadDigitalFileRequest.cs @@ -1,4 +1,4 @@ -namespace Api.Controllers.Payload.Requests.DigitalFile; +namespace Api.Controllers.Payload.Requests.Entries; /// /// diff --git a/src/Api/Controllers/Payload/Requests/DigitalFile/UploadSharedEntryRequest.cs b/src/Api/Controllers/Payload/Requests/Entries/UploadSharedEntryRequest.cs similarity index 77% rename from src/Api/Controllers/Payload/Requests/DigitalFile/UploadSharedEntryRequest.cs rename to src/Api/Controllers/Payload/Requests/Entries/UploadSharedEntryRequest.cs index ab02aeed..21363822 100644 --- a/src/Api/Controllers/Payload/Requests/DigitalFile/UploadSharedEntryRequest.cs +++ b/src/Api/Controllers/Payload/Requests/Entries/UploadSharedEntryRequest.cs @@ -1,4 +1,4 @@ -namespace Api.Controllers.Payload.Requests.DigitalFile; +namespace Api.Controllers.Payload.Requests.Entries; /// /// diff --git a/src/Api/Controllers/SharedController.cs b/src/Api/Controllers/SharedController.cs index 9290917d..2c10fb15 100644 --- a/src/Api/Controllers/SharedController.cs +++ b/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 DownloadSharedFile([FromRoute] Guid entryId) [RequiresRole(IdentityData.Roles.Employee)] [HttpGet("entries")] public async Task>> GetAll( - [FromQuery] GetAllEntriesPaginatedQueryParameters queryParameters) + [FromQuery] GetAllSharedEntriesPaginatedQueryParameters queryParameters) { var currentUser = _currentUserService.GetCurrentUser(); var query = new GetAllSharedEntriesPaginated.Query() diff --git a/src/Application/Digital/Commands/DeleteBinEntry.cs b/src/Application/Entries/Commands/DeleteBinEntry.cs similarity index 97% rename from src/Application/Digital/Commands/DeleteBinEntry.cs rename to src/Application/Entries/Commands/DeleteBinEntry.cs index 3012351e..296dffde 100644 --- a/src/Application/Digital/Commands/DeleteBinEntry.cs +++ b/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 { diff --git a/src/Application/Digital/Commands/DownloadDigitalFile.cs b/src/Application/Entries/Commands/DownloadDigitalFile.cs similarity index 95% rename from src/Application/Digital/Commands/DownloadDigitalFile.cs rename to src/Application/Entries/Commands/DownloadDigitalFile.cs index 1525af0e..24488ed6 100644 --- a/src/Application/Digital/Commands/DownloadDigitalFile.cs +++ b/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 { diff --git a/src/Application/Digital/Commands/MoveEntryToBin.cs b/src/Application/Entries/Commands/MoveEntryToBin.cs similarity index 98% rename from src/Application/Digital/Commands/MoveEntryToBin.cs rename to src/Application/Entries/Commands/MoveEntryToBin.cs index b48ce0e3..5b4d3b4f 100644 --- a/src/Application/Digital/Commands/MoveEntryToBin.cs +++ b/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 { diff --git a/src/Application/Digital/Commands/RestoreBinEntry.cs b/src/Application/Entries/Commands/RestoreBinEntry.cs similarity index 98% rename from src/Application/Digital/Commands/RestoreBinEntry.cs rename to src/Application/Entries/Commands/RestoreBinEntry.cs index 1e5c58ba..113d3d29 100644 --- a/src/Application/Digital/Commands/RestoreBinEntry.cs +++ b/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 { diff --git a/src/Application/Digital/Commands/ShareEntry.cs b/src/Application/Entries/Commands/ShareEntry.cs similarity index 99% rename from src/Application/Digital/Commands/ShareEntry.cs rename to src/Application/Entries/Commands/ShareEntry.cs index 9e2715a7..15bb49cc 100644 --- a/src/Application/Digital/Commands/ShareEntry.cs +++ b/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 { diff --git a/src/Application/Digital/Commands/UpdateEntry.cs b/src/Application/Entries/Commands/UpdateEntry.cs similarity index 97% rename from src/Application/Digital/Commands/UpdateEntry.cs rename to src/Application/Entries/Commands/UpdateEntry.cs index b456342f..4bef669d 100644 --- a/src/Application/Digital/Commands/UpdateEntry.cs +++ b/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 { diff --git a/src/Application/Digital/Commands/UploadDigitalFile.cs b/src/Application/Entries/Commands/UploadDigitalFile.cs similarity index 99% rename from src/Application/Digital/Commands/UploadDigitalFile.cs rename to src/Application/Entries/Commands/UploadDigitalFile.cs index 43a074d0..5d3a31a2 100644 --- a/src/Application/Digital/Commands/UploadDigitalFile.cs +++ b/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 diff --git a/src/Application/Digital/Commands/UploadSharedEntry.cs b/src/Application/Entries/Commands/UploadSharedEntry.cs similarity index 99% rename from src/Application/Digital/Commands/UploadSharedEntry.cs rename to src/Application/Entries/Commands/UploadSharedEntry.cs index e3aab599..e75f162d 100644 --- a/src/Application/Digital/Commands/UploadSharedEntry.cs +++ b/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 { diff --git a/src/Application/Digital/Queries/GetAllEntriesPaginated.cs b/src/Application/Entries/Queries/GetAllEntriesPaginated.cs similarity index 98% rename from src/Application/Digital/Queries/GetAllEntriesPaginated.cs rename to src/Application/Entries/Queries/GetAllEntriesPaginated.cs index 39bf17a0..1efa66fc 100644 --- a/src/Application/Digital/Queries/GetAllEntriesPaginated.cs +++ b/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 { diff --git a/src/Application/Digital/Queries/GetEntryById.cs b/src/Application/Entries/Queries/GetEntryById.cs similarity index 96% rename from src/Application/Digital/Queries/GetEntryById.cs rename to src/Application/Entries/Queries/GetEntryById.cs index 8e0e1615..e46b9b97 100644 --- a/src/Application/Digital/Queries/GetEntryById.cs +++ b/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 {