Removed empty feed; Added mapping from List<Post> to ReadPageServiceModel

3 files changed, 12 insertions, 15 deletions

diff --git a/src/DevHive.Services/Configurations/Mapping/PostMappings.cs b/src/DevHive.Services/Configurations/Mapping/PostMappings.cs
index 13c9736..9362f90 100644
--- a/src/DevHive.Services/Configurations/Mapping/PostMappings.cs
+++ b/src/DevHive.Services/Configurations/Mapping/PostMappings.cs
@@ -2,6 +2,8 @@ using DevHive.Data.Models;
 using AutoMapper;
 using DevHive.Services.Models.Post;
 using DevHive.Common.Models.Misc;
+using System.Collections.Generic;
+using DevHive.Services.Models;
 
 namespace DevHive.Services.Configurations.Mapping
 {
@@ -24,6 +26,8 @@ namespace DevHive.Services.Configurations.Mapping
 
 			CreateMap<Post, IdModel>()
 				.ForMember(dest => dest.Id, src => src.MapFrom(x => x.Id));
+
+			CreateMap<List<Post>, ReadPageServiceModel>();
 		}
 	}
 }
diff --git a/src/DevHive.Services/Models/Post/ReadPostServiceModel.cs b/src/DevHive.Services/Models/Post/ReadPostServiceModel.cs
index 2c4fb57..a7aa882 100644
--- a/src/DevHive.Services/Models/Post/ReadPostServiceModel.cs
+++ b/src/DevHive.Services/Models/Post/ReadPostServiceModel.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using DevHive.Common.Models.Misc;
-using DevHive.Services.Models.Comment;
-using Microsoft.AspNetCore.Mvc;
 
 namespace DevHive.Services.Models.Post
 {
diff --git a/src/DevHive.Services/Services/FeedService.cs b/src/DevHive.Services/Services/FeedService.cs
index 37d653c..af05607 100644
--- a/src/DevHive.Services/Services/FeedService.cs
+++ b/src/DevHive.Services/Services/FeedService.cs
@@ -45,13 +45,10 @@ namespace DevHive.Services.Services
 			List<Post> posts = await this._feedRepository
 				.GetFriendsPosts(friendsList, model.FirstRequestIssued, model.PageNumber, model.PageSize);
 
-			if (posts.Count <= 0)
-				throw new ArgumentException("No friends of user have posted anything yet!");
-
-			ReadPageServiceModel readPageServiceModel = new();
-			foreach (Post post in posts)
-				readPageServiceModel.Posts.Add(this._mapper.Map<ReadPostServiceModel>(post));
-
+			// ReadPageServiceModel readPageServiceModel = new();
+			// foreach (Post post in posts)
+			// 	readPageServiceModel.Posts.Add(this._mapper.Map<ReadPostServiceModel>(post));
+			ReadPageServiceModel readPageServiceModel = this._mapper.Map<ReadPageServiceModel>(posts);
 			return readPageServiceModel;
 		}
 
@@ -69,12 +66,10 @@ namespace DevHive.Services.Services
 			List<Post> posts = await this._feedRepository
 				.GetUsersPosts(user, model.FirstRequestIssued, model.PageNumber, model.PageSize);
 
-			if (posts.Count <= 0)
-				throw new ArgumentException("User hasn't posted anything yet!");
-
-			ReadPageServiceModel readPageServiceModel = new();
-			foreach (Post post in posts)
-				readPageServiceModel.Posts.Add(this._mapper.Map<ReadPostServiceModel>(post));
+			// ReadPageServiceModel readPageServiceModel = new();
+			// foreach (Post post in posts)
+			// 	readPageServiceModel.Posts.Add(this._mapper.Map<ReadPostServiceModel>(post));
+			ReadPageServiceModel readPageServiceModel = this._mapper.Map<ReadPageServiceModel>(posts);
 
 			return readPageServiceModel;
 		}