Merge pull request #39 from DurkaTechnologies/develop

Release 1.0 built successfully

Author: ColdForeign

Application/Features/Communities/Commands/CreateCommunityCommand.cs

@@ -13,6 +13,7 @@ public partial class CreateCommunityCommand : IRequest<Result<int>>
 		public string Name { get; set; }
 
 		public int? DistrictId { get; set; }
+		public string ApplicationUserId{ get; set; }
 
 		public class CreateCommunityCommandHandler : IRequestHandler<CreateCommunityCommand, Result<int>>
 		{

Application/Features/Communities/Commands/UpdateCommunityCommand.cs

@@ -16,6 +16,8 @@ public class UpdateCommunityCommand : IRequest<Result<int>>
 
 		public int? DistrictId { get; set; }
 
+		public string ApplicationUserId { get; set; }
+
 		public class UpdateCommunityCommandHandler : IRequestHandler<UpdateCommunityCommand, Result<int>>
 		{
 			private readonly IUnitOfWork unitOfWork;
@@ -39,13 +41,26 @@ public async Task<Result<int>> Handle(UpdateCommunityCommand command, Cancellati
 				}
 				else
 				{
-					community.Name = command.Name ?? community.Name;
+					community.Name = command.Name.NullIfEmpty() ?? community.Name;
 					community.DistrictId = command.DistrictId ?? community.DistrictId;
+					community.ApplicationUserId = command.ApplicationUserId;
 					await communityRepository.UpdateAsync(mapper.Map<Community>(command));
 					await unitOfWork.Commit(cancellationToken);
 					return Result<int>.Success(command.Id);
 				}
 			}
 		}
 	}
+
+	public static class StringExtensions
+	{
+		public static string NullIfEmpty(this string s)
+		{
+			return string.IsNullOrEmpty(s) ? null : s;
+		}
+		public static string NullIfWhiteSpace(this string s)
+		{
+			return string.IsNullOrWhiteSpace(s) ? null : s;
+		}
+	}
 }

Application/Features/Communities/Queries/GetAllCached/GeUserCommunitiesQuery.cs

@@ -0,0 +1,35 @@
+using Application.Common.Models;
+using Application.Features.Communities.Queries.GetById;
+using Application.Interfaces.Repositories;
+using AutoMapper;
+using MediatR;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Application.Features.Communities.Queries.GetAllCached
+{
+	public class GeUserCommunitiesQuery : IRequest<Result<List<GetCommunityByIdResponse>>>
+	{
+		public string UserId { get; set; }
+
+		public class GeUserCommunitiesQueryHandler : IRequestHandler<GeUserCommunitiesQuery, Result<List<GetCommunityByIdResponse>>>
+		{
+			private readonly ICommunityRepository communityRepository;
+			private readonly IMapper mapper;
+
+			public GeUserCommunitiesQueryHandler(ICommunityRepository communityRepository, IMapper mapper)
+			{
+				this.communityRepository = communityRepository;
+				this.mapper = mapper;
+			}
+
+			public async Task<Result<List<GetCommunityByIdResponse>>> Handle(GeUserCommunitiesQuery request, CancellationToken cancellationToken)
+			{
+				var communities = await communityRepository.GetListByUserIdAsync(request.UserId);
+				var mappedCommunities = mapper.Map<List<GetCommunityByIdResponse>>(communities);
+				return Result<List<GetCommunityByIdResponse>>.Success(mappedCommunities);
+			}
+		}
+	}
+}

Application/Features/Communities/Queries/GetAllCached/GetAllCommunitiesCachedQuery.cs

@@ -29,8 +29,10 @@ public GetAllCommunitiesCachedQueryHandler(ICommunityCacheRepository communityCa
 		public async Task<Result<List<GetAllCommunitiesCachedResponse>>> Handle(GetAllCommunitiesCachedQuery request, CancellationToken cancellationToken)
 		{
 			var communities = await communityCache.GetCachedListAsync();
-			var mappedCommunities = mapper.Map<List<GetAllCommunitiesCachedResponse>>(communities);
-			return Result<List<GetAllCommunitiesCachedResponse>>.Success(mappedCommunities);
+      
+			// var mappedCommunities = mapper.Map<List<GetAllCommunitiesCachedResponse>>(communities);
+			// mappedCommunities = await communityCache.FillUserName(mappedCommunities);
+			return Result<List<GetAllCommunitiesCachedResponse>>.Success(communities);
 		}
 	}
 }

Application/Features/Communities/Queries/GetAllCached/GetAllCommunitiesCachedResponse.cs

@@ -6,6 +6,10 @@ public class GetAllCommunitiesCachedResponse
 
 		public string Name { get; set; }
 
-		public GetAllDistrictsCachedResponse District { get; set; }
+        public string ApplicationUserId { get; set; }
+
+        public string ApplicationUserName { get; set; }
+
+        public GetAllDistrictsCachedResponse District { get; set; }
 	}
 }

Application/Features/Communities/Queries/GetAllCached/GetFreeCommunitiesQuery.cs

@@ -0,0 +1,37 @@
+using Application.Common.Models;
+using Application.Features.Communities.Queries.GetById;
+using Application.Interfaces.Repositories;
+using AutoMapper;
+using MediatR;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Application.Features.Communities.Queries.GetAllCached
+{
+	public class GetFreeCommunitiesQuery : IRequest<Result<List<GetCommunityByIdResponse>>>
+	{
+		public GetFreeCommunitiesQuery()
+		{
+		}
+	}
+
+	public class GetFreeCommunitiesQueryHandler : IRequestHandler<GetFreeCommunitiesQuery, Result<List<GetCommunityByIdResponse>>>
+	{
+		private readonly ICommunityRepository communityRepository;
+		private readonly IMapper mapper;
+
+		public GetFreeCommunitiesQueryHandler(ICommunityRepository communityRepository, IMapper mapper)
+		{
+			this.communityRepository = communityRepository;
+			this.mapper = mapper;
+		}
+
+		public async Task<Result<List<GetCommunityByIdResponse>>> Handle(GetFreeCommunitiesQuery request, CancellationToken cancellationToken)
+		{
+			var communities = await communityRepository.GetFreeListAsync();
+			var mappedCommunities = mapper.Map<List<GetCommunityByIdResponse>>(communities);
+			return Result<List<GetCommunityByIdResponse>>.Success(mappedCommunities);
+		}
+	}
+}

Application/Features/Communities/Queries/GetById/GetCommunityByIdNotCacheQuery.cs

@@ -0,0 +1,33 @@
+using Application.Common.Models;
+using Application.Interfaces.Repositories;
+using AutoMapper;
+using MediatR;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Application.Features.Communities.Queries.GetById
+{
+	public class GetCommunityByIdNotCacheQuery : IRequest<Result<GetCommunityByIdResponse>>
+	{
+		public int Id { get; set; }
+
+		public class GeCommunityByIdQueryHandler : IRequestHandler<GetCommunityByIdNotCacheQuery, Result<GetCommunityByIdResponse>>
+		{
+			private readonly ICommunityRepository repository;
+			private readonly IMapper mapper;
+
+			public GeCommunityByIdQueryHandler(ICommunityRepository repository, IMapper mapper)
+			{
+				this.repository = repository;
+				this.mapper = mapper;
+			}
+
+			public async Task<Result<GetCommunityByIdResponse>> Handle(GetCommunityByIdNotCacheQuery query, CancellationToken cancellationToken)
+			{
+				var community = await repository.GetByIdAsync(query.Id);
+				var mappedCommunity = mapper.Map<GetCommunityByIdResponse>(community);
+				return Result<GetCommunityByIdResponse>.Success(mappedCommunity);
+			}
+		}
+	}
+}

Application/Features/Communities/Queries/GetById/GetCommunityByIdResponse.cs

@@ -1,4 +1,6 @@
-namespace Application.Features.Communities.Queries.GetById
+using Application.Features.Communities.Queries.GetAllCached;
+
+namespace Application.Features.Communities.Queries.GetById
 {
 	public class GetCommunityByIdResponse
 	{
@@ -7,5 +9,9 @@ public class GetCommunityByIdResponse
 		public string Name { get; set; }
 
 		public int? DistrictId { get; set; }
+
+		public GetAllDistrictsCachedResponse District { get; set; }
+
+		public string ApplicationUserId { get; set; }
 	}
 }

Application/Features/Districts/Commands/DeleteDistrictCommand.cs

@@ -23,10 +23,15 @@ public DeleteDistrictCommandHandler(IDistrictRepository districtRepository, IUni
 
 			public async Task<Result<int>> Handle(DeleteDistrictCommand command, CancellationToken cancellationToken)
 			{
-				var district = await districtRepository.GetByIdAsync(command.Id);
-				await districtRepository.DeleteAsync(district);
-				await unitOfWork.Commit(cancellationToken);
-				return Result<int>.Success(district.Id);
+				var district = await districtRepository.GetIncludeByIdAsync(command.Id);
+				if (district.Communities.Count == 0)
+				{
+					await districtRepository.DeleteAsync(district);
+					await unitOfWork.Commit(cancellationToken);
+					return Result<int>.Success(district.Id);
+				}
+				return Result<int>.Failure();
+
 			}
 		}
 	}

Application/Features/Districts/Queries/GetAllQuery/GetAllDistrictsQuery.cs

@@ -0,0 +1,41 @@
+using Application.Common.Models;
+using Application.Features.Communities.Queries.GetAllCached;
+using Application.Features.Logs.Queries;
+using Application.Interfaces.Repositories;
+using AutoMapper;
+using MediatR;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Application.Features.Districts.Queries
+{
+	public class GetAllDistrictsQuery : IRequest<Result<List<GetAllDistrictsCachedResponse>>>
+	{
+		public GetAllDistrictsQuery()
+		{
+
+		}
+	}
+
+	public class GetAllDistrictsQueryHandler : IRequestHandler<GetAllDistrictsQuery, Result<List<GetAllDistrictsCachedResponse>>>
+	{
+		private readonly IDistrictRepository repository;
+		private readonly IMapper mapper;
+
+		public GetAllDistrictsQueryHandler(IDistrictRepository repository, IMapper mapper)
+		{
+			this.repository = repository;
+			this.mapper = mapper;
+		}
+
+		public async Task<Result<List<GetAllDistrictsCachedResponse>>> Handle(GetAllDistrictsQuery request, CancellationToken cancellationToken)
+		{
+			var districts = mapper.Map<List<GetAllDistrictsCachedResponse>>(await repository.GetListAsync());
+			return Result<List<GetAllDistrictsCachedResponse>>.Success(districts);
+		}
+	}
+}