diff --git a/Controllers/TicTacTocController.cs b/Controllers/TicTacTocController.cs index 8d2ebd9..bbb1e95 100644 --- a/Controllers/TicTacTocController.cs +++ b/Controllers/TicTacTocController.cs @@ -17,7 +17,7 @@ namespace ProjectGrid.Controllers private readonly ILogger _logger; //static readonly Models.IUserRepository repository = new Models.UserRepository(); - private readonly Models.IUserRepository repository; + private readonly ITicTacToctRepository repository; public TicTacTocController(ILogger logger, DataAccessContext context) { @@ -27,15 +27,15 @@ namespace ProjectGrid.Controllers [HttpGet] [Route("api/ttt/GetBoard")] - public IEnumerable GetAllUsers() + public Models.TicTacTocBoard GetBoard() { - return repository.GetAll(); + return repository.GetBoard(); } [HttpPost] [Route("api/ttt/SetPiece")] [Consumes("application/json")] - public Models.UserModel PostUser(Models.UserModel item) + public Models.UserModel PostMove(Models.UserModel item) { return repository.Add(item); } diff --git a/Controllers/UsersController.cs b/Controllers/UsersController.cs index b38a4de..2fe244c 100644 --- a/Controllers/UsersController.cs +++ b/Controllers/UsersController.cs @@ -17,7 +17,7 @@ namespace ProjectGrid.Controllers private readonly ILogger _logger; //static readonly Models.IUserRepository repository = new Models.UserRepository(); - private readonly Models.IUserRepository repository; + private readonly IUserRepository repository; public UsersController(ILogger logger, DataAccessContext context) { diff --git a/Data/DataAccessContext.TicTacToc.cs b/Data/DataAccessContext.TicTacToc.cs new file mode 100644 index 0000000..2955db6 --- /dev/null +++ b/Data/DataAccessContext.TicTacToc.cs @@ -0,0 +1,25 @@ +using System.Collections.Generic; +using System.Linq; + +using Microsoft.EntityFrameworkCore; +using ProjectGrid.Models; + + +namespace ProjectGrid.Data +{ + public partial class DataAccessContext : ITicTacToctRepository + { + + public bool AddPiece(TicTacTocMove user) + { + throw new System.NotImplementedException(); + } + + + public Models.TicTacTocBoard GetBoard() + { + throw new System.NotImplementedException(); + } + } + +} diff --git a/Data/ITicTacToctRepository.cs b/Data/ITicTacToctRepository.cs new file mode 100644 index 0000000..b358356 --- /dev/null +++ b/Data/ITicTacToctRepository.cs @@ -0,0 +1,11 @@ +using ProjectGrid.Models; + +namespace ProjectGrid.Data +{ + public interface ITicTacToctRepository + { + TicTacTocBoard GetBoard(); + + bool AddPiece(TicTacTocMove user); + } +} \ No newline at end of file diff --git a/Data/IUserRepository.cs b/Data/IUserRepository.cs new file mode 100644 index 0000000..63d30d6 --- /dev/null +++ b/Data/IUserRepository.cs @@ -0,0 +1,12 @@ +using ProjectGrid.Models; +using System.Collections.Generic; + +namespace ProjectGrid.Data +{ + public interface IUserRepository + { + IEnumerable GetAll(); + + UserModel Add(UserModel user); + } +} \ No newline at end of file diff --git a/Logic/TicTacTocManager.cs b/Logic/TicTacTocManager.cs new file mode 100644 index 0000000..455e7ca --- /dev/null +++ b/Logic/TicTacTocManager.cs @@ -0,0 +1,20 @@ +using ProjectGrid; +using ProjectGrid.Data; +using ProjectGrid.Models; +using System; + +namespace ProjectGrid +{ + public class TicTacTocManager + { + + private ITicTacToctRepository _repo; + + private TicTacTocBoard _board; + + public TicTacTocManager(ITicTacToctRepository repo) + { + _repo = repo; + } + } +} \ No newline at end of file diff --git a/Models/IUserRepository.cs b/Models/IUserRepository.cs deleted file mode 100644 index 7ae436a..0000000 --- a/Models/IUserRepository.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ProjectGrid.Models -{ - public interface IUserRepository - { - IEnumerable GetAll(); - - UserModel Add(UserModel user); - } -} \ No newline at end of file diff --git a/Models/User.cs b/Models/User.cs index 7e364fc..fa825fb 100644 --- a/Models/User.cs +++ b/Models/User.cs @@ -1,4 +1,4 @@ -namespace ProjectGrid.Models +namespace ProjectGrid.Models { public class UserModel { @@ -9,5 +9,5 @@ namespace ProjectGrid.Models public string lastName { get; set; } public string email { get; set; } - } + } } \ No newline at end of file diff --git a/Models/UserRepository.cs b/Models/UserRepository.cs index 7f8943d..86fcdc1 100644 --- a/Models/UserRepository.cs +++ b/Models/UserRepository.cs @@ -1,34 +1,35 @@ +using ProjectGrid.Data; using System; using System.Collections.Generic; namespace ProjectGrid.Models { - public class UserRepository: IUserRepository + public class UserRepository : IUserRepository + { + private List users = new List(); + private int _nextId = 1; + + public UserRepository() { - private List users = new List(); - private int _nextId = 1; - - public UserRepository() - { - Add(new UserModel { firstName= "first1", lastName="last1", email="email1@gmail.com"}); - Add(new UserModel { firstName= "first2", lastName="last2", email="email2@gmail.com"}); - Add(new UserModel { firstName= "first3", lastName="last3", email="email3@gmail.com"}); - } - - public IEnumerable GetAll() - { - return users; - } - - public UserModel Add(UserModel item) - { - if (item == null) - { - throw new ArgumentNullException("item"); - } - item.Id = _nextId++; - users.Add(item); - return item; - } + Add(new UserModel { firstName = "first1", lastName = "last1", email = "email1@gmail.com" }); + Add(new UserModel { firstName = "first2", lastName = "last2", email = "email2@gmail.com" }); + Add(new UserModel { firstName = "first3", lastName = "last3", email = "email3@gmail.com" }); } + + public IEnumerable GetAll() + { + return users; + } + + public UserModel Add(UserModel item) + { + if (item == null) + { + throw new ArgumentNullException("item"); + } + item.Id = _nextId++; + users.Add(item); + return item; + } + } } \ No newline at end of file diff --git a/ProjectGrid.csproj b/ProjectGrid.csproj index fde86ca..5dec6c9 100644 --- a/ProjectGrid.csproj +++ b/ProjectGrid.csproj @@ -17,6 +17,7 @@ +