Endpoint/Common/Attributes/BadRequestResponseAttribute.cs

@@ -1,9 +1,9 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Mirea.Api.Endpoint.Models;
+using Mirea.Api.Dto.Responses;
 using System;
 
-namespace Mirea.Api.Endpoint.Common.Extensions;
+namespace Mirea.Api.Endpoint.Common.Attributes;
 
 [AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = true)]
-public class BadRequestResponseAttribute() : ProducesResponseTypeAttribute(typeof(ErrorResponseVm), StatusCodes.Status400BadRequest);
+public class BadRequestResponseAttribute() : ProducesResponseTypeAttribute(typeof(ErrorResponse), StatusCodes.Status400BadRequest);

Endpoint/Common/Attributes/NotFoundResponseAttribute.cs

@@ -1,9 +1,9 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Mirea.Api.Endpoint.Models;
+using Mirea.Api.Dto.Responses;
 using System;
 
-namespace Mirea.Api.Endpoint.Common.Extensions;
+namespace Mirea.Api.Endpoint.Common.Attributes;
 
 [AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = true)]
-public class NotFoundResponseAttribute() : ProducesResponseTypeAttribute(typeof(ErrorResponseVm), StatusCodes.Status404NotFound);
+public class NotFoundResponseAttribute() : ProducesResponseTypeAttribute(typeof(ErrorResponse), StatusCodes.Status404NotFound);

Endpoint/Controllers/V1/CampusController.cs

@@ -3,7 +3,10 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Mirea.Api.DataAccess.Application.Cqrs.Campus.Queries.GetCampusBasicInfoList;
 using Mirea.Api.DataAccess.Application.Cqrs.Campus.Queries.GetCampusDetails;
-using Mirea.Api.Endpoint.Common.Extensions;
+using Mirea.Api.Dto.Responses;
+using Mirea.Api.Endpoint.Common.Attributes;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace Mirea.Api.Endpoint.Controllers.V1
@@ -16,11 +19,18 @@ namespace Mirea.Api.Endpoint.Controllers.V1
         /// <returns>Basic information about campuses.</returns>
         [HttpGet]
         [ProducesResponseType(StatusCodes.Status200OK)]
-        public async Task<ActionResult<CampusBasicInfoVm>> GetBasicInfo()
+        public async Task<ActionResult<List<CampusBasicInfoResponse>>> GetBasicInfo()
         {
             var result = await mediator.Send(new GetCampusBasicInfoListQuery());
 
-            return Ok(result);
+            return Ok(result.Campuses
+                .Select(c => new CampusBasicInfoResponse()
+                {
+                    Id = c.Id,
+                    CodeName = c.CodeName,
+                    FullName = c.FullName
+                })
+            );
         }
 
         /// <summary>
@@ -32,14 +42,20 @@ namespace Mirea.Api.Endpoint.Controllers.V1
         [ProducesResponseType(StatusCodes.Status200OK)]
         [BadRequestResponse]
         [NotFoundResponse]
-        public async Task<ActionResult<CampusDetailsVm>> GetDetails(int id)
+        public async Task<ActionResult<CampusDetailsResponse>> GetDetails(int id)
         {
             var result = await mediator.Send(new GetCampusDetailsQuery()
             {
                 Id = id
             });
 
-            return Ok(result);
+            return Ok(new CampusDetailsResponse()
+            {
+                Id = result.Id,
+                CodeName = result.CodeName,
+                FullName = result.FullName,
+                Address = result.Address
+            });
         }
     }
 }

Endpoint/Controllers/V1/DisciplineController.cs

@@ -3,7 +3,10 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Mirea.Api.DataAccess.Application.Cqrs.Discipline.Queries.GetDisciplineDetails;
 using Mirea.Api.DataAccess.Application.Cqrs.Discipline.Queries.GetDisciplineList;
-using Mirea.Api.Endpoint.Common.Extensions;
+using Mirea.Api.Dto.Responses;
+using Mirea.Api.Endpoint.Common.Attributes;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace Mirea.Api.Endpoint.Controllers.V1
@@ -19,7 +22,7 @@ namespace Mirea.Api.Endpoint.Controllers.V1
         [HttpGet]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [BadRequestResponse]
-        public async Task<ActionResult<DisciplineListVm>> Get([FromQuery] int? page, [FromQuery] int? pageSize)
+        public async Task<ActionResult<List<DisciplineResponse>>> Get([FromQuery] int? page, [FromQuery] int? pageSize)
         {
             var result = await mediator.Send(new GetDisciplineListQuery()
             {
@@ -27,27 +30,36 @@ namespace Mirea.Api.Endpoint.Controllers.V1
                 PageSize = pageSize
             });
 
-            return Ok(result);
+            return Ok(result.Disciplines
+                .Select(d => new DisciplineResponse()
+                {
+                    Id = d.Id,
+                    Name = d.Name
+                })
+            );
         }
 
         /// <summary>
         /// Gets details of a specific discipline by ID.
         /// </summary>
         /// <param name="id">Discipline ID.</param>
-        /// <returns>Details of the specified discipline.
+        /// <returns>Details of the specified discipline.</returns>
-        /// </returns>
         [HttpGet("{id:int}")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [BadRequestResponse]
         [NotFoundResponse]
-        public async Task<ActionResult<DisciplineInfoVm>> GetDetails(int id)
+        public async Task<ActionResult<DisciplineResponse>> GetDetails(int id)
         {
             var result = await mediator.Send(new GetDisciplineInfoQuery()
             {
                 Id = id
             });
 
-            return Ok(result);
+            return Ok(new DisciplineResponse()
+            {
+                Id = result.Id,
+                Name = result.Name
+            });
         }
     }
 }

Endpoint/Endpoint.csproj

@@ -28,6 +28,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<ProjectReference Include="..\ApiDto\ApiDto.csproj" />
 		<ProjectReference Include="..\Domain\Domain.csproj" />
 		<ProjectReference Include="..\Persistence\Persistence.csproj" />
 	</ItemGroup>

Endpoint/Models/ErrorResponseVm.cs

@@ -1,18 +0,0 @@
-namespace Mirea.Api.Endpoint.Models;
-
-/// <summary>
-/// A class for providing information about an error
-/// </summary>
-public class ErrorResponseVm
-{
-    /// <summary>
-    /// The text or translation code of the error. This field may not contain information in specific scenarios.
-    /// For example, it might be empty for HTTP 204 responses where no content is returned or if the validation texts have not been configured.
-    /// </summary>
-    public required string Error { get; set; }
-    /// <summary>
-    /// In addition to returning the response code in the header, it is also duplicated in this field.
-    /// Represents the HTTP response code.
-    /// </summary>
-    public required int Code { get; set; }
-}