Index: frontend/src/App.js =================================================================== --- frontend/src/App.js (revision d76b7ee9036d8c2315eb8ce0de42c77ae3e87822) +++ frontend/src/App.js (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -10,4 +10,6 @@ import Reservations from "./Dashboard/Reservations"; import FrontPage from "./FrontPage"; +import Restaurant from "./Dashboard/Restaurant"; +import Menu from "./Dashboard/Menu"; @@ -32,6 +34,6 @@ : user ? : }> - - + }/> + }/> }/> Index: frontend/src/Dashboard.js =================================================================== --- frontend/src/Dashboard.js (revision d76b7ee9036d8c2315eb8ce0de42c77ae3e87822) +++ frontend/src/Dashboard.js (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -28,6 +28,6 @@ to="/dashboard/reservations">Резервации }>Reviews - }>Todo + to="/dashboard/reviews">Оценки + }>ToDo Index: frontend/src/Dashboard/Menu.js =================================================================== --- frontend/src/Dashboard/Menu.js (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) +++ frontend/src/Dashboard/Menu.js (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -0,0 +1,130 @@ +import React, {useEffect, useState} from 'react' +import {Button, Form, Input, Card, notification} from "antd"; +import axios from "axios"; +import env from "../env"; + +const Menu = props => { + + const [loadingSave, setLoadingSave] = useState(false); + const [restaurant, setRestaurant] = useState({menu:[]}); + const [loading, setLoading] = useState(true); + + useEffect(()=> { + setLoading(true); + getRestaurant() + },[]) + + const getRestaurant = () => { + axios.get(env.api + 'Restaurants').then(res=>{ + setRestaurant(res.data); + setLoadingSave(false); + setLoadingSave(false); + }); + } + + const addMenu = (data) => { + setLoadingSave(true); + axios.post(env.api + 'Menu/',{...data,price: parseInt(data.price)}, { headers: {Authorization: sessionStorage.getItem('Auth')} + }).then(res => { + notification['success']({ + message: 'Успешно зачувано', + }); + getRestaurant() + }).catch(er => { + notification['error']({ + message: 'Се случи проблем при зачувување мени. Ве молиме пробајте повторно подоцна', + }); + setLoadingSave(false); + console.log(er); + }) + console.log(data) + } + + const deleteMenu = (id) => { + axios.delete(env.api + 'Menu/'+id, {headers: {Authorization: sessionStorage.getItem('Auth')} + }).then(res => { + notification['success']({ + message: 'Успешно избришано', + }); + getRestaurant() + }).catch(er => { + notification['error']({ + message: 'Се случи проблем при бришење мени. Ве молиме пробајте повторно подоцна', + }); + console.log(er); + }) + } + + return( +
+
+
+

Мени

+
+
+

Додади нов запис:

+ + + + + + + + + + + + +
+
+
+ {restaurant.menu.map(el => + deleteMenu(el.id)}>Избриши

} style={{ width: 300, display:'inline-block', margin:'10px' }} size="small"> +

{el.description}

+ {el.price} ден. + + )} +
+
+ ) +} + +export default Menu; Index: frontend/src/Dashboard/Reservations.js =================================================================== --- frontend/src/Dashboard/Reservations.js (revision d76b7ee9036d8c2315eb8ce0de42c77ae3e87822) +++ frontend/src/Dashboard/Reservations.js (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -1,4 +1,4 @@ import React, {useEffect, useState} from 'react' -import {Button, Modal, DatePicker, List, notification} from "antd"; +import {Button, Modal, DatePicker, List, notification, Input} from "antd"; import AddNewReservation from "./AddNewReservation"; import moment from 'moment' @@ -13,4 +13,5 @@ const [date, setDate] = useState([moment().startOf('day'), moment().add(24,'hours')]); const [reservations, setReservations] = useState([]) + const [newReservations, setNewReservations] = useState([]) const [loadingReservations, setLoadingReservations] = useState(true) @@ -26,15 +27,17 @@ to: date[1].format('YYYY-MM-DDThh:mm:ss') + 'Z' }, headers: {Authorization: sessionStorage.getItem('Auth')} - }) - .then(res => { + }).then(res => { + axios.get(env.api + 'Reservations/new', { + headers: {Authorization: sessionStorage.getItem('Auth')} + }).then(newres=>{ + setNewReservations(newres.data); setReservations(res.data); - console.log(res.data) setLoadingReservations(false) - }).catch(er => { + }) + }).catch(er => { setLoadingReservations(false) notification['error']({ message: 'Се случи проблем при додавање резервација. Ве молиме пробајте повторно подоцна', }); - console.log(er); }); @@ -48,5 +51,5 @@ const changeReservationStatus = (id, newStatus) => { console.log(id) - axios.put(env.api + 'Reservations/'+id,{}, { + axios.put(env.api + 'Reservations/'+id+'/status',{}, { params: { status: newStatus @@ -59,6 +62,35 @@ }); console.log(er); - }); - } + }) + } + const changeTable = (ev, item) => { + axios.put(env.api + 'Reservations/'+item.id+'/table',{}, { + params: { + tableId: ev.target.value == '' ? 0 : ev.target.value + }, headers: {Authorization: sessionStorage.getItem('Auth')} + }).then(res => { + console.log("success"); + }).catch(er => { + notification['error']({ + message: 'Се случи проблем при менување резервација. Ве молиме пробајте повторно подоцна', + }); + console.log(er); + }) + setNewReservations(old =>{ + const newRes = old.indexOf(item); + if(newRes == -1) return old; + const copy = [...old]; + copy[newRes].table = ev.target.value; + return copy; + }) + setReservations(old =>{ + const newRes = old.indexOf(item); + if(newRes == -1) return old; + const copy = [...old]; + copy[newRes].table = ev.target.value; + return copy; + }) + } + const ReservationType = [ 'Кратко', 'Долго', 'Настан' ]; const ReservationPlace = [ 'Внатре', 'Надвор' ]; @@ -84,4 +116,40 @@ border: '1px solid lightgray' }} > +

Нови резервации

+ + ( + changeReservationStatus(item.id,ReservationStatus[1])}>Прифати, changeReservationStatus(item.id,ReservationStatus[2])}>Отфрли] + : item.reservationStatus == 1 ? [Прифатено] : [Отфрлено]}> +
+
+
Име: {item.contactName}
+
Број: {item.contactNumber}
+
+
+ Маса: changeTable(ev,item)}/> +
+
+
Луѓе: {item.persons}
+
{ReservationPlace[item.reservationPlace]}, {ReservationType[item.reservationType]}
+
+
+
{moment(item.startDate).format('hh:mm DD/MM/YY')}
+
+
+ + )}/> + +
+

Сите резервации

- ( Име: {item.contactName}
Број: {item.contactNumber}
+ +
+ Маса: changeTable(ev,item)}/>
Index: frontend/src/Dashboard/Restaurant.js =================================================================== --- frontend/src/Dashboard/Restaurant.js (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) +++ frontend/src/Dashboard/Restaurant.js (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -0,0 +1,133 @@ +import React,{useState, useEffect} from 'react'; +import {Form, Upload, Spin, message, Modal, Button, Input, notification} from "antd"; +import {PlusOutlined} from "@ant-design/icons"; +import axios from 'axios'; +import env from "../env"; + +const Restaurant = props => { + const [loadingSave, setLoadingSave] = useState(false); + const [loadingLoad, setLoadingLoad] = useState(true); + const [restaurant, setRestaurant] = useState({}); + + useEffect(()=> { + setLoadingLoad(true); + getRestaurant() + },[]) + + const getRestaurant = () => { + axios.get(env.api + 'Restaurants').then(res=>{ + setRestaurant(res.data); + setLoadingLoad(false); + setLoadingSave(false); + }); + } + const beforeUpload = (file) => { + const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png'; + if (!isJpgOrPng) { + message.error('Сликата мора да е формат jpg или png'); + } + if(isJpgOrPng) setLoadingSave(true); + return isJpgOrPng; + } + const uploadChanged = (ev) =>{ + if(ev.file.status == 'done'){ + getRestaurant() + } + } + const submitEdit = (form) => { + setLoadingSave(true); + axios.put(env.api + 'Restaurants/',{...form}, { headers: {Authorization: sessionStorage.getItem('Auth')} + }).then(res => { + notification['success']({ + message: 'Успешно зачувано', + }); + setLoadingSave(false); + }).catch(er => { + notification['error']({ + message: 'Се случи проблем при менување контакт информации. Ве молиме пробајте повторно подоцна', + }); + setLoadingSave(false); + console.log(er); + }) + console.log(form) + } + return( +
+
+
+

Ресторан

+
+ {loadingLoad ? : +
+ + {restaurant.base64Image != "data:image/png;base64," ? avatar :
Додади слика
} + +
+
Modal.error({title: "Ве молиме пополнете ги задолжителните полиња"})} + initialValues={{...restaurant}}> + + + + + + + + + + + + +
+
+
+ } +
+
+ ) +} +export default Restaurant; Index: frontend/src/FrontPage.js =================================================================== --- frontend/src/FrontPage.js (revision d76b7ee9036d8c2315eb8ce0de42c77ae3e87822) +++ frontend/src/FrontPage.js (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -1,8 +1,10 @@ -import React, {useState} from 'react' +import React, {useState, useEffect} from 'react' import {Header} from "./Header"; import {useNavigate} from "react-router-dom"; -import {Button, Image, Modal} from "antd"; +import {Button, Card, Image, Modal, Spin} from "antd"; import placeholderImage from '../src/Assets/placeholder.png' import AddNewReservation from "./Dashboard/AddNewReservation"; +import axios from "axios"; +import env from "./env"; const FrontPage = ({}) => { @@ -10,8 +12,19 @@ const [newReservationModal, setNewReservationModal] = useState(false); const [saveModalLoading, setSaveModalLoading] = useState(false); + const [loading, setLoading] = useState(true); const history = useNavigate(); + + useEffect(()=>{ + setLoading(true); + axios.get(env.api + 'Restaurants').then(res=>{ + setRestaurant(res.data); + setLoading(false); + }); + },[]) + return(
history('/login')} buttonText={'Логирај се'}/> + {loading ? :
-
- {'place'} - } - wrapperStyle={{overflow:'hidden',width:'100%'}} - style={{width:'100%', height:'100%',margin: 'auto',objectFit:'cover'}}> - +
+ {'place'} + } + wrapperStyle={{overflow: 'hidden', width: '100%'}} + style={{width: '100%', height: '100%', margin: 'auto', objectFit: 'cover'}}> + +
+
+
+
+ {restaurant.name} +
{restaurant.address}, {restaurant.phone}
+
+ +
+ +
+
+

Мени

+ {restaurant.menu.map(el => + +

{el.description}

+ {el.price} ден. + + )} +
-
-
-
- {restaurant.name} -
{restaurant.address}, {restaurant.city}
-
- -
- -
-
+ } CreateMenuItem([FromBody] CreateMenuItemRequest req) + { + await _menuService.AddMenu(req); + return Ok(); + } + + [Authorize] + [HttpDelete("{id}")] + public async Task DeleteMenuItem(int id) + { + await _menuService.RemoveMenu(id); + return Ok(); + } +} Index: resTools_backend/backend/Controllers/ReservationsController.cs =================================================================== --- resTools_backend/backend/Controllers/ReservationsController.cs (revision d76b7ee9036d8c2315eb8ce0de42c77ae3e87822) +++ resTools_backend/backend/Controllers/ReservationsController.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -27,4 +27,11 @@ } + [Authorize] + [HttpGet("new")] + public async Task> GetReservationsNew() + { + return await _reservationService.GetNewReservations(); + } + [HttpPost()] public async Task CreateReservation([FromBody] CreateReservationRequest req) @@ -35,5 +42,5 @@ [Authorize] - [HttpPut("{rid}")] + [HttpPut("{rid}/status")] public async Task ChangeStatus(int rid, [FromQuery] ReservationStatus status) { @@ -41,3 +48,11 @@ return Ok(); } + + [Authorize] + [HttpPut("{rid}/table")] + public async Task ChangeTable(int rid, [FromQuery] int tableId) + { + await _reservationService.AssignTable(tableId, rid); + return Ok(); + } } Index: resTools_backend/backend/Controllers/RestaurantsController.cs =================================================================== --- resTools_backend/backend/Controllers/RestaurantsController.cs (revision d76b7ee9036d8c2315eb8ce0de42c77ae3e87822) +++ resTools_backend/backend/Controllers/RestaurantsController.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -37,3 +37,18 @@ return response; } + + [HttpPost("upload")] + public async Task UploadImage([FromForm] IFormFile file) + { + await _restaurantService.UploadImage(file); + return Ok(); + } + + [Authorize] + [HttpPut()] + public async Task UpdateRestaurant([FromBody] UpdateRestaurantRequest req) + { + await _restaurantService.UpdateRestaurant(req); + return Ok(); + } } Index: resTools_backend/backend/DTOs/CreateMenuItemRequest.cs =================================================================== --- resTools_backend/backend/DTOs/CreateMenuItemRequest.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) +++ resTools_backend/backend/DTOs/CreateMenuItemRequest.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -0,0 +1,14 @@ +using Newtonsoft.Json; + +namespace backend.DTOs +{ + public class CreateMenuItemRequest + { + [JsonProperty] + public string Title { get; set; } + [JsonProperty] + public string Description { get; set; } + [JsonProperty] + public int Price { get; set; } + } +} Index: resTools_backend/backend/DTOs/MenuItemResponse.cs =================================================================== --- resTools_backend/backend/DTOs/MenuItemResponse.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) +++ resTools_backend/backend/DTOs/MenuItemResponse.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -0,0 +1,16 @@ +using Newtonsoft.Json; + +namespace backend.DTOs +{ + public class MenuItemResponse + { + [JsonProperty] + public int Id { get; set; } + [JsonProperty] + public string Title { get; set; } + [JsonProperty] + public string Description { get; set; } + [JsonProperty] + public int Price { get; set; } + } +} Index: resTools_backend/backend/DTOs/ReservationResponse.cs =================================================================== --- resTools_backend/backend/DTOs/ReservationResponse.cs (revision d76b7ee9036d8c2315eb8ce0de42c77ae3e87822) +++ resTools_backend/backend/DTOs/ReservationResponse.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -22,4 +22,6 @@ [JsonProperty] public string ContactNumber { get; set; } + [JsonProperty] + public int Table { get; set; } } } Index: resTools_backend/backend/DTOs/RestaurantResponse.cs =================================================================== --- resTools_backend/backend/DTOs/RestaurantResponse.cs (revision d76b7ee9036d8c2315eb8ce0de42c77ae3e87822) +++ resTools_backend/backend/DTOs/RestaurantResponse.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -6,9 +6,13 @@ { [JsonProperty] - public int Id { get; set; } + public string Name { get; set; } [JsonProperty] - public int? OwnerId { get; set; } + public string Address { get; set; } [JsonProperty] - public string Name { get; set; } + public string Phone { get; set; } + [JsonProperty] + public List Menu { get; set; } + [JsonProperty] + public string Base64Image { get; set; } } } Index: resTools_backend/backend/DTOs/UpdateRestaurantRequest.cs =================================================================== --- resTools_backend/backend/DTOs/UpdateRestaurantRequest.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) +++ resTools_backend/backend/DTOs/UpdateRestaurantRequest.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -0,0 +1,14 @@ +using Newtonsoft.Json; + +namespace backend.DTOs +{ + public class UpdateRestaurantRequest + { + [JsonProperty] + public string Name { get; set; } + [JsonProperty] + public string Address { get; set; } + [JsonProperty] + public string Phone { get; set; } + } +} Index: resTools_backend/backend/Data/DataContext.cs =================================================================== --- resTools_backend/backend/Data/DataContext.cs (revision d76b7ee9036d8c2315eb8ce0de42c77ae3e87822) +++ resTools_backend/backend/Data/DataContext.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -52,4 +52,18 @@ } + private DbSet menuItems; + public DbSet MenuItems + { + get + { + if (menuItems == null) + { + menuItems = Set(); + } + + return menuItems; + } + } + protected override void OnModelCreating(ModelBuilder modelBuilder) @@ -74,4 +88,8 @@ .HasMany(p => p.Reservations) .WithOne(b => b.Restaurant); + modelBuilder.Entity() + .HasMany(p => p.Menu) + .WithOne(b => b.Restaurant); + // @@ -82,4 +100,12 @@ .HasOne(p => p.Restaurant) .WithMany(b => b.Reservations); + + // + // MenuItem + // + modelBuilder.Entity().Property(x => x.Id).IsRequired().ValueGeneratedOnAdd(); + modelBuilder.Entity() + .HasOne(p => p.Restaurant) + .WithMany(b => b.Menu); } } Index: resTools_backend/backend/Entities/MenuItem.cs =================================================================== --- resTools_backend/backend/Entities/MenuItem.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) +++ resTools_backend/backend/Entities/MenuItem.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -0,0 +1,11 @@ +namespace backend.Entities +{ + public class MenuItem + { + public int Id { get; set; } + public string Title { get; set; } + public string Description { get; set; } + public int Price { get; set; } + public virtual Restaurant Restaurant { get; set; } + } +} Index: resTools_backend/backend/Entities/Reservation.cs =================================================================== --- resTools_backend/backend/Entities/Reservation.cs (revision d76b7ee9036d8c2315eb8ce0de42c77ae3e87822) +++ resTools_backend/backend/Entities/Reservation.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -14,4 +14,5 @@ public string ContactName { get; set; } public string ContactNumber { get; set; } + public int Table { get; set; } } Index: resTools_backend/backend/Entities/Restaurant.cs =================================================================== --- resTools_backend/backend/Entities/Restaurant.cs (revision d76b7ee9036d8c2315eb8ce0de42c77ae3e87822) +++ resTools_backend/backend/Entities/Restaurant.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -9,5 +9,9 @@ public virtual User Owner { get; set; } public virtual ICollection Reservations { get; set; } + public virtual ICollection Menu { get; set; } public string Name { get; set; } + public string Address { get; set; } + public string Phone { get; set; } + public byte[] Image { get; set; } } } Index: resTools_backend/backend/Migrations/20220705160351_Reservation-Tables.Designer.cs =================================================================== --- resTools_backend/backend/Migrations/20220705160351_Reservation-Tables.Designer.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) +++ resTools_backend/backend/Migrations/20220705160351_Reservation-Tables.Designer.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -0,0 +1,148 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using backend.Data; + +#nullable disable + +namespace backend.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20220705160351_Reservation-Tables")] + partial class ReservationTables + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("backend.Entities.Reservation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ContactName") + .IsRequired() + .HasColumnType("text"); + + b.Property("ContactNumber") + .IsRequired() + .HasColumnType("text"); + + b.Property("Persons") + .HasColumnType("integer"); + + b.Property("ReservationPlace") + .HasColumnType("integer"); + + b.Property("ReservationStatus") + .HasColumnType("integer"); + + b.Property("ReservationType") + .HasColumnType("integer"); + + b.Property("RestaurantId") + .HasColumnType("integer"); + + b.Property("StartDate") + .HasColumnType("timestamp with time zone"); + + b.Property("Table") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("RestaurantId"); + + b.ToTable("Reservations"); + }); + + modelBuilder.Entity("backend.Entities.Restaurant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("OwnerFk") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("OwnerFk") + .IsUnique(); + + b.ToTable("Restoraunts"); + }); + + modelBuilder.Entity("backend.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Email") + .IsRequired() + .HasColumnType("text"); + + b.Property("Password") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("backend.Entities.Reservation", b => + { + b.HasOne("backend.Entities.Restaurant", "Restaurant") + .WithMany("Reservations") + .HasForeignKey("RestaurantId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Restaurant"); + }); + + modelBuilder.Entity("backend.Entities.Restaurant", b => + { + b.HasOne("backend.Entities.User", "Owner") + .WithOne("Restaurant") + .HasForeignKey("backend.Entities.Restaurant", "OwnerFk"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("backend.Entities.Restaurant", b => + { + b.Navigation("Reservations"); + }); + + modelBuilder.Entity("backend.Entities.User", b => + { + b.Navigation("Restaurant") + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} Index: resTools_backend/backend/Migrations/20220705160351_Reservation-Tables.cs =================================================================== --- resTools_backend/backend/Migrations/20220705160351_Reservation-Tables.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) +++ resTools_backend/backend/Migrations/20220705160351_Reservation-Tables.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -0,0 +1,26 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace backend.Migrations +{ + public partial class ReservationTables : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "Table", + table: "Reservations", + type: "integer", + nullable: false, + defaultValue: 0); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "Table", + table: "Reservations"); + } + } +} Index: resTools_backend/backend/Migrations/20220705164500_Restaurant-Fields.Designer.cs =================================================================== --- resTools_backend/backend/Migrations/20220705164500_Restaurant-Fields.Designer.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) +++ resTools_backend/backend/Migrations/20220705164500_Restaurant-Fields.Designer.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -0,0 +1,160 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using backend.Data; + +#nullable disable + +namespace backend.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20220705164500_Restaurant-Fields")] + partial class RestaurantFields + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("backend.Entities.Reservation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ContactName") + .IsRequired() + .HasColumnType("text"); + + b.Property("ContactNumber") + .IsRequired() + .HasColumnType("text"); + + b.Property("Persons") + .HasColumnType("integer"); + + b.Property("ReservationPlace") + .HasColumnType("integer"); + + b.Property("ReservationStatus") + .HasColumnType("integer"); + + b.Property("ReservationType") + .HasColumnType("integer"); + + b.Property("RestaurantId") + .HasColumnType("integer"); + + b.Property("StartDate") + .HasColumnType("timestamp with time zone"); + + b.Property("Table") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("RestaurantId"); + + b.ToTable("Reservations"); + }); + + modelBuilder.Entity("backend.Entities.Restaurant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Address") + .IsRequired() + .HasColumnType("text"); + + b.Property("Image") + .IsRequired() + .HasColumnType("bytea"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("OwnerFk") + .HasColumnType("integer"); + + b.Property("Phone") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("OwnerFk") + .IsUnique(); + + b.ToTable("Restoraunts"); + }); + + modelBuilder.Entity("backend.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Email") + .IsRequired() + .HasColumnType("text"); + + b.Property("Password") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("backend.Entities.Reservation", b => + { + b.HasOne("backend.Entities.Restaurant", "Restaurant") + .WithMany("Reservations") + .HasForeignKey("RestaurantId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Restaurant"); + }); + + modelBuilder.Entity("backend.Entities.Restaurant", b => + { + b.HasOne("backend.Entities.User", "Owner") + .WithOne("Restaurant") + .HasForeignKey("backend.Entities.Restaurant", "OwnerFk"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("backend.Entities.Restaurant", b => + { + b.Navigation("Reservations"); + }); + + modelBuilder.Entity("backend.Entities.User", b => + { + b.Navigation("Restaurant") + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} Index: resTools_backend/backend/Migrations/20220705164500_Restaurant-Fields.cs =================================================================== --- resTools_backend/backend/Migrations/20220705164500_Restaurant-Fields.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) +++ resTools_backend/backend/Migrations/20220705164500_Restaurant-Fields.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -0,0 +1,49 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace backend.Migrations +{ + public partial class RestaurantFields : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "Address", + table: "Restoraunts", + type: "text", + nullable: false, + defaultValue: ""); + + migrationBuilder.AddColumn( + name: "Image", + table: "Restoraunts", + type: "bytea", + nullable: false, + defaultValue: new byte[0]); + + migrationBuilder.AddColumn( + name: "Phone", + table: "Restoraunts", + type: "text", + nullable: false, + defaultValue: ""); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "Address", + table: "Restoraunts"); + + migrationBuilder.DropColumn( + name: "Image", + table: "Restoraunts"); + + migrationBuilder.DropColumn( + name: "Phone", + table: "Restoraunts"); + } + } +} Index: resTools_backend/backend/Migrations/20220706103351_Add-Menu.Designer.cs =================================================================== --- resTools_backend/backend/Migrations/20220706103351_Add-Menu.Designer.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) +++ resTools_backend/backend/Migrations/20220706103351_Add-Menu.Designer.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -0,0 +1,202 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using backend.Data; + +#nullable disable + +namespace backend.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20220706103351_Add-Menu")] + partial class AddMenu + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("backend.Entities.MenuItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Description") + .IsRequired() + .HasColumnType("text"); + + b.Property("Price") + .HasColumnType("integer"); + + b.Property("RestaurantId") + .HasColumnType("integer"); + + b.Property("Title") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("RestaurantId"); + + b.ToTable("MenuItems"); + }); + + modelBuilder.Entity("backend.Entities.Reservation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ContactName") + .IsRequired() + .HasColumnType("text"); + + b.Property("ContactNumber") + .IsRequired() + .HasColumnType("text"); + + b.Property("Persons") + .HasColumnType("integer"); + + b.Property("ReservationPlace") + .HasColumnType("integer"); + + b.Property("ReservationStatus") + .HasColumnType("integer"); + + b.Property("ReservationType") + .HasColumnType("integer"); + + b.Property("RestaurantId") + .HasColumnType("integer"); + + b.Property("StartDate") + .HasColumnType("timestamp with time zone"); + + b.Property("Table") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("RestaurantId"); + + b.ToTable("Reservations"); + }); + + modelBuilder.Entity("backend.Entities.Restaurant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Address") + .IsRequired() + .HasColumnType("text"); + + b.Property("Image") + .IsRequired() + .HasColumnType("bytea"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("OwnerFk") + .HasColumnType("integer"); + + b.Property("Phone") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("OwnerFk") + .IsUnique(); + + b.ToTable("Restoraunts"); + }); + + modelBuilder.Entity("backend.Entities.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Email") + .IsRequired() + .HasColumnType("text"); + + b.Property("Password") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("backend.Entities.MenuItem", b => + { + b.HasOne("backend.Entities.Restaurant", "Restaurant") + .WithMany("Menu") + .HasForeignKey("RestaurantId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Restaurant"); + }); + + modelBuilder.Entity("backend.Entities.Reservation", b => + { + b.HasOne("backend.Entities.Restaurant", "Restaurant") + .WithMany("Reservations") + .HasForeignKey("RestaurantId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Restaurant"); + }); + + modelBuilder.Entity("backend.Entities.Restaurant", b => + { + b.HasOne("backend.Entities.User", "Owner") + .WithOne("Restaurant") + .HasForeignKey("backend.Entities.Restaurant", "OwnerFk"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("backend.Entities.Restaurant", b => + { + b.Navigation("Menu"); + + b.Navigation("Reservations"); + }); + + modelBuilder.Entity("backend.Entities.User", b => + { + b.Navigation("Restaurant") + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} Index: resTools_backend/backend/Migrations/20220706103351_Add-Menu.cs =================================================================== --- resTools_backend/backend/Migrations/20220706103351_Add-Menu.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) +++ resTools_backend/backend/Migrations/20220706103351_Add-Menu.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -0,0 +1,46 @@ +using Microsoft.EntityFrameworkCore.Migrations; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace backend.Migrations +{ + public partial class AddMenu : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "MenuItems", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + Title = table.Column(type: "text", nullable: false), + Description = table.Column(type: "text", nullable: false), + Price = table.Column(type: "integer", nullable: false), + RestaurantId = table.Column(type: "integer", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_MenuItems", x => x.Id); + table.ForeignKey( + name: "FK_MenuItems_Restoraunts_RestaurantId", + column: x => x.RestaurantId, + principalTable: "Restoraunts", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_MenuItems_RestaurantId", + table: "MenuItems", + column: "RestaurantId"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "MenuItems"); + } + } +} Index: resTools_backend/backend/Migrations/DataContextModelSnapshot.cs =================================================================== --- resTools_backend/backend/Migrations/DataContextModelSnapshot.cs (revision d76b7ee9036d8c2315eb8ce0de42c77ae3e87822) +++ resTools_backend/backend/Migrations/DataContextModelSnapshot.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -23,4 +23,33 @@ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + modelBuilder.Entity("backend.Entities.MenuItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Description") + .IsRequired() + .HasColumnType("text"); + + b.Property("Price") + .HasColumnType("integer"); + + b.Property("RestaurantId") + .HasColumnType("integer"); + + b.Property("Title") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("RestaurantId"); + + b.ToTable("MenuItems"); + }); + modelBuilder.Entity("backend.Entities.Reservation", b => { @@ -57,4 +86,7 @@ .HasColumnType("timestamp with time zone"); + b.Property("Table") + .HasColumnType("integer"); + b.HasKey("Id"); @@ -72,4 +104,12 @@ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("Address") + .IsRequired() + .HasColumnType("text"); + + b.Property("Image") + .IsRequired() + .HasColumnType("bytea"); + b.Property("Name") .IsRequired() @@ -78,4 +118,8 @@ b.Property("OwnerFk") .HasColumnType("integer"); + + b.Property("Phone") + .IsRequired() + .HasColumnType("text"); b.HasKey("Id"); @@ -106,4 +150,15 @@ b.ToTable("Users"); + }); + + modelBuilder.Entity("backend.Entities.MenuItem", b => + { + b.HasOne("backend.Entities.Restaurant", "Restaurant") + .WithMany("Menu") + .HasForeignKey("RestaurantId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Restaurant"); }); @@ -130,4 +185,6 @@ modelBuilder.Entity("backend.Entities.Restaurant", b => { + b.Navigation("Menu"); + b.Navigation("Reservations"); }); Index: resTools_backend/backend/Program.cs =================================================================== --- resTools_backend/backend/Program.cs (revision d76b7ee9036d8c2315eb8ce0de42c77ae3e87822) +++ resTools_backend/backend/Program.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -46,4 +46,5 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); +builder.Services.AddScoped(); builder.Services.AddScoped(); Index: resTools_backend/backend/Services/MenuService.cs =================================================================== --- resTools_backend/backend/Services/MenuService.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) +++ resTools_backend/backend/Services/MenuService.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -0,0 +1,45 @@ +using backend.Data; +using backend.DTOs; +using backend.Entities; +using Microsoft.EntityFrameworkCore; + +namespace backend.Services +{ + public interface IMenuService + { + public Task AddMenu(CreateMenuItemRequest menu); + public Task RemoveMenu(int id); + } + public class MenuService : IMenuService + { + private readonly DataContext _context = null; + public MenuService(DataContext context) + { + _context = context; + } + public async Task AddMenu(CreateMenuItemRequest menu) + { + var res = await _context.Restoraunts.FirstOrDefaultAsync(); + if(res.Menu == null) + { + res.Menu = new List(); + } + res.Menu.Add(new MenuItem() + { + Title = menu.Title, + Description = menu.Description, + Price = menu.Price + }); + _context.Restoraunts.Update(res); + await _context.SaveChangesAsync(); + } + + public async Task RemoveMenu(int id) + { + var res = await _context.Restoraunts.Include(x => x.Menu).FirstOrDefaultAsync(); + res.Menu = res.Menu.Where(x => x.Id != id).ToList(); + _context.Restoraunts.Update(res); + await _context.SaveChangesAsync(); + } + } +} Index: resTools_backend/backend/Services/ReservationService.cs =================================================================== --- resTools_backend/backend/Services/ReservationService.cs (revision d76b7ee9036d8c2315eb8ce0de42c77ae3e87822) +++ resTools_backend/backend/Services/ReservationService.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -11,4 +11,6 @@ public Task ChangeReservationStatus(int resId, ReservationStatus status); public Task> GetReservatins(DateTime from, DateTime to); + public Task> GetNewReservations(); + public Task AssignTable(int tableId, int reservationId); } public class ReservationService : IReservationService @@ -21,4 +23,12 @@ _context = context; _smsService = smsService; + } + + public async Task AssignTable(int tableId, int reservationId) + { + var reservation = await _context.Reservations.FindAsync(reservationId); + reservation.Table = tableId; + _context.Update(reservation); + await _context.SaveChangesAsync(); } @@ -50,4 +60,25 @@ } + public async Task> GetNewReservations() + { + Restaurant res = await _context.Restoraunts + .Include(x => x.Reservations + .Where(x => x.ReservationStatus == ReservationStatus.New)) + .FirstOrDefaultAsync(); + var reservations = res.Reservations.Select(t => new ReservationResponse() + { + ContactName = t.ContactName, + ContactNumber = t.ContactNumber, + Persons = t.Persons, + StartDate = t.StartDate, + ReservationStatus = t.ReservationStatus, + Table = t.Table, + Id = t.Id, + ReservationPlace = t.ReservationPlace, + ReservationType = t.ReservationType + }).OrderByDescending(x => x.ReservationStatus == ReservationStatus.New).ToList(); + return reservations; + } + public async Task> GetReservatins(DateTime from, DateTime to) { @@ -63,4 +94,5 @@ StartDate = t.StartDate, ReservationStatus = t.ReservationStatus, + Table = t.Table, Id = t.Id, ReservationPlace = t.ReservationPlace, Index: resTools_backend/backend/Services/RestaurantService.cs =================================================================== --- resTools_backend/backend/Services/RestaurantService.cs (revision d76b7ee9036d8c2315eb8ce0de42c77ae3e87822) +++ resTools_backend/backend/Services/RestaurantService.cs (revision cc4db18b6d338be00c6c1e9b88f8e93ef763f7b6) @@ -10,4 +10,6 @@ public Task CreateRestaurant(string name, int userId); public Task GetRestaurant(); + public Task UploadImage(IFormFile file); + public Task UpdateRestaurant(UpdateRestaurantRequest req); } public class RestaurantService : IRestaurantService @@ -32,11 +34,41 @@ .Select(x => new RestaurantResponse() { - Id = x.Id, Name = x.Name, - OwnerId = x.OwnerFk, + Address = x.Address, + Phone = x.Phone, + Base64Image = String.Format("data:image/png;base64,{0}", Convert.ToBase64String(x.Image)), + Menu = x.Menu.Select(x => new MenuItemResponse() + { + Id = x.Id, + Title = x.Title, + Description = x.Description, + Price = x.Price + }).ToList() }) .FirstOrDefaultAsync(); return res; } + + public async Task UpdateRestaurant(UpdateRestaurantRequest req) + { + var restaurant = await _context.Restoraunts.FirstOrDefaultAsync(); + restaurant.Name = req.Name; + restaurant.Address = req.Address; + restaurant.Phone = req.Phone; + _context.Restoraunts.Update(restaurant); + await _context.SaveChangesAsync(); + } + + public async Task UploadImage(IFormFile file) + { + using (var memoryStream = new MemoryStream()) + { + await file.CopyToAsync(memoryStream); + var restaurant = await _context.Restoraunts.FirstOrDefaultAsync(); + restaurant.Image = memoryStream.ToArray(); + _context.Restoraunts.Update(restaurant); + _context.SaveChanges(); + } + } } }