system-praktyk/system-praktyk-api
3
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

fix ifx

Browse Source
This commit is contained in:
MaxchilKH 2020-11-06 22:18:00 +01:00
parent 78a1a53e3b
commit 7ba7f7ebbf
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/InternshipSystem.Api/Controllers/CompaniesController.cs
View File

@ -4,6 +4,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using InternshipSystem.Api.Queries; using InternshipSystem.Api.Queries;
using InternshipSystem.Api.Queries.SearchQuery; using InternshipSystem.Api.Queries.SearchQuery;
using InternshipSystem.Api.Security;
using InternshipSystem.Core; using InternshipSystem.Core;
using InternshipSystem.Repository; using InternshipSystem.Repository;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
@ -35,10 +36,11 @@ namespace InternshipSystem.Api.Controllers
[HttpGet] [HttpGet]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)] [ProducesResponseType(StatusCodes.Status400BadRequest)]
public async Task<ActionResult<IReadOnlyCollection<Company>>> SearchByNameAsync([FromQuery] CompanySearchQuery searchQuery, CancellationToken cancellationToken) => [Authorize]
public async Task<ActionResult<IReadOnlyCollection<Company>>> SearchByNameAsync([FromQuery] CompanySearchQuery searchQuery, [FromServices] User user, CancellationToken cancellationToken) =>
await Context.Companies await Context.Companies
.Where(c => c.Name.ToLower().Contains(searchQuery.Name.ToLower())) .Where(c => c.Name.ToLower().Contains(searchQuery.Name.ToLower()))
.Where(c => c.Provider == 0) .Where(c => c.Provider == 0 || c.Provider == user.PersonNumber)
.OrderBy(o => o.Name) .OrderBy(o => o.Name)
.Skip(searchQuery.Page * searchQuery.PerPage) .Skip(searchQuery.Page * searchQuery.PerPage)
.Take(searchQuery.PerPage) .Take(searchQuery.PerPage)
@ -55,7 +57,8 @@ namespace InternshipSystem.Api.Controllers
[HttpGet("{companyId}")] [HttpGet("{companyId}")]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)] [ProducesResponseType(StatusCodes.Status400BadRequest)]
public async Task<ActionResult<IReadOnlyCollection<BranchOffice>>> SearchBranchesByAddress([FromQuery] BranchOfficeSearchQuery searchQuery, long companyId, CancellationToken token) [Authorize]
public async Task<ActionResult<IReadOnlyCollection<BranchOffice>>> SearchBranchesByAddress([FromQuery] BranchOfficeSearchQuery searchQuery, long companyId, [FromServices] User user, CancellationToken token)
{ {
var company = await Context.Companies.Where(c => c.Id == companyId).FirstAsync(token); var company = await Context.Companies.Where(c => c.Id == companyId).FirstAsync(token);
@ -63,7 +66,7 @@ namespace InternshipSystem.Api.Controllers
.Collection(c => c.Branches) .Collection(c => c.Branches)
.Query() .Query()
.Where(office => office.Address.City.ToLower().Contains(searchQuery.City.ToLower())) .Where(office => office.Address.City.ToLower().Contains(searchQuery.City.ToLower()))
.Where(office => office.Provider == 0) .Where(office => office.Provider == 0 || office.Provider == user.PersonNumber)
.Skip(searchQuery.Page * searchQuery.PerPage) .Skip(searchQuery.Page * searchQuery.PerPage)
.Take(searchQuery.PerPage) .Take(searchQuery.PerPage)
.ToListAsync(token); .ToListAsync(token);

4
src/InternshipSystem.Api/UseCases/UpdateInternshipRegistrationUseCase.cs
View File

@ -144,9 +144,9 @@ namespace InternshipSystem.Api.UseCases
private void UpdateMentor(UpdateMentor mentorUpdate) private void UpdateMentor(UpdateMentor mentorUpdate)
{ {
var mentor = subjectRegistration.Mentor ?? new Mentor(); subjectRegistration.Mentor ??= new Mentor();
mentor.UpdateInformation(mentorUpdate.FirstName, mentorUpdate.LastName, mentorUpdate.Email, mentorUpdate.PhoneNumber); subjectRegistration.Mentor.UpdateInformation(mentorUpdate.FirstName, mentorUpdate.LastName, mentorUpdate.Email, mentorUpdate.PhoneNumber);
} }
} }
} }