Skip to content

L
Lesson49
Commit 92307b0f authored by Пасько Виталий's avatar Пасько Виталий
Browse files
Options

- вынес необходимую логику в репозитории. 

- поменял состав моделей представления.
- удалил ненужные модели представления.
- добавил сервисы.
- отрефакторил код.

Partial.
parent fcbec971
Hide whitespace changes
Inline Side-by-side
Showing with 1687 additions and 95 deletions
PhoneStore/Controllers/AccountController.cs
View file @ 92307b0f
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using PhoneStore.Enums; using PhoneStore.Enums;
using PhoneStore.Helpers; using PhoneStore.Helpers;
using PhoneStore.Models;
using PhoneStore.Services.Interfaces; using PhoneStore.Services.Interfaces;
using PhoneStore.ViewModels.Account; using PhoneStore.ViewModels.Account;
...@@ -11,10 +14,13 @@ namespace PhoneStore.Controllers ...@@ -11,10 +14,13 @@ namespace PhoneStore.Controllers
public class AccountController : Controller public class AccountController : Controller
{ {
private readonly IAccountService _accountService; private readonly IAccountService _accountService;
private readonly UserManager<User> _userManager;
public AccountController(IAccountService accountService)
public AccountController(IAccountService accountService, UserManager<User> userManager)
{ {
_accountService = accountService; _accountService = accountService;
_userManager = userManager;
} }
[HttpGet] [HttpGet]
...@@ -80,5 +86,12 @@ namespace PhoneStore.Controllers ...@@ -80,5 +86,12 @@ namespace PhoneStore.Controllers
var users = _accountService.SearchUsersByAnyTerm(searchTerm); var users = _accountService.SearchUsersByAnyTerm(searchTerm);
return PartialView("PartialViews/SearchResultPartial", users); return PartialView("PartialViews/SearchResultPartial", users);
} }
[HttpGet]
public async Task<OkObjectResult> GetAuthUser()
{
User user = await _userManager.GetUserAsync(User);
return Ok(user ?? new User());
}
} }
} }
\ No newline at end of file
PhoneStore/Controllers/OrdersController.cs
View file @ 92307b0f
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore; using PhoneStore.Mappers;
using PhoneStore.Models; using PhoneStore.Models;
using PhoneStore.Services.Interfaces;
using PhoneStore.ViewModels;
namespace PhoneStore.Controllers namespace PhoneStore.Controllers
{ {
public class OrdersController : Controller public class OrdersController : Controller
{ {
private readonly MobileContext _db; private readonly IOrderService _orderService;
private readonly IPhoneService _phoneService;
public OrdersController(MobileContext db) private readonly UserManager<User> _userManager;
public OrdersController(IOrderService orderService, IPhoneService phoneService, UserManager<User> userManager)
{ {
_db = db; _orderService = orderService;
_phoneService = phoneService;
_userManager = userManager;
} }
// GET [HttpGet]
public IActionResult Index() public IActionResult Index()
{ {
var orders = _db.Orders var orders = _orderService.GetAll();
.Include(p => p.Phone)
.ToList();
return View(orders); return View(orders);
} }
[HttpGet] [HttpGet]
public IActionResult Create(int phoneId) public async Task<IActionResult> Create(int phoneId)
{ {
var phone = _db.Phones.FirstOrDefault(p => p.Id == phoneId); User user = await _userManager.GetUserAsync(User);
var phone = _phoneService.GetById(phoneId);
if (phone is null) if (phone is null)
return RedirectToAction("Error", "Errors", new {statusCode = 777}); return RedirectToAction("Error", "Errors", new {statusCode = 777});
Order order = new Order OrderViewModel order = new OrderViewModel
{ {
Phone = phone Phone = phone,
User = user.MapToUserViewModel()
}; };
return View(order); return View(order);
} }
[HttpPost] [HttpPost]
public IActionResult Create(Order order) public IActionResult Create(OrderViewModel order)
{ {
_db.Orders.Add(order); order.UserId = int.Parse(_userManager.GetUserId(User));
_db.SaveChanges(); _orderService.Create(order.MapToOrderViewModel());
return RedirectToAction("Index"); return RedirectToAction("Index");
} }
} }
......
PhoneStore/Controllers/PhonesController.cs
View file @ 92307b0f
...@@ -6,6 +6,7 @@ using System.Threading.Tasks; ...@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using PhoneStore.Helpers; using PhoneStore.Helpers;
using PhoneStore.Mappers;
using PhoneStore.Models; using PhoneStore.Models;
using PhoneStore.Services.Interfaces; using PhoneStore.Services.Interfaces;
using PhoneStore.ViewModels; using PhoneStore.ViewModels;
...@@ -143,7 +144,7 @@ namespace PhoneStore.Controllers ...@@ -143,7 +144,7 @@ namespace PhoneStore.Controllers
try try
{ {
if (!phoneId.HasValue) return RedirectToAction("Error", "Errors", new {statusCode = 777}); if (!phoneId.HasValue) return RedirectToAction("Error", "Errors", new {statusCode = 777});
var phoneViewModel = _phoneService.GetPhoneById((int)phoneId); var phoneViewModel = _phoneService.GetById(phoneId.Value);
return View(phoneViewModel); return View(phoneViewModel);
} }
catch (NullReferenceException) catch (NullReferenceException)
......
PhoneStore/Helpers/RepositoryConnector.cs 0 → 100644
View file @ 92307b0f
using Microsoft.Extensions.DependencyInjection;
using PhoneStore.Repositories;
using PhoneStore.Repositories.Interfaces;
namespace PhoneStore.Helpers
{
public static class RepositoryConnector
{
public static IServiceCollection AddRepositories(IServiceCollection services)
{
services.AddScoped<IFeedbackRepository, FeedbackRepository>();
services.AddScoped<IOrderRepository, OrderRepository>();
services.AddScoped<IPhoneRepository, PhoneRepository>();
return services;
}
}
}
\ No newline at end of file
PhoneStore/Helpers/ServiceConnector.cs
View file @ 92307b0f
...@@ -8,7 +8,7 @@ namespace PhoneStore.Helpers ...@@ -8,7 +8,7 @@ namespace PhoneStore.Helpers
{ {
public static class ServiceConnector public static class ServiceConnector
{ {
public static void AddApplicationServices(this IServiceCollection services, IConfiguration configuration) public static IServiceCollection AddApplicationServices(this IServiceCollection services, IConfiguration configuration)
{ {
services.AddScoped<IBasketService, BasketService>(); services.AddScoped<IBasketService, BasketService>();
services.AddTransient<UploadService>(); services.AddTransient<UploadService>();
...@@ -24,6 +24,9 @@ namespace PhoneStore.Helpers ...@@ -24,6 +24,9 @@ namespace PhoneStore.Helpers
services.AddTransient<IAccountService, AccountService>(); services.AddTransient<IAccountService, AccountService>();
services.AddTransient<IUsersSearcher, UsersSearcher>(); services.AddTransient<IUsersSearcher, UsersSearcher>();
services.AddTransient<IFeedbackService, FeedbackService>(); services.AddTransient<IFeedbackService, FeedbackService>();
services.AddTransient<IPhoneService, PhoneService>();
services.AddTransient<IOrderService, OrderService>();
return services;
} }
} }
} }
\ No newline at end of file
PhoneStore/Helpers/FeedbackMapper.cs → PhoneStore/Mappers/FeedbackMapper.cs
View file @ 92307b0f
using PhoneStore.Models; using PhoneStore.Models;
using PhoneStore.ViewModels.Feedback; using PhoneStore.ViewModels.Feedback;
namespace PhoneStore.Helpers namespace PhoneStore.Mappers
{ {
public static class FeedbackMapper public static class FeedbackMapper
{ {
...@@ -19,5 +19,20 @@ namespace PhoneStore.Helpers ...@@ -19,5 +19,20 @@ namespace PhoneStore.Helpers
}; };
return feedbackViewModel; return feedbackViewModel;
} }
public static Feedback MapToFeedback(this FeedbackViewModel self)
{
Feedback feedbackViewModel = new Feedback
{
Id = self.Id,
Text = self.Text,
PhoneId = self.PhoneId,
UserId = self.UserId,
User = self.User.MapToUser(),
Phone = self.Phone.MapToPhone(),
CreationDateTime = self.CreationDateTime
};
return feedbackViewModel;
}
} }
} }
\ No newline at end of file
PhoneStore/Mappers/OrderMapper.cs 0 → 100644
View file @ 92307b0f
using PhoneStore.Models;
using PhoneStore.ViewModels;
namespace PhoneStore.Mappers
{
public static class OrderMapper
{
public static OrderViewModel MapToOrderViewModel(this Order self)
{
return new OrderViewModel
{
Address = self.Address,
Phone = self.Phone.MapToPhoneViewModel(),
ContactPhone = self.ContactPhone,
PhoneId = self.PhoneId,
User = self.User.MapToUserViewModel(),
UserId = self.UserId,
Id = self.Id
};
}
public static Order MapToOrderViewModel(this OrderViewModel self)
{
return new Order
{
Address = self.Address,
Phone = self.Phone?.MapToPhone(),
ContactPhone = self.ContactPhone,
PhoneId = self.PhoneId,
User = self.User?.MapToUser(),
UserId = self.UserId,
Id = self.Id
};
}
}
}
\ No newline at end of file
PhoneStore/Helpers/PhoneMapper.cs → PhoneStore/Mappers/PhoneMapper.cs
View file @ 92307b0f
using System.Linq;
using PhoneStore.Models; using PhoneStore.Models;
using PhoneStore.ViewModels;
using PhoneStore.ViewModels.PhoneViewModels; using PhoneStore.ViewModels.PhoneViewModels;
namespace PhoneStore.Helpers namespace PhoneStore.Mappers
{ {
public static class PhoneMapper public static class PhoneMapper
{ {
...@@ -19,19 +19,35 @@ namespace PhoneStore.Helpers ...@@ -19,19 +19,35 @@ namespace PhoneStore.Helpers
return phone; return phone;
} }
public static PhoneViewModel MapToPhoneViewModel(this Phone self, string imagePath = null) public static PhoneViewModel MapToPhoneViewModel(this Phone self)
{ {
PhoneViewModel phone = new PhoneViewModel PhoneViewModel phone = new PhoneViewModel
{ {
Name = self.Name, Name = self.Name,
Price = self.Price, Price = self.Price,
Brand = self.Brand, Brand = self.Brand,
Image = imagePath, Image = self.Image,
Id = self.Id Id = self.Id,
Feedbacks = self.Feedbacks.Select(f => f.MapToFeedbackViewModel()),
BrandId = self.BrandId
}; };
return phone; return phone;
} }
public static Phone MapToPhone(this PhoneViewModel self, string imagePath = null)
{
Phone phone = new Phone
{
Name = self.Name,
Price = self.Price,
BrandId = self.BrandId,
Image = imagePath,
Id = self.Id,
Brand = self.Brand
};
return phone;
}
} }
} }
\ No newline at end of file
PhoneStore/Helpers/UserHelper.cs → PhoneStore/Mappers/UserMapper.cs
View file @ 92307b0f
...@@ -3,9 +3,9 @@ using PhoneStore.Models; ...@@ -3,9 +3,9 @@ using PhoneStore.Models;
using PhoneStore.ViewModels; using PhoneStore.ViewModels;
using PhoneStore.ViewModels.Account; using PhoneStore.ViewModels.Account;
namespace PhoneStore.Helpers namespace PhoneStore.Mappers
{ {
public static class UserHelper public static class UserMapper
{ {
public static UsersViewModel MapToUsersViewModel( public static UsersViewModel MapToUsersViewModel(
this IQueryable<User> self, this IQueryable<User> self,
...@@ -22,8 +22,7 @@ namespace PhoneStore.Helpers ...@@ -22,8 +22,7 @@ namespace PhoneStore.Helpers
}; };
} }
public static UserViewModel MapToUserViewModel( public static UserViewModel MapToUserViewModel(this User self)
this User self)
{ {
return new UserViewModel return new UserViewModel
{ {
...@@ -34,5 +33,16 @@ namespace PhoneStore.Helpers ...@@ -34,5 +33,16 @@ namespace PhoneStore.Helpers
Username = self.UserName Username = self.UserName
}; };
} }
public static User MapToUser(this UserViewModel self)
{
return new User
{
Age = self.Age,
Email = self.Email,
Id = self.Id,
Name = self.Name
};
}
} }
} }
\ No newline at end of file
PhoneStore/Migrations/20220826161211_AddUserField.Designer.cs 0 → 100644
View file @ 92307b0f
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using PhoneStore.Models;
namespace PhoneStore.Migrations
{
[DbContext(typeof(MobileContext))]
[Migration("20220826161211_AddUserField")]
partial class AddUserField
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("Relational:MaxIdentifierLength", 63)
.HasAnnotation("ProductVersion", "5.0.17")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<int>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<string>("ClaimType")
.HasColumnType("text");
b.Property<string>("ClaimValue")
.HasColumnType("text");
b.Property<int>("RoleId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("RoleId");
b.ToTable("AspNetRoleClaims");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<int>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<string>("ClaimType")
.HasColumnType("text");
b.Property<string>("ClaimValue")
.HasColumnType("text");
b.Property<int>("UserId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("AspNetUserClaims");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<int>", b =>
{
b.Property<string>("LoginProvider")
.HasColumnType("text");
b.Property<string>("ProviderKey")
.HasColumnType("text");
b.Property<string>("ProviderDisplayName")
.HasColumnType("text");
b.Property<int>("UserId")
.HasColumnType("integer");
b.HasKey("LoginProvider", "ProviderKey");
b.HasIndex("UserId");
b.ToTable("AspNetUserLogins");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<int>", b =>
{
b.Property<int>("UserId")
.HasColumnType("integer");
b.Property<int>("RoleId")
.HasColumnType("integer");
b.HasKey("UserId", "RoleId");
b.HasIndex("RoleId");
b.ToTable("AspNetUserRoles");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<int>", b =>
{
b.Property<int>("UserId")
.HasColumnType("integer");
b.Property<string>("LoginProvider")
.HasColumnType("text");
b.Property<string>("Name")
.HasColumnType("text");
b.Property<string>("Value")
.HasColumnType("text");
b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AspNetUserTokens");
});
modelBuilder.Entity("PhoneStore.Models.Basket", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<int>("PhoneId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("PhoneId");
b.ToTable("Baskets");
});
modelBuilder.Entity("PhoneStore.Models.Brand", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<string>("Name")
.HasColumnType("text");
b.HasKey("Id");
b.ToTable("Brands");
});
modelBuilder.Entity("PhoneStore.Models.Feedback", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<DateTime>("CreationDateTime")
.HasColumnType("timestamp without time zone");
b.Property<int>("PhoneId")
.HasColumnType("integer");
b.Property<string>("Text")
.HasColumnType("text");
b.Property<int>("UserId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("PhoneId");
b.HasIndex("UserId");
b.ToTable("Feedbacks");
});
modelBuilder.Entity("PhoneStore.Models.Order", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<string>("Address")
.HasColumnType("text");
b.Property<string>("ContactPhone")
.HasColumnType("text");
b.Property<int>("PhoneId")
.HasColumnType("integer");
b.Property<int>("UserId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("PhoneId");
b.HasIndex("UserId");
b.ToTable("Orders");
});
modelBuilder.Entity("PhoneStore.Models.Phone", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<int?>("BrandId")
.HasColumnType("integer");
b.Property<string>("Image")
.HasColumnType("text");
b.Property<string>("Name")
.HasColumnType("text");
b.Property<decimal>("Price")
.HasColumnType("numeric");
b.HasKey("Id");
b.HasIndex("BrandId");
b.ToTable("Phones");
});
modelBuilder.Entity("PhoneStore.Models.Role", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("text");
b.Property<string>("Name")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<string>("NormalizedName")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.HasKey("Id");
b.HasIndex("NormalizedName")
.IsUnique()
.HasDatabaseName("RoleNameIndex");
b.ToTable("AspNetRoles");
});
modelBuilder.Entity("PhoneStore.Models.SubscriptionSubscriber", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<int>("SubscriberId")
.HasColumnType("integer");
b.Property<int>("SubscriptionId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("SubscriberId");
b.HasIndex("SubscriptionId");
b.ToTable("SubscriptionsSubscribers");
});
modelBuilder.Entity("PhoneStore.Models.User", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<int>("AccessFailedCount")
.HasColumnType("integer");
b.Property<int>("Age")
.HasColumnType("integer");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("text");
b.Property<string>("Email")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<bool>("EmailConfirmed")
.HasColumnType("boolean");
b.Property<bool>("LockoutEnabled")
.HasColumnType("boolean");
b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("timestamp with time zone");
b.Property<string>("Name")
.HasColumnType("text");
b.Property<string>("NormalizedEmail")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<string>("NormalizedUserName")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<string>("PasswordHash")
.HasColumnType("text");
b.Property<string>("PhoneNumber")
.HasColumnType("text");
b.Property<bool>("PhoneNumberConfirmed")
.HasColumnType("boolean");
b.Property<string>("SecurityStamp")
.HasColumnType("text");
b.Property<bool>("TwoFactorEnabled")
.HasColumnType("boolean");
b.Property<string>("UserName")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
.HasDatabaseName("EmailIndex");
b.HasIndex("NormalizedUserName")
.IsUnique()
.HasDatabaseName("UserNameIndex");
b.ToTable("AspNetUsers");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<int>", b =>
{
b.HasOne("PhoneStore.Models.Role", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<int>", b =>
{
b.HasOne("PhoneStore.Models.User", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<int>", b =>
{
b.HasOne("PhoneStore.Models.User", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<int>", b =>
{
b.HasOne("PhoneStore.Models.Role", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("PhoneStore.Models.User", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<int>", b =>
{
b.HasOne("PhoneStore.Models.User", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("PhoneStore.Models.Basket", b =>
{
b.HasOne("PhoneStore.Models.Phone", "Phone")
.WithMany()
.HasForeignKey("PhoneId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Phone");
});
modelBuilder.Entity("PhoneStore.Models.Feedback", b =>
{
b.HasOne("PhoneStore.Models.Phone", "Phone")
.WithMany("Feedbacks")
.HasForeignKey("PhoneId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("PhoneStore.Models.User", "User")
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Phone");
b.Navigation("User");
});
modelBuilder.Entity("PhoneStore.Models.Order", b =>
{
b.HasOne("PhoneStore.Models.Phone", "Phone")
.WithMany()
.HasForeignKey("PhoneId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("PhoneStore.Models.User", "User")
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Phone");
b.Navigation("User");
});
modelBuilder.Entity("PhoneStore.Models.Phone", b =>
{
b.HasOne("PhoneStore.Models.Brand", "Brand")
.WithMany()
.HasForeignKey("BrandId");
b.Navigation("Brand");
});
modelBuilder.Entity("PhoneStore.Models.SubscriptionSubscriber", b =>
{
b.HasOne("PhoneStore.Models.User", "Subscriber")
.WithMany("Subscribers")
.HasForeignKey("SubscriberId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("PhoneStore.Models.User", "Subscription")
.WithMany("Subscriptions")
.HasForeignKey("SubscriptionId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Subscriber");
b.Navigation("Subscription");
});
modelBuilder.Entity("PhoneStore.Models.Phone", b =>
{
b.Navigation("Feedbacks");
});
modelBuilder.Entity("PhoneStore.Models.User", b =>
{
b.Navigation("Subscribers");
b.Navigation("Subscriptions");
});
#pragma warning restore 612, 618
}
}
}
PhoneStore/Migrations/20220826161211_AddUserField.cs 0 → 100644
View file @ 92307b0f
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace PhoneStore.Migrations
{
public partial class AddUserField : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "UserName",
table: "Orders");
migrationBuilder.AddColumn<int>(
name: "UserId",
table: "Orders",
type: "integer",
nullable: false,
defaultValue: 0);
migrationBuilder.CreateTable(
name: "SubscriptionsSubscribers",
columns: table => new
{
Id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
SubscriberId = table.Column<int>(type: "integer", nullable: false),
SubscriptionId = table.Column<int>(type: "integer", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_SubscriptionsSubscribers", x => x.Id);
table.ForeignKey(
name: "FK_SubscriptionsSubscribers_AspNetUsers_SubscriberId",
column: x => x.SubscriberId,
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_SubscriptionsSubscribers_AspNetUsers_SubscriptionId",
column: x => x.SubscriptionId,
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateIndex(
name: "IX_Orders_UserId",
table: "Orders",
column: "UserId");
migrationBuilder.CreateIndex(
name: "IX_SubscriptionsSubscribers_SubscriberId",
table: "SubscriptionsSubscribers",
column: "SubscriberId");
migrationBuilder.CreateIndex(
name: "IX_SubscriptionsSubscribers_SubscriptionId",
table: "SubscriptionsSubscribers",
column: "SubscriptionId");
migrationBuilder.AddForeignKey(
name: "FK_Orders_AspNetUsers_UserId",
table: "Orders",
column: "UserId",
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_Orders_AspNetUsers_UserId",
table: "Orders");
migrationBuilder.DropTable(
name: "SubscriptionsSubscribers");
migrationBuilder.DropIndex(
name: "IX_Orders_UserId",
table: "Orders");
migrationBuilder.DropColumn(
name: "UserId",
table: "Orders");
migrationBuilder.AddColumn<string>(
name: "UserName",
table: "Orders",
type: "text",
nullable: true);
}
}
}
PhoneStore/Migrations/20220826164935_RemoveNullable.Designer.cs 0 → 100644
View file @ 92307b0f
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using PhoneStore.Models;
namespace PhoneStore.Migrations
{
[DbContext(typeof(MobileContext))]
[Migration("20220826164935_RemoveNullable")]
partial class RemoveNullable
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("Relational:MaxIdentifierLength", 63)
.HasAnnotation("ProductVersion", "5.0.17")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<int>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<string>("ClaimType")
.HasColumnType("text");
b.Property<string>("ClaimValue")
.HasColumnType("text");
b.Property<int>("RoleId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("RoleId");
b.ToTable("AspNetRoleClaims");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<int>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<string>("ClaimType")
.HasColumnType("text");
b.Property<string>("ClaimValue")
.HasColumnType("text");
b.Property<int>("UserId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("AspNetUserClaims");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<int>", b =>
{
b.Property<string>("LoginProvider")
.HasColumnType("text");
b.Property<string>("ProviderKey")
.HasColumnType("text");
b.Property<string>("ProviderDisplayName")
.HasColumnType("text");
b.Property<int>("UserId")
.HasColumnType("integer");
b.HasKey("LoginProvider", "ProviderKey");
b.HasIndex("UserId");
b.ToTable("AspNetUserLogins");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<int>", b =>
{
b.Property<int>("UserId")
.HasColumnType("integer");
b.Property<int>("RoleId")
.HasColumnType("integer");
b.HasKey("UserId", "RoleId");
b.HasIndex("RoleId");
b.ToTable("AspNetUserRoles");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<int>", b =>
{
b.Property<int>("UserId")
.HasColumnType("integer");
b.Property<string>("LoginProvider")
.HasColumnType("text");
b.Property<string>("Name")
.HasColumnType("text");
b.Property<string>("Value")
.HasColumnType("text");
b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AspNetUserTokens");
});
modelBuilder.Entity("PhoneStore.Models.Basket", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<int>("PhoneId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("PhoneId");
b.ToTable("Baskets");
});
modelBuilder.Entity("PhoneStore.Models.Brand", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<string>("Name")
.HasColumnType("text");
b.HasKey("Id");
b.ToTable("Brands");
});
modelBuilder.Entity("PhoneStore.Models.Feedback", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<DateTime>("CreationDateTime")
.HasColumnType("timestamp without time zone");
b.Property<int>("PhoneId")
.HasColumnType("integer");
b.Property<string>("Text")
.HasColumnType("text");
b.Property<int>("UserId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("PhoneId");
b.HasIndex("UserId");
b.ToTable("Feedbacks");
});
modelBuilder.Entity("PhoneStore.Models.Order", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<string>("Address")
.HasColumnType("text");
b.Property<string>("ContactPhone")
.HasColumnType("text");
b.Property<int>("PhoneId")
.HasColumnType("integer");
b.Property<int>("UserId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("PhoneId");
b.HasIndex("UserId");
b.ToTable("Orders");
});
modelBuilder.Entity("PhoneStore.Models.Phone", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<int>("BrandId")
.HasColumnType("integer");
b.Property<string>("Image")
.HasColumnType("text");
b.Property<string>("Name")
.HasColumnType("text");
b.Property<decimal>("Price")
.HasColumnType("numeric");
b.HasKey("Id");
b.HasIndex("BrandId");
b.ToTable("Phones");
});
modelBuilder.Entity("PhoneStore.Models.Role", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("text");
b.Property<string>("Name")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<string>("NormalizedName")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.HasKey("Id");
b.HasIndex("NormalizedName")
.IsUnique()
.HasDatabaseName("RoleNameIndex");
b.ToTable("AspNetRoles");
});
modelBuilder.Entity("PhoneStore.Models.SubscriptionSubscriber", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<int>("SubscriberId")
.HasColumnType("integer");
b.Property<int>("SubscriptionId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("SubscriberId");
b.HasIndex("SubscriptionId");
b.ToTable("SubscriptionsSubscribers");
});
modelBuilder.Entity("PhoneStore.Models.User", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<int>("AccessFailedCount")
.HasColumnType("integer");
b.Property<int>("Age")
.HasColumnType("integer");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("text");
b.Property<string>("Email")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<bool>("EmailConfirmed")
.HasColumnType("boolean");
b.Property<bool>("LockoutEnabled")
.HasColumnType("boolean");
b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("timestamp with time zone");
b.Property<string>("Name")
.HasColumnType("text");
b.Property<string>("NormalizedEmail")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<string>("NormalizedUserName")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<string>("PasswordHash")
.HasColumnType("text");
b.Property<string>("PhoneNumber")
.HasColumnType("text");
b.Property<bool>("PhoneNumberConfirmed")
.HasColumnType("boolean");
b.Property<string>("SecurityStamp")
.HasColumnType("text");
b.Property<bool>("TwoFactorEnabled")
.HasColumnType("boolean");
b.Property<string>("UserName")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
.HasDatabaseName("EmailIndex");
b.HasIndex("NormalizedUserName")
.IsUnique()
.HasDatabaseName("UserNameIndex");
b.ToTable("AspNetUsers");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<int>", b =>
{
b.HasOne("PhoneStore.Models.Role", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<int>", b =>
{
b.HasOne("PhoneStore.Models.User", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<int>", b =>
{
b.HasOne("PhoneStore.Models.User", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<int>", b =>
{
b.HasOne("PhoneStore.Models.Role", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("PhoneStore.Models.User", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<int>", b =>
{
b.HasOne("PhoneStore.Models.User", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("PhoneStore.Models.Basket", b =>
{
b.HasOne("PhoneStore.Models.Phone", "Phone")
.WithMany()
.HasForeignKey("PhoneId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Phone");
});
modelBuilder.Entity("PhoneStore.Models.Feedback", b =>
{
b.HasOne("PhoneStore.Models.Phone", "Phone")
.WithMany("Feedbacks")
.HasForeignKey("PhoneId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("PhoneStore.Models.User", "User")
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Phone");
b.Navigation("User");
});
modelBuilder.Entity("PhoneStore.Models.Order", b =>
{
b.HasOne("PhoneStore.Models.Phone", "Phone")
.WithMany()
.HasForeignKey("PhoneId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("PhoneStore.Models.User", "User")
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Phone");
b.Navigation("User");
});
modelBuilder.Entity("PhoneStore.Models.Phone", b =>
{
b.HasOne("PhoneStore.Models.Brand", "Brand")
.WithMany()
.HasForeignKey("BrandId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Brand");
});
modelBuilder.Entity("PhoneStore.Models.SubscriptionSubscriber", b =>
{
b.HasOne("PhoneStore.Models.User", "Subscriber")
.WithMany("Subscribers")
.HasForeignKey("SubscriberId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("PhoneStore.Models.User", "Subscription")
.WithMany("Subscriptions")
.HasForeignKey("SubscriptionId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Subscriber");
b.Navigation("Subscription");
});
modelBuilder.Entity("PhoneStore.Models.Phone", b =>
{
b.Navigation("Feedbacks");
});
modelBuilder.Entity("PhoneStore.Models.User", b =>
{
b.Navigation("Subscribers");
b.Navigation("Subscriptions");
});
#pragma warning restore 612, 618
}
}
}
PhoneStore/Migrations/20220826164935_RemoveNullable.cs 0 → 100644
View file @ 92307b0f
using Microsoft.EntityFrameworkCore.Migrations;
namespace PhoneStore.Migrations
{
public partial class RemoveNullable : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_Phones_Brands_BrandId",
table: "Phones");
migrationBuilder.AlterColumn<int>(
name: "BrandId",
table: "Phones",
type: "integer",
nullable: false,
defaultValue: 0,
oldClrType: typeof(int),
oldType: "integer",
oldNullable: true);
migrationBuilder.AddForeignKey(
name: "FK_Phones_Brands_BrandId",
table: "Phones",
column: "BrandId",
principalTable: "Brands",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_Phones_Brands_BrandId",
table: "Phones");
migrationBuilder.AlterColumn<int>(
name: "BrandId",
table: "Phones",
type: "integer",
nullable: true,
oldClrType: typeof(int),
oldType: "integer");
migrationBuilder.AddForeignKey(
name: "FK_Phones_Brands_BrandId",
table: "Phones",
column: "BrandId",
principalTable: "Brands",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
}
}
}
PhoneStore/Migrations/MobileContextModelSnapshot.cs
View file @ 92307b0f
...@@ -196,13 +196,15 @@ namespace PhoneStore.Migrations ...@@ -196,13 +196,15 @@ namespace PhoneStore.Migrations
b.Property<int>("PhoneId") b.Property<int>("PhoneId")
.HasColumnType("integer"); .HasColumnType("integer");
b.Property<string>("UserName") b.Property<int>("UserId")
.HasColumnType("text"); .HasColumnType("integer");
b.HasKey("Id"); b.HasKey("Id");
b.HasIndex("PhoneId"); b.HasIndex("PhoneId");
b.HasIndex("UserId");
b.ToTable("Orders"); b.ToTable("Orders");
}); });
...@@ -213,7 +215,7 @@ namespace PhoneStore.Migrations ...@@ -213,7 +215,7 @@ namespace PhoneStore.Migrations
.HasColumnType("integer") .HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<int?>("BrandId") b.Property<int>("BrandId")
.HasColumnType("integer"); .HasColumnType("integer");
b.Property<string>("Image") b.Property<string>("Image")
...@@ -260,6 +262,28 @@ namespace PhoneStore.Migrations ...@@ -260,6 +262,28 @@ namespace PhoneStore.Migrations
b.ToTable("AspNetRoles"); b.ToTable("AspNetRoles");
}); });
modelBuilder.Entity("PhoneStore.Models.SubscriptionSubscriber", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property<int>("SubscriberId")
.HasColumnType("integer");
b.Property<int>("SubscriptionId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("SubscriberId");
b.HasIndex("SubscriptionId");
b.ToTable("SubscriptionsSubscribers");
});
modelBuilder.Entity("PhoneStore.Models.User", b => modelBuilder.Entity("PhoneStore.Models.User", b =>
{ {
b.Property<int>("Id") b.Property<int>("Id")
...@@ -397,7 +421,7 @@ namespace PhoneStore.Migrations ...@@ -397,7 +421,7 @@ namespace PhoneStore.Migrations
modelBuilder.Entity("PhoneStore.Models.Feedback", b => modelBuilder.Entity("PhoneStore.Models.Feedback", b =>
{ {
b.HasOne("PhoneStore.Models.Phone", "Phone") b.HasOne("PhoneStore.Models.Phone", "Phone")
.WithMany() .WithMany("Feedbacks")
.HasForeignKey("PhoneId") .HasForeignKey("PhoneId")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
.IsRequired(); .IsRequired();
...@@ -421,17 +445,58 @@ namespace PhoneStore.Migrations ...@@ -421,17 +445,58 @@ namespace PhoneStore.Migrations
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
.IsRequired(); .IsRequired();
b.HasOne("PhoneStore.Models.User", "User")
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Phone"); b.Navigation("Phone");
b.Navigation("User");
}); });
modelBuilder.Entity("PhoneStore.Models.Phone", b => modelBuilder.Entity("PhoneStore.Models.Phone", b =>
{ {
b.HasOne("PhoneStore.Models.Brand", "Brand") b.HasOne("PhoneStore.Models.Brand", "Brand")
.WithMany() .WithMany()
.HasForeignKey("BrandId"); .HasForeignKey("BrandId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Brand"); b.Navigation("Brand");
}); });
modelBuilder.Entity("PhoneStore.Models.SubscriptionSubscriber", b =>
{
b.HasOne("PhoneStore.Models.User", "Subscriber")
.WithMany("Subscribers")
.HasForeignKey("SubscriberId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("PhoneStore.Models.User", "Subscription")
.WithMany("Subscriptions")
.HasForeignKey("SubscriptionId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Subscriber");
b.Navigation("Subscription");
});
modelBuilder.Entity("PhoneStore.Models.Phone", b =>
{
b.Navigation("Feedbacks");
});
modelBuilder.Entity("PhoneStore.Models.User", b =>
{
b.Navigation("Subscribers");
b.Navigation("Subscriptions");
});
#pragma warning restore 612, 618 #pragma warning restore 612, 618
} }
} }
......
PhoneStore/Models/MobileContext.cs
View file @ 92307b0f
...@@ -13,6 +13,7 @@ namespace PhoneStore.Models ...@@ -13,6 +13,7 @@ namespace PhoneStore.Models
public MobileContext(DbContextOptions<MobileContext> options) : base(options) public MobileContext(DbContextOptions<MobileContext> options) : base(options)
{ {
} }
} }
} }
\ No newline at end of file
PhoneStore/Models/Order.cs
View file @ 92307b0f
...@@ -3,7 +3,8 @@ namespace PhoneStore.Models ...@@ -3,7 +3,8 @@ namespace PhoneStore.Models
public class Order public class Order
{ {
public int Id { get; set; } public int Id { get; set; }
public string UserName { get; set; } public int UserId { get; set; }
public User User { get; set; }
public string ContactPhone { get; set; } public string ContactPhone { get; set; }
public string Address { get; set; } public string Address { get; set; }
......
PhoneStore/Models/Phone.cs
View file @ 92307b0f
...@@ -7,7 +7,7 @@ namespace PhoneStore.Models ...@@ -7,7 +7,7 @@ namespace PhoneStore.Models
public int Id { get; set; } public int Id { get; set; }
public string Name { get; set; } public string Name { get; set; }
public decimal Price { get; set; } public decimal Price { get; set; }
public int? BrandId { get; set; } public int BrandId { get; set; }
public Brand Brand { get; set; } public Brand Brand { get; set; }
public string Image { get; set; } public string Image { get; set; }
public List<Feedback> Feedbacks { get; set; } public List<Feedback> Feedbacks { get; set; }
......
PhoneStore/Models/User.cs
View file @ 92307b0f
using System.Collections.Generic;
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
namespace PhoneStore.Models namespace PhoneStore.Models
......
PhoneStore/Repositories/FeedbackRepository.cs 0 → 100644
View file @ 92307b0f
using System.Collections.Generic;
using System.Linq;
using Microsoft.EntityFrameworkCore;
using PhoneStore.Models;
using PhoneStore.Repositories.Interfaces;
namespace PhoneStore.Repositories
{
public class FeedbackRepository : IFeedbackRepository
{
private readonly MobileContext _db;
public FeedbackRepository(MobileContext db)
{
_db = db;
}
public IEnumerable<Feedback> GetAllByUserId(int userId)
=> _db.Feedbacks.Where(f => f.UserId == userId);
public Feedback GetById(int id)
{
return _db.Feedbacks
.Include(f => f.User)
.Include(f => f.Phone)
.First(f => f.Id == id);
}
public bool CheckFeedbackExists(int userId, int phoneId)
=> _db.Feedbacks.Any(f => f.UserId == userId && f.PhoneId == phoneId);
public void Create(Feedback feedback)
{
_db.Feedbacks.Add(feedback);
_db.SaveChanges();
}
public void Update(Feedback feedback)
{
_db.Update(feedback);
_db.SaveChanges();
}
public IEnumerable<Order> GetByUserId(int id)
=> _db.Orders.Where(o => o.UserId == id);
}
}
\ No newline at end of file
PhoneStore/Repositories/Interfaces/Base/IBaseOperations.cs 0 → 100644
View file @ 92307b0f
namespace PhoneStore.Repositories.Interfaces.Base
{
public interface IBaseOperations<T>
{
void Create(T entity);
void Update(T entity);
T GetById(int id);
}
}
\ No newline at end of file
PhoneStore/Repositories/Interfaces/Base/IByUserIdProvider.cs 0 → 100644
View file @ 92307b0f
using System.Collections.Generic;
namespace PhoneStore.Repositories.Interfaces.Base
{
public interface IByUserIdProvider<out T>
{
IEnumerable<T> GetByUserId(int id);
}
}
\ No newline at end of file
PhoneStore/Repositories/Interfaces/IFeedbackRepository.cs 0 → 100644
View file @ 92307b0f
using PhoneStore.Models;
using PhoneStore.Repositories.Interfaces.Base;
namespace PhoneStore.Repositories.Interfaces
{
public interface IFeedbackRepository : IBaseOperations<Feedback>, IByUserIdProvider<Order>
{
bool CheckFeedbackExists(int userId, int phoneId);
}
}
\ No newline at end of file
PhoneStore/Repositories/Interfaces/IOrderRepository.cs 0 → 100644
View file @ 92307b0f

using System.Collections.Generic;
using PhoneStore.Models;
using PhoneStore.Repositories.Interfaces.Base;
namespace PhoneStore.Repositories.Interfaces
{
public interface IOrderRepository : IBaseOperations<Order>, IByUserIdProvider<Order>
{
IEnumerable<Order> GetAll();
}
}
\ No newline at end of file
PhoneStore/Repositories/Interfaces/IPhoneRepository.cs 0 → 100644
View file @ 92307b0f
using PhoneStore.Models;
using PhoneStore.Repositories.Interfaces.Base;
namespace PhoneStore.Repositories.Interfaces
{
public interface IPhoneRepository : IBaseOperations<Phone>
{
}
}
\ No newline at end of file
PhoneStore/Repositories/OrderRepository.cs 0 → 100644
View file @ 92307b0f
using System.Collections.Generic;
using System.Linq;
using Microsoft.EntityFrameworkCore;
using PhoneStore.Models;
using PhoneStore.Repositories.Interfaces;
namespace PhoneStore.Repositories
{
public class OrderRepository : IOrderRepository
{
private readonly MobileContext _db;
public OrderRepository(MobileContext db)
{
_db = db;
}
public void Create(Order order)
{
_db.Orders.Add(order);
_db.SaveChanges();
}
public void Update(Order order)
{
_db.Orders.Update(order);
_db.SaveChanges();
}
public Order GetById(int id)
=> _db.Orders
.Include(o => o.Phone)
.Include(o => o.User)
.FirstOrDefault(o => o.Id == id);
public IEnumerable<Order> GetAll()
{
return _db.Orders
.Include(p => p.Phone)
.Include(p => p.User)
.ToList();
}
public IEnumerable<Order> GetByUserId(int id)
=> _db.Orders
.Include(o => o.User)
.Include(o => o.Phone)
.Where(o => o.UserId == id);
}
}
\ No newline at end of file
PhoneStore/Repositories/PhoneRepository.cs 0 → 100644
View file @ 92307b0f
using System.Linq;
using Microsoft.EntityFrameworkCore;
using PhoneStore.Models;
using PhoneStore.Repositories.Interfaces;
namespace PhoneStore.Repositories
{
public class PhoneRepository : IPhoneRepository
{
private readonly MobileContext _db;
public PhoneRepository(MobileContext db)
{
_db = db;
}
public void Create(Phone phone)
{
_db.Phones.Add(phone);
_db.SaveChanges();
}
public void Update(Phone phone)
{
_db.Phones.Update(phone);
_db.SaveChanges();
}
public Phone GetById(int id)
{
var a =_db.Phones
.Include(p => p.Brand)
.Include(p => p.Feedbacks)
.FirstOrDefault(p => p.Id == id);
return a;
}
}
}
\ No newline at end of file
PhoneStore/Services/AccountService.cs
View file @ 92307b0f
...@@ -2,7 +2,6 @@ using System.Collections.Generic; ...@@ -2,7 +2,6 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
using PhoneStore.Enums; using PhoneStore.Enums;
using PhoneStore.Models; using PhoneStore.Models;
using PhoneStore.Services.Interfaces; using PhoneStore.Services.Interfaces;
......
PhoneStore/Services/AdminInitializerService.cs
View file @ 92307b0f
...@@ -4,7 +4,7 @@ using PhoneStore.Models; ...@@ -4,7 +4,7 @@ using PhoneStore.Models;
namespace PhoneStore.Services namespace PhoneStore.Services
{ {
public class AdminInitializerService public static class AdminInitializerService
{ {
public static async Task SeedAdminUser( public static async Task SeedAdminUser(
RoleManager<Role> roleManager, RoleManager<Role> roleManager,
......
PhoneStore/Services/BasketService.cs
View file @ 92307b0f
...@@ -31,6 +31,7 @@ namespace PhoneStore.Services ...@@ -31,6 +31,7 @@ namespace PhoneStore.Services
{ {
return _context.Baskets return _context.Baskets
.Include(b => b.Phone) .Include(b => b.Phone)
.ThenInclude(p => p.Brand)
.ToList(); .ToList();
} }
......
PhoneStore/Services/FeedbackService.cs
View file @ 92307b0f
using System; using System;
using System.Linq;
using System.Security.Claims; using System.Security.Claims;
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore; using PhoneStore.Mappers;
using PhoneStore.Helpers;
using PhoneStore.Models; using PhoneStore.Models;
using PhoneStore.Repositories.Interfaces;
using PhoneStore.Services.Interfaces; using PhoneStore.Services.Interfaces;
using PhoneStore.ViewModels.Feedback; using PhoneStore.ViewModels.Feedback;
...@@ -12,19 +11,23 @@ namespace PhoneStore.Services ...@@ -12,19 +11,23 @@ namespace PhoneStore.Services
{ {
public class FeedbackService : IFeedbackService public class FeedbackService : IFeedbackService
{ {
private readonly MobileContext _db;
private readonly UserManager<User> _userManager; private readonly UserManager<User> _userManager;
private readonly IFeedbackRepository _feedbackRepository;
public FeedbackService( public FeedbackService(
MobileContext db, UserManager<User> userManager,
UserManager<User> userManager) IFeedbackRepository feedbackRepository)
{ {
_db = db;
_userManager = userManager; _userManager = userManager;
_feedbackRepository = feedbackRepository;
} }
public FeedbackViewModel Create(FeedbackCreateViewModel model, ClaimsPrincipal user) public FeedbackViewModel Create(FeedbackCreateViewModel model, ClaimsPrincipal user)
{ {
var userId = int.Parse(_userManager.GetUserId(user));
var exist = _feedbackRepository.CheckFeedbackExists(userId, model.PhoneId);
if (exist)
return null;
Feedback feedback = new Feedback Feedback feedback = new Feedback
{ {
CreationDateTime = DateTime.Now, CreationDateTime = DateTime.Now,
...@@ -32,29 +35,29 @@ namespace PhoneStore.Services ...@@ -32,29 +35,29 @@ namespace PhoneStore.Services
PhoneId = model.PhoneId, PhoneId = model.PhoneId,
UserId = int.Parse(_userManager.GetUserId(user)) UserId = int.Parse(_userManager.GetUserId(user))
}; };
_db.Feedbacks.Add(feedback); _feedbackRepository.Create(feedback);
_db.SaveChanges(); FeedbackViewModel feedbackViewModel = _feedbackRepository
Feedback newFeedback = _db.Feedbacks .GetById(feedback.Id)
.Include(f => f.User) .MapToFeedbackViewModel();
.Include(f => f.Phone)
.First(f => f.Id == feedback.Id);
FeedbackViewModel feedbackViewModel = newFeedback.MapToFeedbackViewModel();
return feedbackViewModel; return feedbackViewModel;
} }
public FeedbackViewModel Update(FeedbackEditViewModel model) public FeedbackViewModel Update(FeedbackEditViewModel model)
{ {
var feedback = _db.Feedbacks var feedback = _feedbackRepository.GetById(model.Id);
.Include(f => f.User)
.Include(f => f.Phone)
.FirstOrDefault(f => f.Id == model.Id);
if (feedback is null) if (feedback is null)
return null; return null;
feedback.Text = model.Text; feedback.Text = model.Text;
_db.Update(feedback); _feedbackRepository.Update(feedback);
_db.SaveChanges();
return feedback.MapToFeedbackViewModel(); return feedback.MapToFeedbackViewModel();
} }
public FeedbackViewModel GetById(int id)
{
return _feedbackRepository
.GetById(id)
.MapToFeedbackViewModel();
}
} }
} }
\ No newline at end of file
PhoneStore/Services/Interfaces/IAccountService.cs
View file @ 92307b0f
using System.Collections.Generic; using System.Collections.Generic;
using System.Security.Claims;
using System.Threading.Tasks; using System.Threading.Tasks;
using PhoneStore.DataObjects; using PhoneStore.DataObjects;
using PhoneStore.Models; using PhoneStore.Models;
......
PhoneStore/Services/Interfaces/IFeedbackService.cs
View file @ 92307b0f
using System.Security.Claims; using System.Security.Claims;
using PhoneStore.Models;
using PhoneStore.ViewModels.Feedback; using PhoneStore.ViewModels.Feedback;
namespace PhoneStore.Services.Interfaces namespace PhoneStore.Services.Interfaces
...@@ -7,5 +8,6 @@ namespace PhoneStore.Services.Interfaces ...@@ -7,5 +8,6 @@ namespace PhoneStore.Services.Interfaces
{ {
FeedbackViewModel Create(FeedbackCreateViewModel model, ClaimsPrincipal user); FeedbackViewModel Create(FeedbackCreateViewModel model, ClaimsPrincipal user);
FeedbackViewModel Update(FeedbackEditViewModel model); FeedbackViewModel Update(FeedbackEditViewModel model);
FeedbackViewModel GetById(int id);
} }
} }
\ No newline at end of file
PhoneStore/Services/Interfaces/IOrderService.cs 0 → 100644
View file @ 92307b0f
using System.Collections.Generic;
using PhoneStore.Models;
using PhoneStore.ViewModels;
namespace PhoneStore.Services.Interfaces
{
public interface IOrderService
{
IEnumerable<OrderViewModel> GetAll();
void Create(Order order);
OrderViewModel GetById(int id);
IEnumerable<OrderViewModel> GetByUserId(int id);
}
}
\ No newline at end of file
PhoneStore/Services/Interfaces/IPhoneService.cs
View file @ 92307b0f
using PhoneStore.ViewModels;
using PhoneStore.ViewModels.PhoneViewModels; using PhoneStore.ViewModels.PhoneViewModels;
namespace PhoneStore.Services.Interfaces namespace PhoneStore.Services.Interfaces
{ {
public interface IPhoneService : ICreatable<PhoneCreateViewModel> public interface IPhoneService : ICreatable<PhoneCreateViewModel>
{ {
PhoneViewModel GetPhoneById(int phoneId); PhoneViewModel GetById(int phoneId);
} }
} }
\ No newline at end of file
PhoneStore/Services/OrderService.cs 0 → 100644
View file @ 92307b0f
using System.Collections.Generic;
using System.Linq;
using PhoneStore.Mappers;
using PhoneStore.Models;
using PhoneStore.Repositories.Interfaces;
using PhoneStore.Services.Interfaces;
using PhoneStore.ViewModels;
namespace PhoneStore.Services
{
public class OrderService : IOrderService
{
private readonly IOrderRepository _orderRepository;
public OrderService(IOrderRepository orderRepository)
{
_orderRepository = orderRepository;
}
public IEnumerable<OrderViewModel> GetAll()
=> _orderRepository.GetAll().Select(o => o.MapToOrderViewModel());
public void Create(Order order)
=> _orderRepository.Create(order);
public OrderViewModel GetById(int id)
=> _orderRepository.GetById(id).MapToOrderViewModel();
public IEnumerable<OrderViewModel> GetByUserId(int id)
=> _orderRepository
.GetByUserId(id)
.Select(o => o.MapToOrderViewModel());
}
}
\ No newline at end of file
PhoneStore/Services/PhoneService.cs
View file @ 92307b0f
...@@ -4,10 +4,10 @@ using System.Linq; ...@@ -4,10 +4,10 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using PhoneStore.Helpers; using PhoneStore.Mappers;
using PhoneStore.Models; using PhoneStore.Models;
using PhoneStore.Repositories.Interfaces;
using PhoneStore.Services.Interfaces; using PhoneStore.Services.Interfaces;
using PhoneStore.ViewModels;
using PhoneStore.ViewModels.Feedback; using PhoneStore.ViewModels.Feedback;
using PhoneStore.ViewModels.PhoneViewModels; using PhoneStore.ViewModels.PhoneViewModels;
...@@ -19,6 +19,7 @@ namespace PhoneStore.Services ...@@ -19,6 +19,7 @@ namespace PhoneStore.Services
private readonly IDefaultPhoneImagePathProvider _imagePathProvider; private readonly IDefaultPhoneImagePathProvider _imagePathProvider;
private readonly UploadService _uploadService; private readonly UploadService _uploadService;
private readonly IHostEnvironment _environment; private readonly IHostEnvironment _environment;
private readonly IPhoneRepository _phoneRepository;
...@@ -26,12 +27,13 @@ namespace PhoneStore.Services ...@@ -26,12 +27,13 @@ namespace PhoneStore.Services
MobileContext db, MobileContext db,
IDefaultPhoneImagePathProvider imagePathProvider, IDefaultPhoneImagePathProvider imagePathProvider,
UploadService uploadService, UploadService uploadService,
IHostEnvironment environment) IHostEnvironment environment, IPhoneRepository phoneRepository)
{ {
_db = db; _db = db;
_imagePathProvider = imagePathProvider; _imagePathProvider = imagePathProvider;
_uploadService = uploadService; _uploadService = uploadService;
_environment = environment; _environment = environment;
_phoneRepository = phoneRepository;
} }
public async Task CreateAsync(PhoneCreateViewModel entity) public async Task CreateAsync(PhoneCreateViewModel entity)
...@@ -54,6 +56,13 @@ namespace PhoneStore.Services ...@@ -54,6 +56,13 @@ namespace PhoneStore.Services
await _db.SaveChangesAsync(); await _db.SaveChangesAsync();
} }
public PhoneViewModel GetById(int phoneId)
{
return _phoneRepository
.GetById(phoneId)
.MapToPhoneViewModel();
}
public PhoneViewModel GetPhoneById(int phoneId) public PhoneViewModel GetPhoneById(int phoneId)
{ {
var phone = _db.Phones var phone = _db.Phones
......
PhoneStore/Services/UsersSearcher.cs
View file @ 92307b0f
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using PhoneStore.Models; using PhoneStore.Models;
......
PhoneStore/Startup.cs
View file @ 92307b0f
using System.Text;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using PhoneStore.Helpers; using PhoneStore.Helpers;
using PhoneStore.Models; using PhoneStore.Models;
using PhoneStore.Services;
namespace PhoneStore namespace PhoneStore
{ {
...@@ -28,8 +25,12 @@ namespace PhoneStore ...@@ -28,8 +25,12 @@ namespace PhoneStore
.AddIdentity<User, Role>() .AddIdentity<User, Role>()
.AddEntityFrameworkStores<MobileContext>(); .AddEntityFrameworkStores<MobileContext>();
services.AddControllersWithViews(); services.AddControllersWithViews();
//Можно так подключать сервисы
services.AddApplicationServices(Configuration); services.AddApplicationServices(Configuration);
//А можно так
RepositoryConnector.AddRepositories(services);
services.AddValidationServices(); services.AddValidationServices();
services.AddCors();
} }
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
...@@ -50,6 +51,7 @@ namespace PhoneStore ...@@ -50,6 +51,7 @@ namespace PhoneStore
app.UseStaticFiles(); app.UseStaticFiles();
app.UseRouting(); app.UseRouting();
app.UseCors(builder => builder.AllowAnyOrigin());
app.UseAuthentication(); app.UseAuthentication();
app.UseAuthorization(); app.UseAuthorization();
app.UseEndpoints(endpoints => app.UseEndpoints(endpoints =>
......
PhoneStore/ViewModels/Account/UserViewModel.cs
View file @ 92307b0f
namespace PhoneStore.ViewModels.Account namespace PhoneStore.ViewModels.Account
{ {
public class UserViewModel public class UserViewModel : BaseEntity
{ {
public int Id { get; set; }
public string Name { get; set; } public string Name { get; set; }
public int Age { get; set; } public int Age { get; set; }
public string Email { get; set; } public string Email { get; set; }
......
PhoneStore/ViewModels/Feedback/FeedbackEditViewModel.cs
View file @ 92307b0f
namespace PhoneStore.ViewModels.Feedback namespace PhoneStore.ViewModels.Feedback
{ {
public class FeedbackEditViewModel public class FeedbackEditViewModel : BaseEntity
{ {
public int Id { get; set; }
public string Text { get; set; } public string Text { get; set; }
} }
} }
\ No newline at end of file
PhoneStore/ViewModels/Feedback/FeedbackViewModel.cs
View file @ 92307b0f
...@@ -4,9 +4,8 @@ using PhoneStore.ViewModels.PhoneViewModels; ...@@ -4,9 +4,8 @@ using PhoneStore.ViewModels.PhoneViewModels;
namespace PhoneStore.ViewModels.Feedback namespace PhoneStore.ViewModels.Feedback
{ {
public class FeedbackViewModel public class FeedbackViewModel : BaseEntity
{ {
public int Id { get; set; }
public int UserId { get; set; } public int UserId { get; set; }
public int PhoneId { get; set; } public int PhoneId { get; set; }
public string Text { get; set; } public string Text { get; set; }
......
PhoneStore/ViewModels/FileViewModel.cs deleted 100644 → 0
View file @ fcbec971
using Microsoft.AspNetCore.Http;
namespace PhoneStore.ViewModels
{
public class FileViewModel
{
public IFormFile File { get; set; }
}
}
\ No newline at end of file
PhoneStore/ViewModels/OrderViewModel.cs 0 → 100644
View file @ 92307b0f
using PhoneStore.ViewModels.Account;
using PhoneStore.ViewModels.PhoneViewModels;
namespace PhoneStore.ViewModels
{
public class OrderViewModel : BaseEntity
{
public int UserId { get; set; }
public UserViewModel User { get; set; }
public string ContactPhone { get; set; }
public string Address { get; set; }
public int PhoneId { get; set; }
public PhoneViewModel Phone { get; set; }
}
}
\ No newline at end of file
PhoneStore/ViewModels/PhoneViewModels/PhoneCreateViewModel.cs
View file @ 92307b0f
...@@ -6,9 +6,8 @@ using PhoneStore.Models; ...@@ -6,9 +6,8 @@ using PhoneStore.Models;
namespace PhoneStore.ViewModels.PhoneViewModels namespace PhoneStore.ViewModels.PhoneViewModels
{ {
public class PhoneCreateViewModel public class PhoneCreateViewModel : BaseEntity
{ {
public int Id { get; set; }
[Required(ErrorMessage = "Поле обязательно для заполнения")] [Required(ErrorMessage = "Поле обязательно для заполнения")]
[Remote("CheckName", "PhoneValidator", ErrorMessage = "Имя занято")] [Remote("CheckName", "PhoneValidator", ErrorMessage = "Имя занято")]
[StringLength(50, MinimumLength = 3, ErrorMessage = "Минимальная длина 3 символа, максимальная - 50")] [StringLength(50, MinimumLength = 3, ErrorMessage = "Минимальная длина 3 символа, максимальная - 50")]
......
PhoneStore/ViewModels/PhoneViewModels/PhoneViewModel.cs
View file @ 92307b0f
...@@ -4,13 +4,13 @@ using PhoneStore.ViewModels.Feedback; ...@@ -4,13 +4,13 @@ using PhoneStore.ViewModels.Feedback;
namespace PhoneStore.ViewModels.PhoneViewModels namespace PhoneStore.ViewModels.PhoneViewModels
{ {
public class PhoneViewModel public class PhoneViewModel : BaseEntity
{ {
public int Id { get; set; }
public string Name { get; set; } public string Name { get; set; }
public decimal Price { get; set; } public decimal Price { get; set; }
public int BrandId { get; set; }
public Brand Brand { get; set; } public Brand Brand { get; set; }
public string Image { get; set; } public string Image { get; set; }
public List<FeedbackViewModel> Feedbacks { get; set; } public IEnumerable<FeedbackViewModel> Feedbacks { get; set; }
} }
} }
\ No newline at end of file
PhoneStore/Views/Orders/Create.cshtml
View file @ 92307b0f
@model Order @model OrderViewModel
@{ @{
ViewBag.Title = "Заказать смартфон"; ViewBag.Title = "Заказать смартфон";
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="form-row"> <div class="form-row">
<label for=""> <label for="">
Имя покупателя Имя покупателя
<input asp-for="UserName" type="text"> <input asp-for="@Model.User.Name" type="text">
</label> </label>
</div> </div>
<div class="form-row"> <div class="form-row">
......
PhoneStore/Views/Orders/Index.cshtml
View file @ 92307b0f
@model List<Order> @model IEnumerable<OrderViewModel>
@{ @{
ViewBag.Title = "Список заказов"; ViewBag.Title = "Список заказов";
Layout = "_Layout"; Layout = "_Layout";
} }
@if (Model.Count == 0) @if (!Model.Any())
{ {
<h2>Список пуст</h2> <h2>Список пуст</h2>
} }
...@@ -25,7 +25,7 @@ else ...@@ -25,7 +25,7 @@ else
<td>@order.Id</td> <td>@order.Id</td>
<td>@order.Address</td> <td>@order.Address</td>
<td>@order.ContactPhone</td> <td>@order.ContactPhone</td>
<td>@order.UserName</td> <td>@order.User.Name</td>
<td>@order.Phone.Name</td> <td>@order.Phone.Name</td>
</tr> </tr>
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment