Index: frontend/package-lock.json =================================================================== --- frontend/package-lock.json (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/package-lock.json (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -13,4 +13,5 @@ "@testing-library/user-event": "^13.5.0", "axios": "^1.5.0", + "axios-extensions": "^3.1.6", "bootstrap": "^5.3.0", "file-loader": "^6.2.0", @@ -5349,4 +5350,25 @@ } }, + "node_modules/axios-extensions": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/axios-extensions/-/axios-extensions-3.1.6.tgz", + "integrity": "sha512-CmwMYxxAw4DcQDJ7/2Iv4GJj1Ao48lJEPieycgZQH6m1KcYZqf9zm2HM/CsULqheCpYxZbiGrCfZf5tVjXqoLg==", + "dependencies": { + "lru-cache": "^7.14.0", + "tslib": "^2.1.0", + "util": "^0.12.3" + }, + "peerDependencies": { + "axios": "*" + } + }, + "node_modules/axios-extensions/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "engines": { + "node": ">=12" + } + }, "node_modules/axios/node_modules/form-data": { "version": "4.0.0", @@ -9425,5 +9447,4 @@ "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", - "peer": true, "dependencies": { "call-bind": "^1.0.2", @@ -9564,4 +9585,18 @@ "engines": { "node": ">=6" + } + }, + "node_modules/is-generator-function": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", + "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, @@ -16800,4 +16835,16 @@ } }, + "node_modules/util": { + "version": "0.12.5", + "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", + "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", + "dependencies": { + "inherits": "^2.0.3", + "is-arguments": "^1.0.4", + "is-generator-function": "^1.0.7", + "is-typed-array": "^1.1.3", + "which-typed-array": "^1.1.2" + } + }, "node_modules/util-deprecate": { "version": "1.0.2", Index: frontend/package.json =================================================================== --- frontend/package.json (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/package.json (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -8,4 +8,5 @@ "@testing-library/user-event": "^13.5.0", "axios": "^1.5.0", + "axios-extensions": "^3.1.6", "bootstrap": "^5.3.0", "file-loader": "^6.2.0", Index: frontend/src/App.js =================================================================== --- frontend/src/App.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/App.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -5,5 +5,5 @@ import 'bootstrap/dist/js/bootstrap.js'; import HomeCarousel from './Components/Layout/CarouselHome/Carousel'; -import { Card, Container } from 'react-bootstrap'; +import {Card, Container} from 'react-bootstrap'; import TabComponent from './Components/Tab/Tab'; import Offers from './Components/Layout/Offers/Offers'; @@ -27,11 +27,14 @@ import TransportEditPage from './Pages/TransportEditPage'; import RestaurantDetailsPage from './Pages/RestaurantDetailsPage'; -import { BrowserRouter, Route, Routes } from 'react-router-dom'; +import {BrowserRouter, Route, Routes} from 'react-router-dom'; import LoginErrorPage from "./Pages/LoginErrorPage"; +import {AuthProvider} from "./Components/Context/AuthContext"; +import PrivateRoute from "./Components/Misc/PrivateRoute"; +import ProfilesManagementPage from "./Pages/ProfilesManagementPage"; +import UserReservationsManagement from "./Pages/UserReservationsManagement"; function App() { -<<<<<<< HEAD return (
@@ -62,5 +65,5 @@ }/> }/> - }/> ); -======= - return ( -
- - - }/> - }/> - }/> - } /> - }/> - }/> - }/> - }/> - }/> - }/> - }/> - }/> - }/> - }/> - }/> - }/> - }/> - - -
- ); ->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) } Index: frontend/src/Components/AdminPanel/AllProfilesTable.js =================================================================== --- frontend/src/Components/AdminPanel/AllProfilesTable.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/AdminPanel/AllProfilesTable.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -52,5 +52,5 @@ {f.accountNonLocked && { - approveProfile('/users/lock/' + f.userID).then(() => { + approveProfile('/users/unlock/' + f.userID).then(() => { setChanged((prev) => { return Math.random(); Index: frontend/src/Components/Forms/AddHotelForm.js =================================================================== --- frontend/src/Components/Forms/AddHotelForm.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/Forms/AddHotelForm.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -119,4 +119,6 @@ return prevState + 1; }) + if(!edit) + props.closeModal() }} > Index: frontend/src/Components/Forms/AddRestaurantForm.js =================================================================== --- frontend/src/Components/Forms/AddRestaurantForm.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/Forms/AddRestaurantForm.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -82,7 +82,6 @@ e.preventDefault() createRestaurant(formData, edit); - props.refresh((prevState) => { - return prevState + 1; - }) + props.refresh(Math.random()) + if(!edit) props.closeModal() }} > Index: frontend/src/Components/Forms/AddRoomForm.js =================================================================== --- frontend/src/Components/Forms/AddRoomForm.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/Forms/AddRoomForm.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -13,5 +13,5 @@ hotelRoomDescription: "", hotelRoomName: "", - numBeds: "", + numOfBeds: "", price: "", kitchenAvailable: false, @@ -58,6 +58,6 @@ type="number" placeholder="Внесете го бројот на кревети" - value={formData.numBeds} - name="numBeds" + value={formData.numOfBeds} + name="numOfBeds" onChange={onFormChange} /> @@ -117,7 +117,11 @@ style={{ backgroundColor: "#159895" }} size="md" - onClick={() => { - console.log(formData); + onClick={(e) => { + e.preventDefault(); + props.refresh((prev) => { + return ++prev; + }) createHotelRoom(formData); + props.closeModal(); }} > Index: frontend/src/Components/Forms/AddTableAvailabilityForm.js =================================================================== --- frontend/src/Components/Forms/AddTableAvailabilityForm.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/Forms/AddTableAvailabilityForm.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -62,4 +62,6 @@ onClick={() => { createTableAvailability(formData, props.table.tableId) + props.refresh(Math.random()) + props.close() }} > Index: frontend/src/Components/Forms/AddTransportForm.js =================================================================== --- frontend/src/Components/Forms/AddTransportForm.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/Forms/AddTransportForm.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -11,5 +11,5 @@ transportName: "", carBrand: "", - carType: false, + carType: "", carManufacturedYear: 1900, noPassengers: 0, @@ -107,6 +107,8 @@ createTransport(formData, edit); props.refresh((prev) => { - return prev + 1; + return ++prev; }) + if(!edit) + props.closeModal() }} > Index: frontend/src/Components/Forms/AddTripForm.js =================================================================== --- frontend/src/Components/Forms/AddTripForm.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/Forms/AddTripForm.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -232,4 +232,5 @@ console.log(wayPointNames); for (let i = 0; i < routeCount - 1; i++) { + console.log(wayPoints[i]) wayPointNames.push(wayPoints[i].value); } Index: frontend/src/Components/Forms/EditRoomForm.js =================================================================== --- frontend/src/Components/Forms/EditRoomForm.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/Forms/EditRoomForm.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -28,4 +28,6 @@ } = useGet(`/hotel/rooms/${props.room.hotelRoomId}/available`) + console.log(`/hotel/rooms/${props.room.hotelRoomId}/available`) + !isLoading && console.log(data) @@ -42,13 +44,7 @@ # -<<<<<<< HEAD Oд До Цена -======= - Достапно од - Достапно до - Број на соби ->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) Index: frontend/src/Components/Hooks/Hotel/useCreateHotel.js =================================================================== --- frontend/src/Components/Hooks/Hotel/useCreateHotel.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/Hooks/Hotel/useCreateHotel.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -6,8 +6,8 @@ const useCreateHotel = () => { - //const history = useNavigate(); const createHotel = async (hotel, edit) => { console.log({hotel}) console.log(hotel) + console.log("vo createhotel") if(!edit) @@ -16,5 +16,5 @@ .post(`/hotel/add`, hotel, { params: { - userId: localStorage.getItem("userId") + userId: JSON.parse(localStorage.getItem("user")).userId } }) Index: frontend/src/Components/Hooks/Restaurant/useCreateRestaurant.js =================================================================== --- frontend/src/Components/Hooks/Restaurant/useCreateRestaurant.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/Hooks/Restaurant/useCreateRestaurant.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -15,5 +15,5 @@ .post(`/restaurant/add`, restaurant, { params: { - userId: localStorage.getItem('userId') + userId: JSON.parse(localStorage.getItem('user')).userId, } }) Index: frontend/src/Components/Hooks/Restaurant/useCreateTable.js =================================================================== --- frontend/src/Components/Hooks/Restaurant/useCreateTable.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/Hooks/Restaurant/useCreateTable.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -13,5 +13,5 @@ .then((res) => { console.log(res) - refresh(prev => ++prev) + refresh(Math.random()) //history.push('/restaurant'); }) Index: frontend/src/Components/Hooks/Transport/useCreateTransport.js =================================================================== --- frontend/src/Components/Hooks/Transport/useCreateTransport.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/Hooks/Transport/useCreateTransport.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -4,10 +4,10 @@ const useCreateTransport = () => { - + const userId = JSON.parse(localStorage.getItem('user')).userId const createTransport = async (transport, edit) => { if(!edit) { await axios - .post(`/transport/add`, transport) + .post(`/transport/add/` + userId, transport) .then((res) => { //history.push('/transport'); Index: frontend/src/Components/Hooks/User/useLogin.js =================================================================== --- frontend/src/Components/Hooks/User/useLogin.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/Hooks/User/useLogin.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -4,8 +4,10 @@ import { Navigate, useAsyncValue, useNavigate } from "react-router-dom"; import LoginForm from "../../Login/LoginForm.js"; +import {useAuth} from "../../Context/AuthContext"; const useLogin = () => { const navigator = useNavigate() + const Auth = useAuth(); //const history = useNavigate(); const login = async (loginData) => { @@ -22,7 +24,22 @@ }) .then((res) => { + console.log("RES LOGIN") + console.log(res) + if(res.status === 200) + { + const user = { + sessionId: res.data.auth.details.sessionId, + userId: res.data.auth.principal.userID, + username: res.data.auth.principal.username, + role: res.data.auth.principal.role, + name: res.data.auth.principal.name, + surname: res.data.auth.principal.surname, + } + Auth.userLogin(user); + console.log(user) + } const sessionId = res.data.auth.details.sessionId; const userId = res.data.auth.principal.userID; - + localStorage.setItem("sessionId", sessionId); localStorage.setItem("userId", userId); Index: frontend/src/Components/Hooks/useCreate.js =================================================================== --- frontend/src/Components/Hooks/useCreate.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/Hooks/useCreate.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -16,4 +16,5 @@ //history.push('/hotel'); console.log(res) + console.log("gotovo") getData(prev => ++prev) getData2(prev => ++prev) Index: frontend/src/Components/Hooks/useGet.js =================================================================== --- frontend/src/Components/Hooks/useGet.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/Hooks/useGet.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -11,5 +11,4 @@ console.log(localStorage.getItem("sessionId")) console.log("url od get " + uurl) -<<<<<<< HEAD await axios.get(uurl, {maxRedirects: 0}).then((res) => { console.log(res); @@ -23,12 +22,4 @@ // window.location.href = '/error' }) -======= - await axios. - get(uurl).then((res) => { - setData(res.data); - }).catch((err) => { - console.log(err) - }) ->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) .finally(() => { setIsLoading(false); @@ -40,5 +31,5 @@ getData(url); }, [dep, url, changed]); - + return { data, Index: frontend/src/Components/HotelDetails/RoomRow.js =================================================================== --- frontend/src/Components/HotelDetails/RoomRow.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/HotelDetails/RoomRow.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -8,5 +8,7 @@ const [getData, setData] = useState(0); const room = props.room + console.log("dasdaskjdhaskdjashdkajk") console.log(props.data) + console.log(Array(props.data.find(x => x.hotelRoom.hotelRoomId === room.hotelRoomId))) return ( <> @@ -22,5 +24,5 @@ }}> - {[...Array(props.data.find(x => x.hotelRoom.hotelRoomId === room.hotelRoomId).numberOfBeds).keys()].map(x => { + {[...Array(props.data.filter(x => x.hotelRoom.hotelRoomId === room.hotelRoomId).reduce((sum, x) => x.numberOfBeds)).keys()].map(x => { return ( Index: frontend/src/Components/HotelDetails/RoomsTable.js =================================================================== --- frontend/src/Components/HotelDetails/RoomsTable.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/HotelDetails/RoomsTable.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -7,5 +7,4 @@ const RoomsTable = (props) => { - return ( @@ -21,5 +20,7 @@ - {Array.from(new Set(props.data.map(x => x.hotelRoom))).map((room) => { + {Array.from( + new Set(props.data.map((x) => JSON.stringify(x.hotelRoom))) + ).map((roomString) => JSON.parse(roomString)).map((room) => { return ( <> Index: frontend/src/Components/HotelEdit/HotelEditTab.js =================================================================== --- frontend/src/Components/HotelEdit/HotelEditTab.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/HotelEdit/HotelEditTab.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -1,99 +1,119 @@ import React from "react"; -import { Container, Col, Row, Image, Nav, Tab } from "react-bootstrap"; -import { useState } from "react"; -import { FaTaxi, FaHotel } from "react-icons/fa"; -import { MdOutlineStickyNote2 } from "react-icons/md"; +import {Container, Col, Row, Image, Nav, Tab} from "react-bootstrap"; +import {useState} from "react"; +import {FaTaxi, FaHotel} from "react-icons/fa"; +import {MdOutlineStickyNote2} from "react-icons/md"; import AddNew from "../Resources/AddNew"; -import { BiData } from "react-icons/bi" +import {BiData} from "react-icons/bi" import RoomListing from "./RoomListing"; import HotelEditForm from "./HotelEditForm"; import AddHotelForm from "../Forms/AddHotelForm"; import EditModal from "../Resources/EditModal"; +import AddAvailability from "../Resources/AddAvailability"; +import useGet from "../Hooks/useGet"; +import ReservationListing from "./ReservationListing"; function HotelEditTab(props) { - const [activeTab, setActiveTab] = useState("/hotel"); - const [modalData, setModalData] = useState(""); - const [show, setShow] = useState(false); + const [activeTab, setActiveTab] = useState("/hotel"); + const [modalData, setModalData] = useState(""); + const [show, setShow] = useState(false); - const handleClose = () => setShow(false); - const handleShow = () => { - //e.preventDefault(); - setShow(true); + console.log(props) - }; + const { + data, + isLoading, + setData, + getData, + setChanged + } = useGet(`/hotel/${props.displayRoom.hotelId}/reservations/active`) - const showModal = (modalData) => { - setModalData(modalData); - handleShow(); - } - console.log(props.displayRoom) + !isLoading && console.log(data) - const handleSelect = (eventKey) => { - setActiveTab(eventKey); - }; + const handleClose = () => setShow(false); + const handleShow = () => { + //e.preventDefault(); + setShow(true); - return ( - - - - - - {props.displayRoom.hotelRooms.map((room) => { - return - })} - - - - - - - - - - - - - ); + + + {props.displayRoom.hotelRooms.map((room) => { + return + })} + + + + + {!isLoading && data.map((res) => { + return ( + + ) + })} + {/**/} + + + + + + + + ); } Index: frontend/src/Components/HotelEdit/ReservationListing.js =================================================================== --- frontend/src/Components/HotelEdit/ReservationListing.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/HotelEdit/ReservationListing.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -3,4 +3,17 @@ const ReservationListing = (props) => { + + const dateFormatter = (str) => { + const inputDate = new Date(str); + + const options = { + year: '2-digit', + month: '2-digit', + day: '2-digit', + }; + + return inputDate.toLocaleString('de-DE', options); + } + return( <> @@ -15,10 +28,14 @@

Резервација за:

-

{props.data.hotelRoom.hotelRoomName}

+ {props.type === 'hotel' &&

{props.data.hotelRoom.hotelRoomName}

} + {props.type === 'restaurant' &&

{'Маса за ' + props.data.restaurantsTable.noSeats}

} + {props.type === 'transport' &&

{props.data.transportRoute.from + ' ' + props.data.transportRoute.to}

} + {props.type === 'transport' &&

{props.data.noSeats + ' ' + 'патници'}

}

{props.data.user.name + ' ' + props.data.user.surname}

-
{props.data.dateFrom + ' - ' + props.data.dateTo}
+ {props.type !== 'transport' &&
{dateFormatter(props.data.dateFrom) + ' - ' + dateFormatter(props.data.dateTo)}
} -

Вкупна цена:

{props.data.hotelRoom.price}$

+ {props.type === 'hotel' &&

Вкупна цена:

{props.data.hotelRoom.price}$

} Index: frontend/src/Components/Layout/Navbar/Navigation.js =================================================================== --- frontend/src/Components/Layout/Navbar/Navigation.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/Layout/Navbar/Navigation.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -7,9 +7,6 @@ import useGet from "../../Hooks/useGet"; import axios from "../../../axios.js"; -<<<<<<< HEAD import {useAuth} from "../../Context/AuthContext"; import ImageUpload from "../../ImageUpload/ImageUpload"; -======= ->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) //import logo from 'assets/images/logo.png'; //src="https://upload.wikimedia.org/wikipedia/commons/0/08/Vergina_Sun_-_Golden_Larnax.png" @@ -17,5 +14,4 @@ function Navigation(props) { const navigator = useNavigate(); -<<<<<<< HEAD const Auth = useAuth(); const isLoggedIn = Auth.userIsAuthenticated(); @@ -26,9 +22,4 @@ const handleShow = () => setShow(true); -======= - - const { data, setData, isLoading, getData } = useGet("/username"); - ->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) return ( <> @@ -40,5 +31,5 @@ > - + - {!isLoading && !data && ( + {!isLoggedIn && ( - - - - - - - ); -}; ->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) -export default SearchCriterias; +export default SearchCriteriasBar; Index: frontend/src/Components/Tab/TabFormHotel.js =================================================================== --- frontend/src/Components/Tab/TabFormHotel.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/Tab/TabFormHotel.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -1,91 +1,102 @@ import React from "react"; -import { Button, Col, Container, Form, Row } from "react-bootstrap"; -import { FaMagnet } from "react-icons/fa" -import { HiMagnifyingGlass } from "react-icons/hi2" +import {Button, Col, Container, Form, InputGroup, Row} from "react-bootstrap"; +import {FaMagnet} from "react-icons/fa" +import {HiMagnifyingGlass} from "react-icons/hi2" import useFormData from "../Hooks/useFormData"; function TabFormHotel() { - const { formData, onFormChange, setFormData } = useFormData({ - hotelLocation: undefined, - dateFrom: undefined, - dateTo: undefined, - numBeds: undefined - }) + const {formData, onFormChange, setFormData, onCheckBoxChange} = useFormData({ + hotelLocation: undefined, + dateFrom: undefined, + dateTo: undefined, + numBeds: undefined, + flexible: false, + }) - return ( -
- - - - - - - - - - - - - - - - - - - - - - - - + return ( + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + - - - - + + + + - - - ); +
+ + ); } Index: frontend/src/Components/Tab/TabFormTransport.js =================================================================== --- frontend/src/Components/Tab/TabFormTransport.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/Tab/TabFormTransport.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -2,6 +2,15 @@ import { Button, Col, Container, Form, Row } from "react-bootstrap"; import { HiMagnifyingGlass } from "react-icons/hi2" +import useFormData from "../Hooks/useFormData"; function TabFormTransport() { + + const { formData, onFormChange, setFormData } = useFormData({ + from: undefined, + to: undefined, + date: undefined, + numPassengers: 0 + }) + return (
@@ -14,4 +23,7 @@ placeholder="Од:" id="floatingFrom" + value={formData.from} + name={'from'} + onChange={onFormChange} > @@ -25,4 +37,7 @@ placeholder="До:" id="floatingTo" + name={'to'} + value={formData.to} + onChange={onFormChange} > @@ -36,4 +51,7 @@ placeholder="Датум:" id="floatingDate" + name={'date'} + value={formData.date} + onChange={onFormChange} > @@ -46,10 +64,16 @@ type="number" placeholder="Број на патници:" + name={'numPassengers'} id="floatingPassengers" + value={formData.numPassengers} + onChange={onFormChange} > - + Index: frontend/src/Components/UserPanel/PastHotelReservations.js =================================================================== --- frontend/src/Components/UserPanel/PastHotelReservations.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/UserPanel/PastHotelReservations.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -10,5 +10,5 @@ <> {!isLoading && data.map((res) => { - return () + return () })} {(!isLoading && data.length === 0) &&

Нема податоци за одбраните критериуми!

} Index: frontend/src/Components/UserPanel/PastRestaurantReservations.js =================================================================== --- frontend/src/Components/UserPanel/PastRestaurantReservations.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/UserPanel/PastRestaurantReservations.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -11,5 +11,6 @@ <> {!isLoading && data.map((res) => { - return () + console.log(res) + return () })} {(!isLoading && data.length === 0) &&

Нема податоци за одбраните критериуми!

} Index: frontend/src/Components/UserPanel/PastTransportReservations.js =================================================================== --- frontend/src/Components/UserPanel/PastTransportReservations.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/UserPanel/PastTransportReservations.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -10,5 +10,5 @@ <> {!isLoading && data.map((res) => { - return () + return () })} Index: frontend/src/Components/UserPanel/ReviewModal.js =================================================================== --- frontend/src/Components/UserPanel/ReviewModal.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/UserPanel/ReviewModal.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -10,4 +10,5 @@ description: "", } + console.log(props) const {createEntity} = useCreate(); @@ -80,16 +81,19 @@ ...formData, hotelId: props.data.hotelId, - userId: 1 + userId: 1, + reservationId: props.data.reservationId } : props.type === 'restaurant' ? { - ...formData, - restaurantId: props.data.restaurantId, - userId: 1 - } : { + ...formData, + restaurantId: props.data.restaurantId, + userId: 1, + reservationId: props.data.reservationId + } : { ...formData, transportId: props.data.transportId, - userId: 1 + userId: 1, + reservationId: props.data.reservationId } - createEntity('/review/add', dataToPost) + createEntity('/review/add', dataToPost, props.setChanged) setFormData(dummy) props.handleCloseReview() Index: frontend/src/Components/useFormNested.js =================================================================== --- frontend/src/Components/useFormNested.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Components/useFormNested.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -7,5 +7,5 @@ console.log(e) - const dependantRoutes = e.target.parentElement.getAttribute('dependantRoutes').split(',') + const dependantRoutes = e.target.name === 'freeSpace' ? e.target.parentElement.getAttribute('dependantRoutes').split(',') : undefined; console.log(dependantRoutes) Index: frontend/src/Pages/HotelDetailsPage.js =================================================================== --- frontend/src/Pages/HotelDetailsPage.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Pages/HotelDetailsPage.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -1,9 +1,5 @@ import React from "react"; import LoginForm from "../Components/Login/LoginForm"; -<<<<<<< HEAD import {Container, Row, Col, Form, FloatingLabel, Modal, Button} from "react-bootstrap"; -======= -import { Container, Row, Col, Form } from "react-bootstrap"; ->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) import Navigation from "../Components/Layout/Navbar/Navigation"; import Carousel from "react-bootstrap/Carousel"; @@ -73,6 +69,7 @@ placeholder="Каде ќе патувате?:" id="location" + value={data.hotelLocation} > - + @@ -84,6 +81,7 @@ placeholder="Датум на пристигнување:" id="dateFrom" + value={from} > - + @@ -95,6 +93,7 @@ placeholder="Датум на заминување:" id="dateTo" + value={to} > - + @@ -107,5 +106,5 @@ id="floatingPassengers" > - + @@ -117,6 +116,4 @@ {data.images.map((image) => { let link = image.url; - console.log("SLIKATAAA") - console.log(image) if (image.url.includes('Desktop')) { link = 'http://localhost:8080/download?fileName=' + encodeURIComponent(image.url); Index: frontend/src/Pages/HotelEditPage.js =================================================================== --- frontend/src/Pages/HotelEditPage.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Pages/HotelEditPage.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -1,59 +1,60 @@ -import React, { useState } from "react"; -import { Container, Col, Row, Image } from "react-bootstrap"; +import React, {useState} from "react"; +import {Container, Col, Row, Image} from "react-bootstrap"; import Navigation from "../Components/Layout/Navbar/Navigation"; import ResourcesTab from "../Components/Resources/ResourcesTab"; import HotelEditTab from "../Components/HotelEdit/HotelEditTab"; import useGet from "../Components/Hooks/useGet"; -import { useParams } from "react-router-dom"; +import {Navigate, useParams} from "react-router-dom"; +import {useAuth} from "../Components/Context/AuthContext"; const HotelEditPage = () => { - const params = useParams(); - const link = "/hotel/list/" + params.hotelId; - const [changed, setChanged] = useState(0) - const { data, setData, isLoading, getData } = useGet(link, changed); + const params = useParams(); + const link = `/hotel/${params.hotelId}/list`; + const [changed, setChanged] = useState(0) + const {data, setData, isLoading, getData} = useGet(link, changed); - console.log(data) - return ( - <> - - {!isLoading && - -

Мои ресурси

- - - - - - - - - -

{data.hotelName}

-
{data.hotelLocation}
- - - - - - - - - } - - ); + console.log(data) + return ( + <> + + {!isLoading && + +

Мои ресурси

+ + + + + + + + + +

{data.hotelName}

+
{data.hotelLocation}
+ + + + + + + + + } + + ); }; Index: frontend/src/Pages/LoginErrorPage.js =================================================================== --- frontend/src/Pages/LoginErrorPage.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Pages/LoginErrorPage.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -11,5 +11,4 @@ const [show, setShow] = useState(false); const [changed, setChanged] = useState(0); - const {data, isLoading} = useGet("/username") const userId = localStorage.getItem("userId") const [registered, setRegistered] = useState(false); Index: frontend/src/Pages/LoginPage.js =================================================================== --- frontend/src/Pages/LoginPage.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Pages/LoginPage.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -3,4 +3,7 @@ import { Container } from "react-bootstrap"; import Navigation from "../Components/Layout/Navbar/Navigation"; +import {useAuth} from "../Components/Context/AuthContext"; +import {Navigate} from "react-router-dom"; + const LoginPage = () => { @@ -8,4 +11,12 @@ document.body.style.marginTop = "auto"; document.body.style.marginBottom = "auto"; + + const Auth = useAuth(); + const isLoggedIn = Auth.userIsAuthenticated(); + + if (isLoggedIn) { + return + } + return ( <> Index: frontend/src/Pages/NoBusinessRegisteredError.js =================================================================== --- frontend/src/Pages/NoBusinessRegisteredError.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Pages/NoBusinessRegisteredError.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -6,10 +6,12 @@ import RegisterBusinessForm from "../Components/Forms/RegisterBusinessForm"; import useGet from "../Components/Hooks/useGet"; -import { useNavigate } from "react-router-dom"; +import {Navigate, useNavigate} from "react-router-dom"; +import {useAuth} from "../Components/Context/AuthContext"; const NoBusinessRegisteredError = (props) => { const [show, setShow] = useState(false); const [changed, setChanged] = useState(0); - const {data, isLoading} = useGet("/username") + const Auth = useAuth(); + const isLoggedIn = Auth.userIsAuthenticated(); const userId = localStorage.getItem("userId") const [registered, setRegistered] = useState(false); @@ -45,7 +47,9 @@ - console.log(data) + if(!isLoggedIn) + { + return + } - !isLoading && !data && navigator("/login") !firmaIsLoading && firma && firma.length > 0 && firma[0].approved && navigator("/resources/hotel") Index: frontend/src/Pages/ProfilePage.js =================================================================== --- frontend/src/Pages/ProfilePage.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Pages/ProfilePage.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -8,10 +8,13 @@ import ChangePasswordForm from "../Components/Forms/ChangePasswordForm"; import useGet from "../Components/Hooks/useGet"; +import {useAuth} from "../Components/Context/AuthContext"; +import {Navigate} from "react-router-dom"; const ProfilePage = () => { - const { data, setData, isLoading, getData } = useGet("/principal"); + const { data, setData, isLoading, getData } = useGet("/principal"); - + + const profileData = { "name": "Марко", @@ -19,5 +22,5 @@ "address": "ул. Раскрсница бр. 10", "dateOfBirth": "2002-01-01", - "country": "Никогаш Северна само МАКЕДОНИЈА", + "country": "Македонија", "zip": "1000", "city": "Скопје", @@ -27,8 +30,9 @@ + return ( <> -{ !isLoading && + {!isLoading &&

Мојот профил

Index: frontend/src/Pages/ResourcesPage.js =================================================================== --- frontend/src/Pages/ResourcesPage.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Pages/ResourcesPage.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -1,54 +1,55 @@ import React from "react"; -import { Container, Col, Row, Image } from "react-bootstrap"; +import {Container, Col, Row, Image} from "react-bootstrap"; import Navigation from "../Components/Layout/Navbar/Navigation"; import ResourcesTab from "../Components/Resources/ResourcesTab"; -import { useState } from "react"; +import {useState} from "react"; import useGet from "../Components/Hooks/useGet"; +import {useAuth} from "../Components/Context/AuthContext"; +import {Navigate} from "react-router-dom"; const ResourcesPage = (props) => { - console.log(props.tab) - const { data, setData, isLoading, getData } = useGet("/principal"); + const Auth = useAuth(); + const user = Auth.getUser(); - - return ( - <> - -{!isLoading && - -

Мои ресурси

- - - - - - - - - -

{data.name + " " + data.surname}

-
{data.email}
- - - - - - - - - } - - ); + return ( + <> + + { + +

Мои ресурси

+ + + + + + + + + +

{user.name + " " + user.surname}

+
{user.username}
+ + + + + + + + + } + + ); }; Index: frontend/src/Pages/RestaurantDetailsPage.js =================================================================== --- frontend/src/Pages/RestaurantDetailsPage.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Pages/RestaurantDetailsPage.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -133,5 +133,21 @@ - + {data.images.map((image) => { + let link = image.url; + if (image.url.includes('Desktop')) { + link = 'http://localhost:8080/download?fileName=' + encodeURIComponent(image.url); + } + return ( + + First slide + + ) + })} + {data.images.length == 0 && - - - Second slide - - - Third slide - + } @@ -169,5 +169,5 @@ - + Index: frontend/src/Pages/RestaurantEditPage.js =================================================================== --- frontend/src/Pages/RestaurantEditPage.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Pages/RestaurantEditPage.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -6,5 +6,6 @@ import RestaurantEditTab from "../Components/RestaurantEdit/RestaurantEditTab"; import useGet from "../Components/Hooks/useGet"; -import { useParams, useSearchParams } from "react-router-dom"; +import {Navigate, useParams, useSearchParams} from "react-router-dom"; +import {useAuth} from "../Components/Context/AuthContext"; const RestaurantEditPage = () => { Index: frontend/src/Pages/SearchPage.js =================================================================== --- frontend/src/Pages/SearchPage.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Pages/SearchPage.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -1,8 +1,8 @@ -import React from "react"; +import React, {useState} from "react"; import Navigation from '../Components/Layout/Navbar/Navigation'; import 'bootstrap/dist/css/bootstrap.css'; import 'bootstrap/dist/js/bootstrap.js'; import HomeCarousel from '../Components/Layout/CarouselHome/Carousel'; -import { Card, Container, Nav, Row, Col } from 'react-bootstrap'; +import {Card, Container, Nav, Row, Col} from 'react-bootstrap'; import TabComponent from '../Components/Tab/Tab'; import Offers from '../Components/Layout/Offers/Offers'; @@ -11,16 +11,13 @@ import BecomeAHost from "../Components/BecomeAHost/BecomeAHost" import HotelLisitng from "../Components/Listings/HotelListing" -import SearchCriterias from "../Components/SearchCriterias/SearchCriteriasBar"; +import SearchCriteriasHotel from "../Components/SearchCriterias/SearchCriteriasHotel"; import SortButton from "../Components/Listings/SortButton"; import FilterButton from "../Components/Listings/FilterButton"; import TransportListing from "../Components/Listings/TransportListing"; import useGet from "../Components/Hooks/useGet"; -import { useParams } from "react-router-dom"; -<<<<<<< HEAD +import {useParams} from "react-router-dom"; import SearchCriteriasBar from "../Components/SearchCriterias/SearchCriteriasBar"; import RestaurantDetailsPage from "./RestaurantDetailsPage"; import RestaurantListing from "../Components/Listings/RestaurantListing"; -======= ->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) @@ -29,5 +26,5 @@ const params = useParams(); console.log(params) - + const [sortingArg, setSortingArg] = useState("") document.body.style.backgroundColor = "white" @@ -41,18 +38,73 @@ } - -<<<<<<< HEAD - let link = props.type === "transport" ? `/transport/search?from=${params.from}&to=${params.to}&date=${params.date}&numPassengers=${params.numPassengers}` : props.type === "hotel" ? `/hotel/search?hotelLocation=${params.hotelLocation}&dateFrom=${params.dateFrom}&dateTo=${params.dateTo}&numBeds=${params.numBeds}` : `/restaurant/search?restaurantLocation=${params.restaurantLocation}&date=${params.date}&hourFrom=${params.hourFrom}&hourTo=${params.hourTo}&numPeople=${params.numPeople}` -======= - let link = props.type === "transport" ? `/transport/search?from=${params.from}&to=${params.to}&date=${params.date}` : props.type === "hotel" ? `/hotel/search?hotelLocation=${params.hotelLocation}&dateFrom=${params.dateFrom}&dateTo=${params.dateTo}&numBeds=${params.numBeds}` : "" ->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) + + const getSortingFn = (type, arg) => { + if (type === 'hotel') { + if (arg === "priceAsc") + { + return (a, b) => { + return a.totalPrice - b.totalPrice; + } + } + else if (arg === "priceDesc") + { + return (a, b) => { + return -(a.totalPrice - b.totalPrice); + } + } + else if (arg === 'nameAsc') + { + return (a, b) => { + return a.hotelName.localeCompare(b.hotelName); + } + } + else if(arg === 'nameDesc') + { + return (a, b) => { + return -a.hotelName.localeCompare(b.hotelName); + } + } + } + else if (type === 'transport') + { + if (arg === "priceAsc") + { + return (a, b) => { + return a.price - b.price; + } + } + else if (arg === "priceDesc") + { + return (a, b) => { + return -(a.price - b.price); + } + } + } + else if (type === 'restaurant') + { + if (arg === 'nameAsc') + { + return (a, b) => { + return a.restaurantName.localeCompare(b.restaurantName); + } + } + else if(arg === 'nameDesc') + { + return (a, b) => { + return -a.restaurantName.localeCompare(b.restaurantName); + } + } + } + } + + let link = props.type === "transport" ? `/transport/search?from=${params.from}&to=${params.to}&date=${params.date}&numPassengers=${params.numPassengers}` : props.type === "hotel" ? `/hotel/search?hotelLocation=${params.hotelLocation}&dateFrom=${params.dateFrom}&dateTo=${params.dateTo}&numBeds=${params.numBeds}&flexible=${params.flexible}` : `/restaurant/search?restaurantLocation=${params.restaurantLocation}&date=${params.date}&hourFrom=${params.hourFrom}&hourTo=${params.hourTo}&numPeople=${params.numPeople}` console.log(link) console.log(params.date) - const { data, isLoading, getData, setData } = useGet(link); + const {data, isLoading, getData, setData} = useGet(link); !isLoading && console.log(data) return ( <> - + @@ -61,20 +113,20 @@ - + {props.type === "hotel" && !isLoading && data && - {data.map(hotel => { + {data.sort(getSortingFn(props.type, sortingArg)).map(hotel => { return })} - } + } {props.type === "transport" && !isLoading && data && - {data.map(transport => { + {data.sort(getSortingFn(props.type, sortingArg)).map(transport => { return })} } {props.type === "restaurant" && !isLoading && data && - {data.map(restaurant => { + {data.sort(getSortingFn(props.type, sortingArg)).map(restaurant => { return })} Index: frontend/src/Pages/TransportEditPage.js =================================================================== --- frontend/src/Pages/TransportEditPage.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/Pages/TransportEditPage.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -1,4 +1,4 @@ -import React, { useState } from "react"; -import { Container, Col, Row, Image } from "react-bootstrap"; +import React, {useState} from "react"; +import {Container, Col, Row, Image} from "react-bootstrap"; import Navigation from "../Components/Layout/Navbar/Navigation"; import ResourcesTab from "../Components/Resources/ResourcesTab"; @@ -7,56 +7,58 @@ import TransportEditTab from "../Components/TransportEdit/TransportEditTab"; import useGet from "../Components/Hooks/useGet"; -import { useParams } from "react-router-dom"; +import {Navigate, useParams} from "react-router-dom"; +import {useAuth} from "../Components/Context/AuthContext"; const TransportEditPage = () => { - const params = useParams(); - console.log("transportot ima id " + params.transportId); - const link = "/transport/" + params.transportId; - const [changed, setChanged] = useState(0); - const { data, setData, isLoading, getData } = useGet(link, changed); - !isLoading && console.log(data) + const params = useParams(); - return ( - <> - - {!isLoading && ( - - -

Мои ресурси

- - - - - - - - - -

{data.transportName}

-
{data.carBrand + " " + data.carType}
- - - - - - - {data && } - - - )} - - ); + const link = "/transport/" + params.transportId; + + const {data, setData, isLoading, getData, setChanged} = useGet(link); + + !isLoading && console.log(data) + + return ( + <> + + {!isLoading && ( + + +

Мои ресурси

+ + + + + + + + + +

{data.transportName}

+
{data.carBrand + " " + data.carType}
+ + + + + + + {data && } + + + )} + + ); }; Index: frontend/src/axios.js =================================================================== --- frontend/src/axios.js (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ frontend/src/axios.js (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -1,21 +1,16 @@ import axios from "axios"; + const instance = axios.create({ baseURL: "http://localhost:8080/", withCredentials: true, - maxRedirects: 1 + maxRedirects: 1, + beforeRedirect: (options, { headers }) => { + console.log(options) + if (options.hostname === "example.com") { + options.auth = "user:password"; + }} + }) -instance.interceptors.response.use(function (response) { - // Any status code that lie within the range of 2xx cause this function to trigger - // Do something with response data - return response; - }, function (error) { - console.log(error) - // window.location.href="/login" - // Any status codes that falls outside the range of 2xx cause this function to trigger - // Do something with response error - return Promise.reject(error); - }); - export default instance Index: src/main/java/com/tourMate/config/SecurityConfig.java =================================================================== --- src/main/java/com/tourMate/config/SecurityConfig.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/config/SecurityConfig.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -5,6 +5,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; @@ -13,5 +13,5 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; -import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.security.web.authentication.logout.HttpStatusReturningLogoutSuccessHandler; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.web.cors.CorsConfiguration; @@ -21,9 +21,13 @@ import java.util.Arrays; -import static org.springframework.security.config.Customizer.withDefaults; - @Configuration @EnableWebSecurity public class SecurityConfig { + + private final UserSecurity userSecurity; + + public SecurityConfig(UserSecurity userSecurity) { + this.userSecurity = userSecurity; + } @Bean @@ -64,6 +68,6 @@ try { authz - .requestMatchers(new AntPathRequestMatcher("/1/hasBusiness")).permitAll() - .requestMatchers(new AntPathRequestMatcher("/business/1/unapproved")).permitAll() + .requestMatchers(new AntPathRequestMatcher("/{userId}/hasBusiness")).access(userSecurity) + .requestMatchers(new AntPathRequestMatcher("/business/*/unapproved")).permitAll() .requestMatchers(new AntPathRequestMatcher("/register")).permitAll() .requestMatchers(new AntPathRequestMatcher("/hotel/search")).permitAll() @@ -71,11 +75,15 @@ .requestMatchers(new AntPathRequestMatcher("/restaurant/search")).permitAll() .requestMatchers(new AntPathRequestMatcher("/upload")).permitAll() - .requestMatchers(new AntPathRequestMatcher("/business/*")).hasAnyAuthority("SUPERADMIN") - .anyRequest().authenticated() + .requestMatchers(new AntPathRequestMatcher("/business/approve/*")).hasAnyAuthority("SUPERADMIN") + .requestMatchers(new AntPathRequestMatcher("/business/add/*")).authenticated() + .requestMatchers(new AntPathRequestMatcher("/*/user/{userId}")).access(userSecurity) + .anyRequest().permitAll() +// .anyRequest().authenticated() .and() - .formLogin().loginPage("http://localhost:3000/login") + .formLogin() .loginProcessingUrl("/api/login").usernameParameter("username").passwordParameter("password") .successHandler((request, response, authentication) -> { response.setStatus(HttpServletResponse.SC_OK); + response.setCharacterEncoding("UTF-8"); response.setContentType("application/json"); response.getWriter().print("{\"message\": \"Login successful\","); @@ -85,5 +93,6 @@ .failureHandler((request, response, exception) -> { response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); - response.getWriter().print("Pukla veza\n" + exception.getMessage()); + response.sendRedirect("/login"); + response.getWriter().print("Neuspesna najava\n" + exception.getMessage()); response.getWriter().flush(); }) @@ -93,5 +102,5 @@ .sessionCreationPolicy(SessionCreationPolicy.ALWAYS) .and() - .logout() + .logout().logoutSuccessHandler((new HttpStatusReturningLogoutSuccessHandler(HttpStatus.OK))) .permitAll(); Index: src/main/java/com/tourMate/config/UserSecurity.java =================================================================== --- src/main/java/com/tourMate/config/UserSecurity.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) +++ src/main/java/com/tourMate/config/UserSecurity.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -0,0 +1,33 @@ +package com.tourMate.config; + +import com.tourMate.entities.Hotels; +import com.tourMate.entities.User; +import com.tourMate.services.HotelManager; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authorization.AuthorizationDecision; +import org.springframework.security.authorization.AuthorizationManager; +import org.springframework.security.core.Authentication; +import org.springframework.security.web.access.intercept.RequestAuthorizationContext; +import org.springframework.stereotype.Component; + +import java.util.function.Supplier; + +@Component +public class UserSecurity implements AuthorizationManager { + + @Override + public AuthorizationDecision check(Supplier authenticationSupplier, RequestAuthorizationContext ctx) { + Long userId = Long.parseLong(ctx.getVariables().get("userId")); + Authentication authentication = (Authentication) authenticationSupplier.get(); + return new AuthorizationDecision(hasUserId(authentication, userId)); + } + + public boolean hasUserId(Authentication authentication, Long userId) { + System.out.println(userId); + User user = (User) authentication.getPrincipal(); + System.out.println(user.getUserID()); + System.out.println(authentication.getPrincipal()); + return userId == user.getUserID(); + } + +} Index: src/main/java/com/tourMate/controllers/HotelController.java =================================================================== --- src/main/java/com/tourMate/controllers/HotelController.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/controllers/HotelController.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -2,4 +2,6 @@ import com.tourMate.dto.HotelDto; +import com.tourMate.dto.HotelReservationDto; +import com.tourMate.dto.HotelReservationUserDto; import com.tourMate.entities.*; import com.tourMate.services.HotelManager; @@ -50,5 +52,5 @@ } - @GetMapping(path = "/hotel/list/{id}") + @GetMapping(path = "/hotel/{id}/list") public ResponseEntity getHotelById (@PathVariable(name = "id") long hotelId) { @@ -104,7 +106,8 @@ //HOTEL ROOM CRUD @PostMapping(path = "/hotel/rooms/add") - public void addRoom(@RequestBody HotelRoom room, @RequestParam(name = "hotelId") long hotelId) { + public void addRoom(@RequestBody HotelRoom room, + @RequestParam(name = "hotelId") long hotelId) { Hotels h = hotelManager.findHotelByID(hotelId); - hotelManager.createRoom(h, room.getHotelRoomDescription(), room.getHotelRoomName(), room.getKitchenAvailable(), room.getAirConditioning(), room.getBalcony(), room.getPrice()); + hotelManager.createRoom(h, room.getHotelRoomDescription(), room.getHotelRoomName(), room.getKitchenAvailable(), room.getAirConditioning(), room.getBalcony(), room.getPrice(), room.getNumOfBeds()); } @@ -149,5 +152,6 @@ //HOTEL AVAILABILITY CRUD @PostMapping(path = "/hotel/rooms/available/{id}/add") - public void addRoomAvailible(@RequestBody HotelRoomAvailable hotelRoomAvailable, @PathVariable long id) + public void addRoomAvailible(@RequestBody HotelRoomAvailable hotelRoomAvailable, + @PathVariable long id) { HotelRoom hotelRoom = hotelManager.findRoomById(id); @@ -178,14 +182,17 @@ public List getRoomAvailability(@PathVariable Long id) { - return hotelManager.getRoomsAvailibility(); + return hotelManager.getRoomsAvailableById(id); } @GetMapping(path = "/hotel/search") - public List searchAvailibleRooms(@RequestParam(name = "hotelLocation") String hotelLocation, @RequestParam(name = "dateFrom") @DateTimeFormat(pattern = "yyyy-MM-dd") Date dateFrom, - @RequestParam(name = "dateTo") @DateTimeFormat(pattern = "yyyy-MM-dd") Date dateTo, @RequestParam(name = "numBeds") int numBeds) - { - System.out.println(hotelLocation); + public List searchAvailibleRooms(@RequestParam(name = "hotelLocation") String hotelLocation, + @RequestParam(name = "dateFrom") @DateTimeFormat(pattern = "yyyy-MM-dd") Date dateFrom, + @RequestParam(name = "dateTo") @DateTimeFormat(pattern = "yyyy-MM-dd") Date dateTo, + @RequestParam(name = "numBeds") int numBeds, + @RequestParam(name = "flexible") Boolean flexible) + { + System.out.println(flexible); System.out.println(dateFrom + " " + dateTo); - return hotelManager.getRoomsAvailibilityByDateAndLocation(hotelLocation, dateFrom, dateTo, numBeds); + return hotelManager.getRoomsAvailibilityByDateAndLocation(hotelLocation, dateFrom, dateTo, numBeds, flexible); } @@ -203,5 +210,4 @@ } -<<<<<<< HEAD @GetMapping(path = "/hotel/{id}/reservations/active") public List getActiveReservationsForHotel(@PathVariable Long id) @@ -233,5 +239,9 @@ return hotelManager.getRoomImages(id); } -======= ->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) + + @PostMapping("/hotel/{id}/cancel") + public void cancelHotelReservation(@PathVariable Long id){ + hotelManager.deleteReservation(id); + } + } Index: c/main/java/com/tourMate/controllers/ImagesController.java =================================================================== --- src/main/java/com/tourMate/controllers/ImagesController.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ (revision ) @@ -1,54 +1,0 @@ -package com.tourMate.controllers; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.core.io.InputStreamResource; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.nio.file.Path; -import java.nio.file.Paths; - -@CrossOrigin("*") -@RestController -@RequestMapping("/images") -class ImageController { - - private static final Logger logger = LoggerFactory.getLogger(ImageController.class); - - @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public ResponseEntity uploadFile(@RequestParam MultipartFile file, @RequestParam String type) { - - try - { - Path desktopPath = Paths.get(System.getProperty("user.home"), "Desktop\\images_tm"); - Path filePath = desktopPath.resolve(file.getOriginalFilename()); - System.out.println(filePath); - file.transferTo(filePath.toFile()); - } catch (IOException e) { - throw new RuntimeException(e); - } - - logger.info(String.format("File name '%s' uploaded successfully.", file.getOriginalFilename())); - return ResponseEntity.ok().build(); - } - - @GetMapping("/download") - public ResponseEntity downloadFile1(@RequestParam String fileName) throws IOException { - - File file = new File(fileName); - InputStreamResource resource = new InputStreamResource(new FileInputStream(file)); - - return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + file.getName()) - .contentType(MediaType.APPLICATION_OCTET_STREAM) - .contentLength(file.length()) - .body(resource); - } -} Index: src/main/java/com/tourMate/controllers/RestaurantController.java =================================================================== --- src/main/java/com/tourMate/controllers/RestaurantController.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/controllers/RestaurantController.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -1,5 +1,7 @@ package com.tourMate.controllers; +import com.tourMate.dto.HotelReservationDto; import com.tourMate.dto.RestaurantDto; +import com.tourMate.dto.RestaurantReservationDto; import com.tourMate.dto.RestaurantReservationUserDto; import com.tourMate.entities.*; @@ -34,4 +36,9 @@ } + @PostMapping("/restaurant/{id}/cancel") + public void removeRestaurant(@PathVariable Long id){ + restaurantManager.deleteReservation(id); + } + @GetMapping(path = "/restaurant") public List showRestaurants() { @@ -42,5 +49,5 @@ public List showRestaurantsForUser(@PathVariable(name = "id") long userId) { - return restaurantManager.getRestaurants(); + return restaurantManager.getRestaurantsByUser(userId); } @@ -133,5 +140,5 @@ @PathVariable Long id) { System.out.println(restaurantsAvailible.getHourFrom() + " " + restaurantsAvailible.getHourTo()); - restaurantManager.createTableAvailable(id, restaurantsAvailible.getHourFrom(), restaurantsAvailible.getHourTo()); + restaurantManager.createTableAvailable(id, restaurantsAvailible.getHourFrom(), restaurantsAvailible.getHourTo(), restaurantsAvailible.getNumTables()); } @@ -170,4 +177,16 @@ return restaurantManager.getRestaurantImages(id); } + + @GetMapping(path = "/menu/{id}/images") + public List getImagesForMenu(@PathVariable Long id) + { + return restaurantManager.getMenuImages(id); + } + + @GetMapping(path = "/restaurant/{id}/reservations/active") + public List getActiveReservationsForHotel(@PathVariable Long id) + { + return restaurantManager.findReservationByRestaurant(id); + } } Index: src/main/java/com/tourMate/controllers/ReviewController.java =================================================================== --- src/main/java/com/tourMate/controllers/ReviewController.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/controllers/ReviewController.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -20,6 +20,7 @@ @RequestParam(name = "hotelId", required = false) Long hotelId, @RequestParam(name = "restaurantId", required = false) Long restaurantId, - @RequestParam(name = "transportId", required = false) Long transportId ) { - reviewManager.createReview(title, numStars, description, hotelId, restaurantId, transportId); + @RequestParam(name = "transportId", required = false) Long transportId, + @RequestParam(name = "reservationId") Long reservationId) { + reviewManager.createReview(title, numStars, description, hotelId, restaurantId, transportId, reservationId); } Index: src/main/java/com/tourMate/controllers/TransportController.java =================================================================== --- src/main/java/com/tourMate/controllers/TransportController.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/controllers/TransportController.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -20,7 +20,8 @@ // TRANSPORT CRUD // - @PostMapping(path = "/transport/add") - public void add(@RequestBody Transport transport) { - transportManager.createTransport(transport.getTransportName(), transport.getCarBrand(), transport.getCarType(), transport.getCarManufacturedYear(), transport.getNoPassengers(), transport.getNoBags(), transport.getEMBG(), new User(), transport.getCarPlate()); + @PostMapping(path = "/transport/add/{userId}") + public void add(@RequestBody Transport transport, + @PathVariable Long userId) { + transportManager.createTransport(transport.getTransportName(), transport.getCarBrand(), transport.getCarType(), transport.getCarManufacturedYear(), transport.getNoPassengers(), transport.getNoBags(), transport.getEMBG(), userId, transport.getCarPlate()); } @@ -45,5 +46,4 @@ public TransportDto getTransport(@PathVariable(name = "id") long transportId) { - System.out.println("TUKA SUUUUUM"); return transportManager.findTransportById(transportId); } @@ -84,6 +84,4 @@ @PostMapping(path = "/transport/available/add") public void add(@RequestBody TransportAvailible transportAvailable, @RequestParam(name = "transportId") long transportId) { - System.out.println("OREEEEEL"); - System.out.println("DVA ORLA"); Transport t = transportManager.getTransportById(transportId); List routes = transportAvailable.getRoutes().stream().toList(); @@ -127,7 +125,9 @@ @GetMapping(path = "/transport/search") - public List searchAvailableTransport(@RequestParam(name = "from") String from, @RequestParam(name = "to") String to, - @RequestParam(name = "date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date){ - return transportManager.getTransportsAvailableByFilters(from, to, date); + public List searchAvailableTransport(@RequestParam(name = "from") String from, + @RequestParam(name = "to") String to, + @RequestParam(name = "date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date, + @RequestParam(name = "numPassengers") int numPassengers){ + return transportManager.getTransportsAvailableByFilters(from, to, date, numPassengers); } @@ -151,3 +151,8 @@ return transportManager.findPastTransportReservationsByUser(id); } + + @GetMapping(path = "/transport/{id}/reservations/active") + public List showTransportReservationsByTransport(@PathVariable Long id) { + return transportManager.findTransportReservationByTransportId(id); + } } Index: src/main/java/com/tourMate/controllers/UsersController.java =================================================================== --- src/main/java/com/tourMate/controllers/UsersController.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/controllers/UsersController.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -11,5 +11,4 @@ import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.List; @@ -39,4 +38,32 @@ { return businessManager.getUnapprovedBusinessesOfUser(userId); + } + + @GetMapping(path = "/business/unapproved") + public List getAllUnapprovedBusinesses() + { + return businessManager.getUnapprovedBusinesses(); + } + + @GetMapping(path = "/users/unapproved") + public List getAllUnapprovedUsers() + { + return usersManager.getUnapprovedUsers(); + } + + @GetMapping(path = "/users/approve/{userId}") + public ResponseEntity approveUserProfile(@PathVariable Long userId) + { + usersManager.approveUserProfile(userId); + return new ResponseEntity<>(HttpStatus.OK); + + + } + + @GetMapping(path = "/business/approve/{businessId}") + public ResponseEntity approveBusiness(@PathVariable Long businessId) + { + businessManager.approveBusiness(businessId); + return new ResponseEntity<>(HttpStatus.OK); } @@ -85,4 +112,11 @@ } } + + @GetMapping("/users/unlock/{id}") + public ResponseEntity unlock(@PathVariable Long id) + { + usersManager.unlock(id); + return new ResponseEntity(HttpStatus.OK); + } } Index: src/main/java/com/tourMate/dao/BusinessDao.java =================================================================== --- src/main/java/com/tourMate/dao/BusinessDao.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dao/BusinessDao.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -9,14 +9,23 @@ public interface BusinessDao { - @Transactional - void createBusiness(Business business, long userId); - public List getUnapprovedBusinessesOfUser(long userId); - public void deleteBusiness(long businessId); - public List getCreatedBusinesses(); - public Business findBusinessById (long businessId); + List getCreatedBusinesses(); + + Business findBusinessById(long businessId); @Transactional - void editBusiness(long businessId, String name, String phone, String address, String edbs, User user, boolean approved); - public boolean hasBusiness(long userId); + void createBusiness(Business business); + List getUnapprovedBusinessesOfUser(User u); + + @Transactional + void deleteBusiness(Business business); + + boolean hasBusiness(User u); + + List getUnapprovedBusinesses(); + + void approveBusiness(Business business); + + @Transactional + void editBusiness(Business business); } Index: src/main/java/com/tourMate/dao/HotelDao.java =================================================================== --- src/main/java/com/tourMate/dao/HotelDao.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dao/HotelDao.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -9,47 +9,136 @@ public interface HotelDao { - public void createHotel(Hotels hotel, long userId); - public void editHotel(long hotelId, String hotelName, String hotelDescripiton, String hotelLocation, String hotelEDBS, Boolean parking, Boolean petFriendly, Boolean internetAvailable); - public void deleteHotel(long hotelId); - public Hotels findHotelByID (long hotelId); - public List getHotels(); - public List getHotelsForUser(long userId); - public List getHotelsByLocation(String hotelLocation); + @Transactional + void createHotel(Hotels hotel); - public void deleteHotelImage(long hotelImageId); - public HotelsImages findHotelImageById(long hotelImageId); - public List getHotelImages(Hotels hotels); - public List getRoomImages(HotelRoom hotelRoom); + List getHotels(); - public void createRoom(Hotels hotel, String hotelRoomDescription, String hotelRoomName, Boolean kitchenAvailable, Boolean airConditioning, Boolean balcony, double price); - public void editRoom(long hotelRoomId, Hotels hotel, String hotelRoomDescription, String HotelRoomName, Boolean kitchenAvailable, Boolean airConditioning, Boolean balcony, double price); - public void deleteRoom(long hotelRoomId); - public HotelRoom findRoomById (long hotelRoomId); - public List getRoomsOfHotel (long hotelId); - public List getRoomsAvailable(Long id); + List getHotelsForUser(User u); + + List getHotelsByLocation(String hotelLocation); @Transactional - public void createRoomAvailible(HotelRoom hotelRoom, Date dateFrom, Date dateTo, int numberOfBeds); - public void editRoomAvailible(long hotelRoomAvailableId, HotelRoom hotelRoom, Date dateFrom, Date dateTo, int numberOfBeds); - public void deleteRoomAvailible(long hotelRoomAvailableId); - public HotelRoomAvailable findAvailibleRoomById(long hotelRoomAvailableId); - public List getRoomsAvailibility(); - public List getRoomsAvailibilityByHotel(Hotels hotel); - public List getRoomsAvailibilityByDateAndLocation(String hotelLocation, Date dateFrom, Date dateTo, int numberOfBeds); + void editHotel(Hotels hotel); - public void createReservation(User user, HotelRoom hotelRoom, Date dateFrom, Date dateTo, Integer numberOfBeds); - public void editReservation(long hotelRoomReservedId, User user, HotelRoom hotelRoom, Date dateFrom, Date dateTo, Integer numberOfBeds); - public void deleteReservation(long hotelRoomReservedId); - public HotelRoomReservations findReservationById(long hotelRoomReservedId); - public List findReservationByUser(User user); - public List findReservationByHotel(Hotels hotel); - public List getReservations(); + @Transactional + void deleteHotel(Hotels hotel); + + Hotels findHotelByID(long hotelId); + + List getHotelImages(Hotels hotel); + + @Transactional + void addHotelImage(HotelsImages image); + + @Transactional + void addRoomImage(HotelRoomImages x); + + @Transactional + void saveReservation(HotelRoomReservations hotelRoomReservations); + + @Transactional + HotelsImages findHotelImageById(long hotelImageId); + + @Transactional + void deleteHotelImage(HotelsImages hotelsImages); + + List getRoomsOfHotel(Hotels hotel); + + List getRoomsAvailable(Long id); + + HotelRoom findRoomById(long hotelRoomId); + + List getRoomImages(HotelRoom hotelRoom); + + @Transactional + void createRoom(HotelRoom hotelRoom); + + @Transactional + void editRoom(HotelRoom hr); + + @Transactional + void deleteRoom(HotelRoom hr); + + @Transactional + void createRoomAvailible(HotelRoomAvailable hra); + + @Transactional + void editRoomAvailible(HotelRoomAvailable hr); + + @Transactional + void deleteRoomAvailible(HotelRoomAvailable hra); + + HotelRoomAvailable findAvailibleRoomById(long hotelRoomAvailableId); + + List getRoomsAvailibility(); + + List getRoomsAvailibilityByHotel(Hotels hotel); + + List getRoomsAvailibilityByDateAndLocation(String hotelLocation, Date dateFrom, Date dateTo, int numberOfBeds, Boolean flexible); + + @Transactional + void createReservation(HotelRoomReservations r); + + @Transactional + void editReservation(HotelRoomReservations hr); + + @Transactional + void deleteReservation(HotelRoomReservations hr); + + HotelRoomReservations findReservationById(long hotelRoomReservedId); + + List findReservationByUser(User user); + + List findReservationByHotel(Hotels hotel); + + List getReservations(); List findReviewsByHotel(Hotels hotel); List findPastReservationByUser(User u); - - void addHotelImage(HotelsImages x); - - void addRoomImage(HotelRoomImages x); +// public void createHotel(Hotels hotel, long userId); +// public void editHotel(long hotelId, String hotelName, String hotelDescripiton, String hotelLocation, String hotelEDBS, Boolean parking, Boolean petFriendly, Boolean internetAvailable); +// public void deleteHotel(long hotelId); +// public Hotels findHotelByID (long hotelId); +// public List getHotels(); +// public List getHotelsForUser(long userId); +// public List getHotelsByLocation(String hotelLocation); +// +// public void deleteHotelImage(long hotelImageId); +// public HotelsImages findHotelImageById(long hotelImageId); +// public List getHotelImages(Hotels hotels); +// public List getRoomImages(HotelRoom hotelRoom); +// +// public void createRoom(Hotels hotel, String hotelRoomDescription, String hotelRoomName, Boolean kitchenAvailable, Boolean airConditioning, Boolean balcony, double price, int numOfBeds); +// public void editRoom(long hotelRoomId, Hotels hotel, String hotelRoomDescription, String HotelRoomName, Boolean kitchenAvailable, Boolean airConditioning, Boolean balcony, double price); +// public void deleteRoom(long hotelRoomId); +// public HotelRoom findRoomById (long hotelRoomId); +// public List getRoomsOfHotel (long hotelId); +// public List getRoomsAvailable(Long id); +// +// @Transactional +// public void createRoomAvailible(HotelRoom hotelRoom, Date dateFrom, Date dateTo, int numberOfBeds); +// public void editRoomAvailible(long hotelRoomAvailableId, HotelRoom hotelRoom, Date dateFrom, Date dateTo, int numberOfBeds); +// public void deleteRoomAvailible(long hotelRoomAvailableId); +// public HotelRoomAvailable findAvailibleRoomById(long hotelRoomAvailableId); +// public List getRoomsAvailibility(); +// public List getRoomsAvailibilityByHotel(Hotels hotel); +// public List getRoomsAvailibilityByDateAndLocation(String hotelLocation, Date dateFrom, Date dateTo, int numberOfBeds, Boolean flexible); +// +// public void createReservation(User user, HotelRoom hotelRoom, Date dateFrom, Date dateTo, Integer numberOfBeds); +// public void editReservation(long hotelRoomReservedId, User user, HotelRoom hotelRoom, Date dateFrom, Date dateTo, Integer numberOfBeds); +// public void deleteReservation(long hotelRoomReservedId); +// public HotelRoomReservations findReservationById(long hotelRoomReservedId); +// public List findReservationByUser(User user); +// public List findReservationByHotel(Hotels hotel); +// public List getReservations(); +// +// List findReviewsByHotel(Hotels hotel); +// +// List findPastReservationByUser(User u); +// +// void addHotelImage(HotelsImages x); +// +// void addRoomImage(HotelRoomImages x); +// void saveReservation(HotelRoomReservations hotelRoomReservations); } Index: src/main/java/com/tourMate/dao/MenuDao.java =================================================================== --- src/main/java/com/tourMate/dao/MenuDao.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dao/MenuDao.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -2,12 +2,33 @@ import com.tourMate.entities.Menu; +import jakarta.transaction.Transactional; import java.util.List; public interface MenuDao { - public void createMenu(String name, String ingredients, double price); - public void deleteMenu(long menuId); - public List getCreatedMenus(); - public Menu findMenuById(long menuId); - public void editMenu(long menuId, String name, String ingredients, double price); + @Transactional + void createMenu(Menu menu); + + @Transactional + void deleteMenu(Menu menu); + + List getCreatedMenus(); + + Menu findMenuById(long menuId); + + @Transactional + void editMenu(Menu menu); +// public void createMenu(String name, String ingredients, double price); +// +// @Transactional +// void createMenu(Menu menu); +// +// public void deleteMenu(long menuId); +// +// @Transactional +// void deleteMenu(Menu menu); +// +// public List getCreatedMenus(); +// public Menu findMenuById(long menuId); +// public void editMenu(long menuId, String name, String ingredients, double price); } Index: src/main/java/com/tourMate/dao/RestaurantDao.java =================================================================== --- src/main/java/com/tourMate/dao/RestaurantDao.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dao/RestaurantDao.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -8,49 +8,116 @@ public interface RestaurantDao { - public void createRestaurant(Restaurant restaurant, long userId); - public void deleteRestaurant(long restaurantID); @Transactional - public void editRestaurant(long restaurantID, String restaurantName, String restaurantLocation, String cousineType, String restaurantDescription, String restaurantEdbs, User restaurantOwner); - public Restaurant findRestaurantByID (long restaurantID); - public List searchByRestaurantName(String restaurantName); - public List searchByRestaurantLocation(String restaurantLocation); - public List getRestaurants(); + void createRestaurant(Restaurant restaurant); + List getTablesByDateAndLocation(String restaurantLocation, Date hourFrom, Date hourTo, int noSeats); @Transactional - public void addMenuToRestaurant(long restaurantId, Menu menu); + void addRestaurantImage(RestaurantImages restaurantImages); + @Transactional + void removeRestaurantImage(RestaurantImages image); + @Transactional + void saveTable(RestaurantsTable resTable); + @Transactional + RestaurantImages findRestaurantImageById(long restaurantImageId); + void deleteRestaurant(Restaurant r); + List getRestaurants(); + @Transactional + void addMenuToRestaurant(Menu menu); + Restaurant findRestaurantByID(long restaurantID); + List getRestaurantImages(long restaurantID); + List getRestaurantTables(long restaurantID); + RestaurantsTable findTableById(long tableId); + @Transactional + void deleteTable(RestaurantsTable rt); + List getRestaurantsByUser(User u); + List getTablesAvailabilityById(Long id); + @Transactional + void saveTableAvailable(RestaurantsAvailible ra); + @Transactional + void deleteTableAvailable(RestaurantsAvailible ra); - public List getTablesByDateAndLocation(String restaurantLocation, Date hourFrom, Date hourTo, int noSeats); + List getTablesAvailability(); - public void createTable(Restaurant restaurant, int noSeats); - public void editTable(Restaurant restaurant, long tableId, int noSeats); - public void deleteTable(long tableId); - public List getRestaurantsByUser(long userId); - public RestaurantsTable findTableById(long tableId); - public List searchByNoSeats(int noSeats); - public List getRestaurantTables(long restaurantID); + // List getTablesAvailability(); + @Transactional + void createReservation(RestaurantReservations reservations); + @Transactional + void deleteReservation(RestaurantReservations r); + RestaurantReservations findReservationByID(long tableId); + RestaurantsAvailible findAvailableReservationByID(long availibleId); + List findReservationByUser(User user); + List findReservationByRestaurant(Restaurant restaurant); + List getReservations(); + List searchByRestaurantName(String restaurantName); - public void addRestaurantImage(RestaurantImages restaurantImages); - public void removeRestaurantImage(long restaurantImageId); - public RestaurantImages findRestaurantImageById(long restaurantImageId); - public List getRestaurantImages(long restaurantID); + List searchByRestaurantLocation(String restaurantLocation); - public void createTableAvailable(RestaurantsTable restaurantsTable, Date hourFrom, Date hourTo, int noSeats); - @Transactional - abstract void createTableAvailable(RestaurantsTable restaurantsTable, Date hourFrom, Date hourTo); - public List getTablesAvailabilityById(Long id); - public void editTableAvailable(long tableId, Restaurant restaurant, int noSeats); - public void deleteTableAvailable(long tableId); - public RestaurantsAvailible findAvailableReservationByID(long availibleId); - - public List getTablesAvailability(); - public void createReservation(RestaurantReservations reservations); - public void editReservation(long restaurantsTableId, RestaurantsTable rt, Date hourFrom, Date hourTo, int noSeats, User user); - public void deleteReservation(long restaurantsTableId); - public RestaurantReservations findReservationByID(long tableId); - public List findReservationByUser(User user); - public List findReservationByRestaurant(Restaurant restaurant); - public List getReservations(); + List searchByNoSeats(int noSeats); List findReviewsByRestaurant(Restaurant restaurant); - List findPastReservationsByUser(User u); + List findPastReservationsByUser(User user); + + List getMenuImages(long menuId); + + List getMenuImagesByRestaurant(Restaurant restaurant); + + @Transactional + void addMenuImage(MenuImages menuImages); + + Menu findMenuId(Long menuId); + + void saveReservation(RestaurantReservations r); + +// public void createRestaurant(Restaurant restaurant, long userId); +// public void deleteRestaurant(long restaurantID); +// @Transactional +// public void editRestaurant(long restaurantID, String restaurantName, String restaurantLocation, String cousineType, String restaurantDescription, String restaurantEdbs, User restaurantOwner); +// public Restaurant findRestaurantByID (long restaurantID); +// public List searchByRestaurantName(String restaurantName); +// public List searchByRestaurantLocation(String restaurantLocation); +// public List getRestaurants(); +// @Transactional +// public void addMenuToRestaurant(long restaurantId, Menu menu); +// +// public List getTablesByDateAndLocation(String restaurantLocation, Date hourFrom, Date hourTo, int noSeats); +// +// public void createTable(Restaurant restaurant, int noSeats); +// public void editTable(Restaurant restaurant, long tableId, int noSeats); +// public void deleteTable(long tableId); +// public List getRestaurantsByUser(long userId); +// public RestaurantsTable findTableById(long tableId); +// public List searchByNoSeats(int noSeats); +// public List getRestaurantTables(long restaurantID); +// +// public void addRestaurantImage(RestaurantImages restaurantImages); +// public void removeRestaurantImage(long restaurantImageId); +// public RestaurantImages findRestaurantImageById(long restaurantImageId); +// public List getRestaurantImages(long restaurantID); +// +// public void createTableAvailable(RestaurantsTable restaurantsTable, Date hourFrom, Date hourTo, int noSeats); +// @Transactional +// abstract void createTableAvailable(RestaurantsTable restaurantsTable, Date hourFrom, Date hourTo); +// public List getTablesAvailabilityById(Long id); +// public void editTableAvailable(long tableId, Restaurant restaurant, int noSeats); +// public void deleteTableAvailable(long tableId); +// public RestaurantsAvailible findAvailableReservationByID(long availibleId); +// +// public List getTablesAvailability(); +// public void createReservation(RestaurantReservations reservations); +// public void editReservation(long restaurantsTableId, RestaurantsTable rt, Date hourFrom, Date hourTo, int noSeats, User user); +// public void deleteReservation(long restaurantsTableId); +// public RestaurantReservations findReservationByID(long tableId); +// public List findReservationByUser(User user); +// public List findReservationByRestaurant(Restaurant restaurant); +// public List getReservations(); +// +// List findReviewsByRestaurant(Restaurant restaurant); +// +// List findPastReservationsByUser(User u); +// List getMenuImages(long menuId); +// public void addMenuImage(MenuImages menuImages); +// +// Menu findMenuId(Long menuId); +// +// void saveReservation(RestaurantReservations restaurantReservations); } Index: src/main/java/com/tourMate/dao/ReviewDao.java =================================================================== --- src/main/java/com/tourMate/dao/ReviewDao.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dao/ReviewDao.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -10,18 +10,39 @@ public interface ReviewDao { - @Transactional void createReview(Reviews review); - public void deleteReview(long id); - public void editReview(long id, String title, String description, int numStar, Hotels hotel, Restaurant restaurant, Transport transport); - public Reviews findReviewById(long id); - public List getAllReviews(); - public List getHotelReviews(); - public List getTransportReviews(); - public List getRestaurantReviews(); - public List getHotelReviews(Hotels hotel); - public List getRestaurantReviews(Restaurant restaurant); - public List getTransportReviews(Transport transport); + void deleteReview(Reviews review); + + Reviews findReviewById(long id); + + void editReview(Reviews review); + + List getAllReviews(); + + List getHotelReviews(); + + List getTransportReviews(); + + List getRestaurantReviews(); + + List getHotelReviews(Hotels hotel); + + List getRestaurantReviews(Restaurant restaurant); + + List getTransportReviews(Transport transport); +// @Transactional +// void createReview(Reviews review); +// +// public void deleteReview(long id); +// public void editReview(long id, String title, String description, int numStar, Hotels hotel, Restaurant restaurant, Transport transport); +// public Reviews findReviewById(long id); +// public List getAllReviews(); +// public List getHotelReviews(); +// public List getTransportReviews(); +// public List getRestaurantReviews(); +// public List getHotelReviews(Hotels hotel); +// public List getRestaurantReviews(Restaurant restaurant); +// public List getTransportReviews(Transport transport); } Index: src/main/java/com/tourMate/dao/TransportDao.java =================================================================== --- src/main/java/com/tourMate/dao/TransportDao.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dao/TransportDao.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -4,61 +4,126 @@ import com.tourMate.dto.TransportDto; import com.tourMate.entities.*; +import jakarta.transaction.Transactional; -import java.util.Collection; import java.util.Date; import java.util.List; public interface TransportDao { + @Transactional + void createTransport(Transport t); - public void createTransport(String transportName, String carBrand, String carType, int carManufacturedYear, int noPassengers, int noBags, long EMBG, User owner, String carPlate); + @Transactional + void deleteTransport(Transport t); - public void deleteTransport(long transportId); + List getTransports(); - public void editTransport(long transportID, String transportName, String carBrand, String carType, int carManufacturedYear, int noPassengers, int noBags, long EMBG, User owner, String carPlate); + List getTransportsByUser(User u); - public List getTransports(); - public List getTransportsByUser(long userId); + List getRoutesForTransport(Transport t); - public List getRoutesForTransport(long transportId); - public Transport getTransportById(long transportId); - public TransportDto findTransportById (long transportId); + TransportDto findTransportById(long transportId); - public void createTransportReservation(TransportReservation transportReservation); + Transport getTransportById(long transportId); - public void editTransportReservation(Transport transport, long reservationID, String departureLocation, String arrivalLocation, Date date, Integer noSeats, User user, Date departureHour); + @Transactional + void editTransport(Transport t); - public void deleteTransportReservation(long reservationID); + @Transactional + void createTransportReservation(TransportReservation transportReservation); - public TransportReservation findTransportReservationByID(long reservationID); + TransportReservation findTransportReservationByID(long reservationID); - public List getTransportReservations(); + List getTransportReservations(); - public List getTransportsReservationsByUserID(long userID); + TransportAvailible findTransportAvailableByID(long reservationID); - public void createTransportAvailable(Transport transport, String departureLocation, String arrivalLocation, Date date, Integer noSeats, Date departureHour, Collection routes); + List getTransportsAvailableByFilters(String fromL, String toL, Date date, int numPassengers); - public void editTransportAvailable(Transport transport, long availableID, String departureLocation, String arrivalLocation, Date date, Integer noSeats, Date departureHour); + List getTransportsReservationsByUserID(long userID); - public void deleteTransportAvailable(long availableID); + List getTransportsAvailable(); - public TransportAvailible findTransportAvailableByID (long reservationID); + @Transactional + void createTransportAvailable(TransportAvailible ta); - public List getTransportsAvailable(); + void editTransportAvailable(TransportAvailible ta); - public List getTransportsAvailableByFilters (String from,String to,Date date); - - public void createTransportRoute(TransportAvailible parentRoute, String from, String to, double price, Date departure, Date arrival, int freeSpace, int order); - - public void deleteTransportRoute(long transportRouteId); - - public void editTransportRoute(long transportRouteId, TransportAvailible parentRoute, String from, String to, double price, Date departure, Date arrival, int freeSpace, int order); - - public TransportRoute findTransportRouteById(long transportRouteId); + TransportRoute findTransportRouteById(long transportRouteId); List getReviewsForTransport(Transport transport); - List findReservationByUser(User u); + List findPastReservationByUser(User user); - List findPastReservationByUser(User user); + @Transactional + void saveReservation(TransportReservation transportReservation); + + List findReservationByUser(User user); + + @Transactional + void deleteTransportReservation(TransportReservation tr); + + @Transactional + void deleteTransportAvailable(TransportAvailible ta); + + void createTransportRoute(TransportRoute tr); + + void deleteTransportRoute(TransportRoute tr); + + void editTransportRoute(TransportRoute tr); + + List findTransportReservationByTransportId(Transport t); + +// public void createTransport(String transportName, String carBrand, String carType, int carManufacturedYear, int noPassengers, int noBags, long EMBG, Long userId, String carPlate); +// +// public void deleteTransport(long transportId); +// +// public void editTransport(long transportID, String transportName, String carBrand, String carType, int carManufacturedYear, int noPassengers, int noBags, long EMBG, User owner, String carPlate); +// +// public List getTransports(); +// public List getTransportsByUser(long userId); +// +// public List getRoutesForTransport(long transportId); +// public Transport getTransportById(long transportId); +// public TransportDto findTransportById (long transportId); +// +// public void createTransportReservation(TransportReservation transportReservation); +// +// public void editTransportReservation(Transport transport, long reservationID, String departureLocation, String arrivalLocation, Date date, Integer noSeats, User user, Date departureHour); +// +// public void deleteTransportReservation(long reservationID); +// +// public TransportReservation findTransportReservationByID(long reservationID); +// +// public List getTransportReservations(); +// +// public List getTransportsReservationsByUserID(long userID); +// +// public void createTransportAvailable(Transport transport, String departureLocation, String arrivalLocation, Date date, Integer noSeats, Date departureHour, Collection routes); +// +// public void editTransportAvailable(Transport transport, long availableID, String departureLocation, String arrivalLocation, Date date, Integer noSeats, Date departureHour); +// +// public void deleteTransportAvailable(long availableID); +// +// public TransportAvailible findTransportAvailableByID (long reservationID); +// +// public List getTransportsAvailable(); +// +// public List getTransportsAvailableByFilters (String from, String to, Date date, int numPassengers); +// +// public void createTransportRoute(TransportAvailible parentRoute, String from, String to, double price, Date departure, Date arrival, int freeSpace, int order); +// +// public void deleteTransportRoute(long transportRouteId); +// +// public void editTransportRoute(long transportRouteId, TransportAvailible parentRoute, String from, String to, double price, Date departure, Date arrival, int freeSpace, int order); +// +// public TransportRoute findTransportRouteById(long transportRouteId); +// +// List getReviewsForTransport(Transport transport); +// +// List findReservationByUser(User u); +// +// List findPastReservationByUser(User user); +// +// void saveReservation(TransportReservation transportReservation); } Index: src/main/java/com/tourMate/dao/UsersDao.java =================================================================== --- src/main/java/com/tourMate/dao/UsersDao.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dao/UsersDao.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -23,3 +23,10 @@ UserDetails findUserByUsername(String username); + + List getUnapprovedUsers(); + + void approveUserProfile(User u); + + Role findById(Long id); + void updateUser(User s); } Index: src/main/java/com/tourMate/dao/impl/BusinessDaoImpl.java =================================================================== --- src/main/java/com/tourMate/dao/impl/BusinessDaoImpl.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dao/impl/BusinessDaoImpl.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -19,13 +19,10 @@ @Transactional @Override - public void createBusiness(Business business, long userId) { - User u = em.find(User.class, userId); - business.setUser(u); + public void createBusiness(Business business) { em.persist(business); } @Override - public List getUnapprovedBusinessesOfUser(long userId) { - User u = em.find(User.class, userId); + public List getUnapprovedBusinessesOfUser(User u) { return em.createQuery("SELECT b FROM Business b WHERE b.user = :user").setParameter("user", u).getResultList(); } @@ -33,15 +30,23 @@ @Transactional @Override - public void deleteBusiness(long businessId) { - Business business = findBusinessById(businessId); + public void deleteBusiness(Business business) { em.remove(business); - } @Override - public boolean hasBusiness(long userId) + public boolean hasBusiness(User u) { - User u = em.find(User.class, userId); return Integer.parseInt(em.createQuery("SELECT COUNT(b) FROM Business b WHERE b.user = :user").setParameter("user", u).getSingleResult().toString()) > 0; + } + + @Override + public List getUnapprovedBusinesses() { + return em.createQuery("select b from Business b where not b.approved").getResultList(); + } + + @Override + @Transactional + public void approveBusiness(Business b) { + em.persist(b); } @@ -57,14 +62,8 @@ } + @Transactional @Override - public void editBusiness(long businessId, String name, String phone, String address, String edbs, User user, boolean approved) { - Business business = findBusinessById(businessId); - business.setName(name); - business.setPhone(phone); - business.setAddress(address); - business.setEdbs(edbs); - business.setUser(user); - business.setApproved(approved); + public void editBusiness(Business business) { em.persist(business); } Index: src/main/java/com/tourMate/dao/impl/HotelDaoImpl.java =================================================================== --- src/main/java/com/tourMate/dao/impl/HotelDaoImpl.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dao/impl/HotelDaoImpl.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -8,4 +8,5 @@ import org.springframework.stereotype.Service; +import java.util.Calendar; import java.util.Date; import java.util.List; @@ -19,21 +20,15 @@ @Override @Transactional - public void createHotel(Hotels hotel, long userId) { - User u = em.find(User.class, userId); - Hotels h = new Hotels(hotel.getHotelName(), hotel.getHotelDescripiton(), hotel.getHotelLocation(), hotel.getHotelEDBS(), hotel.getParking(), hotel.getPetFriendly(), hotel.getInternetAvailable(), u); - em.persist(h); + public void createHotel(Hotels hotel) { + em.persist(hotel); } @Override public List getHotels() { - List hoteli = em.createQuery("select h from Hotels h order by h.hotelId").getResultList(); - System.out.println("OREEEEEEL"); - return hoteli; - //return em.createQuery("select h from Hotels h order by h.hotelId").getResultList(); - } - - @Override - public List getHotelsForUser(long userId) { - User u = em.find(User.class, userId); + return em.createQuery("select h from Hotels h order by h.hotelId").getResultList(); + } + + @Override + public List getHotelsForUser(User u) { return em.createQuery("select h from Hotels h where h.owner = :u").setParameter("u", u).getResultList(); } @@ -46,13 +41,5 @@ @Transactional @Override - public void editHotel(long hotelId, String hotelName, String hotelDescripiton, String hotelLocation, String hotelEDBS, Boolean parking, Boolean petFriendly, Boolean internetAvailable) { - Hotels hotel = findHotelByID(hotelId); - hotel.setHotelName(hotelName); - hotel.setHotelDescripiton(hotelDescripiton); - hotel.setHotelLocation(hotelLocation); - hotel.setHotelEDBS(hotelEDBS); - hotel.setParking(parking); - hotel.setPetFriendly(petFriendly); - hotel.setInternetAvailable(internetAvailable); + public void editHotel(Hotels hotel) { em.persist(hotel); } @@ -60,7 +47,6 @@ @Transactional @Override - public void deleteHotel(long hotelId) { - Hotels h = findHotelByID(hotelId); - em.remove(h); + public void deleteHotel(Hotels hotel) { + em.remove(hotel); } @@ -89,4 +75,10 @@ @Override @Transactional + public void saveReservation(HotelRoomReservations hotelRoomReservations) { + em.persist(hotelRoomReservations); + } + + @Override + @Transactional public HotelsImages findHotelImageById(long hotelImageId) { return em.find(HotelsImages.class, hotelImageId); @@ -95,13 +87,11 @@ @Override @Transactional - public void deleteHotelImage(long hotelImageId) { - HotelsImages hotelsImages = findHotelImageById(hotelImageId); + public void deleteHotelImage(HotelsImages hotelsImages) { em.remove(hotelsImages); } @Override - public List getRoomsOfHotel(long hotelId) { - Hotels h = findHotelByID(hotelId); - return em.createQuery("SELECT hr from HotelRoom hr where hr.hotel = :hotel").setParameter("hotel", h).getResultList(); + public List getRoomsOfHotel(Hotels hotel) { + return em.createQuery("SELECT hr from HotelRoom hr where hr.hotel = :hotel").setParameter("hotel", hotel).getResultList(); } @@ -123,6 +113,5 @@ @Transactional @Override - public void createRoom(Hotels hotel, String hotelRoomDescription, String hotelRoomName, Boolean kitchenAvailable, Boolean airConditioning, Boolean balcony, double price) { - HotelRoom hotelRoom = new HotelRoom(hotel, hotelRoomDescription, hotelRoomName, kitchenAvailable, airConditioning, balcony, price); + public void createRoom(HotelRoom hotelRoom) { em.persist(hotelRoom); } @@ -130,13 +119,5 @@ @Transactional @Override - public void editRoom(long hotelRoomId, Hotels hotel, String hotelRoomDescription, String hotelRoomName, Boolean kitchenAvailable, Boolean airConditioning, Boolean balcony, double price) { - HotelRoom hr = findRoomById(hotelRoomId); - hr.setHotel(hotel); - hr.setHotelRoomDescription(hotelRoomDescription); - hr.setHotelRoomName(hotelRoomName); - hr.setKitchenAvailable(kitchenAvailable); - hr.setAirConditioning(airConditioning); - hr.setBalcony(balcony); - hr.setPrice(price); + public void editRoom(HotelRoom hr) { em.persist(hr); } @@ -144,6 +125,5 @@ @Transactional @Override - public void deleteRoom(long hotelRoomId) { - HotelRoom hr = findRoomById(hotelRoomId); + public void deleteRoom(HotelRoom hr) { em.remove(hr); } @@ -151,6 +131,5 @@ @Transactional @Override - public void createRoomAvailible(HotelRoom hotelRoom, Date dateFrom, Date dateTo, int numberOfBeds) { - HotelRoomAvailable hra = new HotelRoomAvailable(hotelRoom, dateFrom, dateTo, numberOfBeds); + public void createRoomAvailible(HotelRoomAvailable hra) { em.persist(hra); } @@ -158,10 +137,5 @@ @Transactional @Override - public void editRoomAvailible(long hotelRoomAvailableId, HotelRoom hotelRoom, Date dateFrom, Date dateTo, int numberOfBeds) { - HotelRoomAvailable hr = findAvailibleRoomById(hotelRoomAvailableId); - hr.setHotelRoom(hotelRoom); - hr.setDateFrom(dateFrom); - hr.setDateTo(dateTo); - hr.setNumberOfBeds(numberOfBeds); + public void editRoomAvailible(HotelRoomAvailable hr) { em.persist(hr); } @@ -169,6 +143,5 @@ @Transactional @Override - public void deleteRoomAvailible(long hotelRoomAvailableId) { - HotelRoomAvailable hra = findAvailibleRoomById(hotelRoomAvailableId); + public void deleteRoomAvailible(HotelRoomAvailable hra) { em.remove(hra); } @@ -190,22 +163,72 @@ @Override - public List getRoomsAvailibilityByDateAndLocation(String hotelLocation, Date dateFrom, Date dateTo, int numberOfBeds) { - return em.createQuery("select hr from HotelRoomAvailable hr where hr.dateFrom <= :dateFrom and hr.dateTo >= :dateTo " + -<<<<<<< HEAD - "and hr.hotelRoom.hotel.hotelLocation LIKE :hotelLocation and hr.hotelRoom.numOfBeds >= :numBeds") -======= - "and hr.hotelRoom.hotel.hotelLocation LIKE :hotelLocation and hr.numberOfBeds >= :numBeds") ->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) - .setParameter("hotelLocation", hotelLocation) - .setParameter("dateFrom", dateFrom) - .setParameter("dateTo", dateTo) - .setParameter("numBeds", numberOfBeds) - .getResultList(); - } - - @Override - @Transactional - public void createReservation(User user, HotelRoom hotelRoom, Date dateFrom, Date dateTo, Integer numberOfBeds) { - HotelRoomReservations r = new HotelRoomReservations(user, hotelRoom, dateFrom, dateTo, numberOfBeds); + public List getRoomsAvailibilityByDateAndLocation(String hotelLocation, Date dateFrom, Date dateTo, int numberOfBeds, Boolean flexible) { + if(flexible) + { + Calendar calendar = Calendar.getInstance(); + Calendar calendar1 = Calendar.getInstance(); + calendar.setTime(dateTo); + calendar1.setTime(dateFrom); + return em.createQuery("SELECT hr FROM HotelRoomAvailable hr WHERE " + + "((hr.dateFrom <= :dateTo AND hr.dateTo >= :dateFrom) OR " + + "(hr.dateFrom <= :dateToMinus1 AND hr.dateTo >= :dateFromMinus1) OR " + + "(hr.dateFrom <= :dateToMinus2 AND hr.dateTo >= :dateFromMinus2) OR " + + "(hr.dateFrom <= :dateToMinus3 AND hr.dateTo >= :dateFromMinus3) OR " + + "(hr.dateFrom <= :dateToPlus1 AND hr.dateTo >= :dateFromPlus1) OR " + + "(hr.dateFrom <= :dateToPlus2 AND hr.dateTo >= :dateFromPlus2) OR " + + "(hr.dateFrom <= :dateToPlus3 AND hr.dateTo >= :dateFromPlus3)) " + + "AND hr.hotelRoom.hotel.hotelLocation LIKE :hotelLocation " + + "AND hr.hotelRoom.numOfBeds >= :numBeds") + .setParameter("hotelLocation", hotelLocation) + .setParameter("dateFrom", dateFrom) + .setParameter("dateTo", dateTo) + .setParameter("dateToMinus1", subtractDays(calendar, 1)) + .setParameter("dateToMinus2", subtractDays(calendar, 2)) + .setParameter("dateToMinus3", subtractDays(calendar, 3)) + .setParameter("dateToPlus1", addDays(calendar, 1)) + .setParameter("dateToPlus2", addDays(calendar, 2)) + .setParameter("dateToPlus3", addDays(calendar, 3)) + .setParameter("dateFromMinus1", subtractDays(calendar1, 1)) + .setParameter("dateFromMinus2", subtractDays(calendar1, 2)) + .setParameter("dateFromMinus3", subtractDays(calendar1, 3)) + .setParameter("dateFromPlus1", addDays(calendar1, 1)) + .setParameter("dateFromPlus2", addDays(calendar1, 2)) + .setParameter("dateFromPlus3", addDays(calendar1, 3)) + .setParameter("numBeds", numberOfBeds) + .getResultList(); + } + else + { + return em.createQuery("SELECT hr FROM HotelRoomAvailable hr WHERE " + + "((hr.dateFrom <= :dateTo AND hr.dateTo >= :dateFrom)) " + + "AND hr.hotelRoom.hotel.hotelLocation LIKE :hotelLocation " + + "AND hr.hotelRoom.numOfBeds >= :numBeds") + .setParameter("hotelLocation", hotelLocation) + .setParameter("dateFrom", dateFrom) + .setParameter("dateTo", dateTo) + .setParameter("numBeds", numberOfBeds) + .getResultList(); + } + + + + + } + + private Date addDays(Calendar calendar, int days) { + Calendar newCalendar = (Calendar) calendar.clone(); + newCalendar.add(Calendar.DAY_OF_MONTH, days); + return newCalendar.getTime(); + } + + private Date subtractDays(Calendar calendar, int days) { + Calendar newCalendar = (Calendar) calendar.clone(); + newCalendar.add(Calendar.DAY_OF_MONTH, -days); + return newCalendar.getTime(); + } + + @Override + @Transactional + public void createReservation(HotelRoomReservations r) { em.persist(r); } @@ -213,20 +236,13 @@ @Override @Transactional - public void editReservation(long hotelRoomReservedId, User user, HotelRoom hotelRoom, Date dateFrom, Date dateTo, Integer numberOfBeds) { - HotelRoomReservations hr = findReservationById(hotelRoomReservedId); - hr.setUser(user); - hr.setHotelRoom(hotelRoom); - hr.setDateFrom(dateFrom); - hr.setDateTo(dateTo); - hr.setNumberOfBeds(numberOfBeds); + public void editReservation(HotelRoomReservations hr) { em.persist(hr); - - } - - @Transactional - @Override - public void deleteReservation(long hotelRoomReservedId) { - HotelRoomReservations r = findReservationById(hotelRoomReservedId); - em.remove(hotelRoomReservedId); + } + + @Transactional + @Override + public void deleteReservation(HotelRoomReservations hr) { + + em.remove(hr); } @@ -244,6 +260,6 @@ @Override public List findReservationByHotel(Hotels hotel) { - List hotelRooms = getRoomsOfHotel(hotel.getHotelId()); - return em.createQuery("select hr from HotelRoomReservations hr where hr.hotelRoom in :hotelRooms").setParameter("hotelRooms", hotelRooms).getResultList(); + List hotelRooms = getRoomsOfHotel(hotel); + return em.createQuery("select hr from HotelRoomReservations hr where hr.hotelRoom.hotel = :hotel").setParameter("hotel", hotel).getResultList(); } Index: src/main/java/com/tourMate/dao/impl/MenuDaoImpl.java =================================================================== --- src/main/java/com/tourMate/dao/impl/MenuDaoImpl.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dao/impl/MenuDaoImpl.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -18,6 +18,5 @@ @Transactional @Override - public void createMenu(String name, String ingredients, double price) { - Menu menu = new Menu(name, ingredients, price); + public void createMenu(Menu menu) { em.persist(menu); } @@ -25,6 +24,5 @@ @Transactional @Override - public void deleteMenu(long menuId) { - Menu menu = findMenuById(menuId); + public void deleteMenu(Menu menu) { em.remove(menu); } @@ -42,9 +40,6 @@ @Transactional @Override - public void editMenu(long menuId, String name, String ingredients, double price) { - Menu menu = findMenuById(menuId); - menu.setName(name); - menu.setIngredients(ingredients); - menu.setPrice(price); + public void editMenu(Menu menu) { + em.persist(menu); } Index: src/main/java/com/tourMate/dao/impl/RestaurantDaoImpl.java =================================================================== --- src/main/java/com/tourMate/dao/impl/RestaurantDaoImpl.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dao/impl/RestaurantDaoImpl.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -18,8 +18,6 @@ @Override @Transactional - public void createRestaurant(Restaurant restaurant, long userId) { - User u = em.find(User.class, userId); - Restaurant r = new Restaurant(restaurant.getRestaurantName(), restaurant.getRestaurantLocation(), restaurant.getCousineType(), restaurant.getRestaurantDescription(), restaurant.getRestaurantEdbs(), u); - em.persist(r); + public void createRestaurant(Restaurant restaurant) { + em.persist(restaurant); } @@ -43,7 +41,6 @@ @Transactional @Override - public void removeRestaurantImage(long restaurantImageId){ - RestaurantImages restaurantImage = findRestaurantImageById(restaurantImageId); - em.remove(restaurantImage); + public void removeRestaurantImage(RestaurantImages image){ + em.remove(image); } @@ -55,6 +52,5 @@ @Override - public void deleteRestaurant(long restaurantID) { - Restaurant r = findRestaurantByID(restaurantID); + public void deleteRestaurant(Restaurant r) { em.remove(r); } @@ -67,7 +63,5 @@ @Override @Transactional - public void addMenuToRestaurant(long restaurantId, Menu menu) { - Restaurant r = findRestaurantByID(restaurantId); - menu.setRestaurant(r); + public void addMenuToRestaurant(Menu menu) { em.persist(menu); } @@ -84,20 +78,6 @@ @Override - @Transactional - public void editRestaurant(long restaurantID, String restaurantName, String restaurantLocation, String cousineType, String restaurantDescription, String restaurantEdbs, User restaurantOwner) { - Restaurant res = findRestaurantByID(restaurantID); - res.setRestaurantName(restaurantName); - res.setRestaurantLocation(restaurantLocation); - res.setRestaurantEdbs(restaurantEdbs); - res.setRestaurantDescription(restaurantDescription); - res.setRestaurantOwner(restaurantOwner); - res.setCousineType(cousineType); - em.persist(res); - } - - @Override public List getRestaurantTables(long restaurantID) { - List restaurantsTables = getRestaurantTables(restaurantID); - return restaurantsTables; + return em.createQuery("select rt from RestaurantsTable rt where rt.restaurant.restaurantID = :restaurantId").setParameter("restaurantId", restaurantID).getResultList(); } @@ -109,36 +89,18 @@ @Override @Transactional - public void createTable(Restaurant restaurant, int noSeats) { - RestaurantsTable resTable = new RestaurantsTable(restaurant, noSeats); + public void saveTable(RestaurantsTable resTable) { em.persist(resTable); } - @Override - @Transactional - public void editTable(Restaurant restaurant, long tableId, int noSeats) { - RestaurantsTable resTable = findTableById(tableId); - resTable.setRestaurant(restaurant); - resTable.setNoSeats(noSeats); - em.persist(resTable); - } - - @Override - @Transactional - public void deleteTable(long tableId) { - RestaurantsTable rt = findTableById(tableId); + + @Override + @Transactional + public void deleteTable(RestaurantsTable rt) { em.persist(rt); } @Override - public List getRestaurantsByUser(long userId) { - User u = em.find(User.class, userId); + public List getRestaurantsByUser(User u) { return em.createQuery("select r from Restaurant r where r.restaurantOwner = :u").setParameter("u", u).getResultList(); - } - - @Override - @Transactional - public void createTableAvailable(RestaurantsTable restaurantsTable, Date hourFrom, Date hourTo, int noSeats) { - RestaurantsAvailible ra = new RestaurantsAvailible(restaurantsTable, hourFrom, hourTo, noSeats); - em.persist(ra); } @@ -151,22 +113,11 @@ @Override @Transactional - public void createTableAvailable(RestaurantsTable restaurantsTable, Date hourFrom, Date hourTo){ - RestaurantsAvailible rta = new RestaurantsAvailible(restaurantsTable, hourFrom, hourTo); - em.persist(rta); - } - - @Override - @Transactional - public void editTableAvailable(long tableId, Restaurant restaurant, int noSeats) { - RestaurantsTable rt = findTableById(tableId); - rt.setRestaurant(restaurant); - rt.setNoSeats(noSeats); - em.persist(rt); - } - - @Override - @Transactional - public void deleteTableAvailable(long tableId) { - RestaurantsAvailible ra = findAvailableReservationByID(tableId); + public void saveTableAvailable(RestaurantsAvailible ra){ + em.persist(ra); + } + + @Override + @Transactional + public void deleteTableAvailable(RestaurantsAvailible ra) { em.remove(ra); } @@ -183,20 +134,8 @@ } - @Override - @Transactional - public void editReservation(long restaurantsTableId, RestaurantsTable rt, Date hourFrom, Date hourTo, int noSeats, User user) { - RestaurantReservations r = findReservationByID(restaurantsTableId); - r.setTable(rt); - r.setTimeFrom(hourFrom); - r.setTimeTo(hourTo); - r.setNoSeats(noSeats); - r.setUser(user); - em.persist(r); - } - - @Override - @Transactional - public void deleteReservation(long restaurantsTableId) { - RestaurantReservations r = findReservationByID(restaurantsTableId); + + @Override + @Transactional + public void deleteReservation(RestaurantReservations r) { em.remove(r); } @@ -259,3 +198,32 @@ } + + @Override + public List getMenuImages(long menuId) { + return em.createQuery("select ri from MenuImages ri where ri.menu.id = :menuId").setParameter("menuId", menuId).getResultList(); + } + + @Override + public List getMenuImagesByRestaurant(Restaurant resta) { + return em.createQuery("select mi from MenuImages mi where mi.menu.restaurant = :restaurant") + .setParameter("restaurant", resta) + .getResultList(); + } + + @Transactional + @Override + public void addMenuImage(MenuImages menuImages) { + em.persist(menuImages); + } + + @Override + public Menu findMenuId(Long menuId) { + return em.find(Menu.class, menuId); + } + + @Override + @Transactional + public void saveReservation(RestaurantReservations restaurantReservations) { + em.persist(restaurantReservations); + } } Index: src/main/java/com/tourMate/dao/impl/ReviewDaoImpl.java =================================================================== --- src/main/java/com/tourMate/dao/impl/ReviewDaoImpl.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dao/impl/ReviewDaoImpl.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -25,6 +25,5 @@ @Override - public void deleteReview(long id) { - Reviews review = findReviewById(id); + public void deleteReview(Reviews review) { em.remove(review); } @@ -36,12 +35,5 @@ @Override - public void editReview(long id, String title, String description, int numStar, Hotels hotel, Restaurant restaurant, Transport transport) { - Reviews review = findReviewById(id); - review.setDescription(description); - review.setHotel(hotel); - review.setRestaurant(restaurant); - review.setTitle(title); - review.setNumStar(numStar); - review.setTransport(transport); + public void editReview(Reviews review) { em.persist(review); } Index: src/main/java/com/tourMate/dao/impl/TransportDaoImpl.java =================================================================== --- src/main/java/com/tourMate/dao/impl/TransportDaoImpl.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dao/impl/TransportDaoImpl.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -10,5 +10,4 @@ import org.springframework.stereotype.Service; -import java.util.Collection; import java.util.Date; import java.util.List; @@ -22,7 +21,5 @@ @Override @Transactional - public void createTransport(String transportName, String carBrand, String carType, int carManufacturedYear, int noPassengers, int noBags, long EMBG, User owner, String carPlate) { - User u = em.find(User.class, 1); - Transport t=new Transport(transportName,carBrand,carType,carManufacturedYear,noPassengers,noBags,EMBG,u,carPlate); + public void createTransport(Transport t) { em.persist(t); } @@ -30,6 +27,5 @@ @Override @Transactional - public void deleteTransport(long transportId) { - Transport t=getTransportById(transportId); + public void deleteTransport(Transport t) { em.remove(t); } @@ -41,6 +37,5 @@ @Override - public List getTransportsByUser(long userId) { - User u = em.find(User.class, userId); + public List getTransportsByUser(User u) { List transports = em.createQuery("select t from Transport t where t.owner = :u").setParameter("u", u).getResultList(); return transports.stream().map(x -> new TransportDto( @@ -62,12 +57,18 @@ y.getFreeSpace(), y.getTime(), - y.getRoutes() - )).toList() + y.getRoutes(), + y.getRoutes().stream() + .mapToDouble(TransportRoute::getPrice) + .max().orElse(0) + )).toList(), + x.getAvailableRoutes().stream() + .flatMapToDouble(y -> y.getRoutes() + .stream() + .mapToDouble(TransportRoute::getPrice)).max().orElseGet(() -> 0) )).toList(); } @Override - public List getRoutesForTransport(long transportId) { - Transport t = em.find(Transport.class, transportId); + public List getRoutesForTransport(Transport t) { List transportsAvailible = em.createQuery("select ta from TransportAvailible ta where ta.transport = :transport").setParameter("transport", t).getResultList(); return transportsAvailible.stream().map(x -> new RouteListingDto( @@ -78,5 +79,8 @@ x.getFreeSpace(), x.getTime(), - x.getRoutes() + x.getRoutes(), + x.getRoutes().stream() + .mapToDouble(TransportRoute::getPrice) + .max().orElse(0) )).toList(); } @@ -103,8 +107,16 @@ y.getFreeSpace(), y.getTime(), - y.getRoutes() - )).toList()); - } - + y.getRoutes(), + y.getRoutes().stream() + .mapToDouble(TransportRoute::getPrice) + .max().orElse(0) + )).toList(), + x.getAvailableRoutes().stream() + .flatMapToDouble(y -> y.getRoutes() + .stream() + .mapToDouble(TransportRoute::getPrice)).max().orElseGet(() -> 0)); + } + + @Override public Transport getTransportById(long transportId) { @@ -114,15 +126,5 @@ @Override @Transactional - public void editTransport(long transportID, String transportName, String carBrand, String carType, int carManufacturedYear, int noPassengers, int noBags, long EMBG, User owner, String carPlate) { - Transport t=getTransportById(transportID); - t.setTransportName(transportName); - t.setCarBrand(carBrand); - t.setCarType(carType); - t.setCarManufacturedYear(carManufacturedYear); - t.setNoPassengers(noPassengers); - t.setNoBags(noBags); - t.setEMBG(EMBG); - t.setOwner(owner); - t.setCarPlate(carPlate); + public void editTransport(Transport t) { em.persist(t); } @@ -150,8 +152,11 @@ @Override - public List getTransportsAvailableByFilters(String fromL, String toL, Date date) { + public List getTransportsAvailableByFilters(String fromL, String toL, Date date, int numPassengers) { System.out.println(fromL + " " + toL); - return em.createQuery("select h from TransportRoute h where h.from = :froml and h.to = :tol").setParameter("froml", fromL). - setParameter("tol", toL).getResultList(); + return em.createQuery("select h from TransportRoute h where h.from = :froml and h.to = :tol and h.freeSpace >= :nump") + .setParameter("froml", fromL) + .setParameter("tol", toL) + .setParameter("nump", numPassengers) + .getResultList(); } @@ -168,37 +173,11 @@ @Override @Transactional - public void createTransportAvailable(Transport transport, String departureLocation, String arrivalLocation, Date date, Integer noSeats, Date departureHour, Collection routes) { - TransportAvailible ta=new TransportAvailible(transport,departureLocation,arrivalLocation,date,noSeats,departureHour); + public void createTransportAvailable(TransportAvailible ta) { em.persist(ta); - List routes1 = routes.stream().toList(); - routes.forEach(x -> { - createTransportRoute(ta, x.getFrom(), x.getTo(), x.getPrice(), x.getDeparture(), x.getArrival(), x.getFreeSpace(), x.getOrder()); - }); - } - - @Override - @Transactional - public void editTransportReservation(Transport transport, long reservationID, String departureLocation, String arrivalLocation, Date date, Integer noSeats, User user, Date departureHour) - { -// TransportReservation tr=findTransportReservationByID(reservationID); -// tr.setTransport(transport); -// tr.setDepartureLocation(departureLocation); -// tr.setArrivalLocation(arrivalLocation); -// tr.setDate(date); -// tr.setNoSeats(noSeats); -// tr.setUser(user); -// tr.setDepartureHour(departureHour); -// em.persist(tr); - } - - @Override - public void editTransportAvailable(Transport transport, long availableID, String departureLocation, String arrivalLocation, Date date, Integer noSeats, Date departureHour) { - TransportAvailible ta=findTransportAvailableByID(availableID); - ta.setTransport(transport); - ta.setFrom(departureLocation); - ta.setTo(arrivalLocation); - ta.setDate(date); - ta.setFreeSpace(noSeats); - ta.setTime(departureHour); + + } + + @Override + public void editTransportAvailable(TransportAvailible ta) { em.persist(ta); } @@ -224,4 +203,10 @@ } + @Transactional + @Override + public void saveReservation(TransportReservation transportReservation) { + em.persist(transportReservation); + } + @Override public List findReservationByUser(User user) { @@ -235,6 +220,5 @@ @Override @Transactional - public void deleteTransportReservation(long reservationID) { - TransportReservation tr=findTransportReservationByID(reservationID); + public void deleteTransportReservation(TransportReservation tr) { em.remove(tr); } @@ -242,36 +226,32 @@ @Override @Transactional - public void deleteTransportAvailable(long availableID) { - TransportAvailible ta=findTransportAvailableByID(availableID); + public void deleteTransportAvailable(TransportAvailible ta) { em.remove(ta); } @Override - public void createTransportRoute(TransportAvailible parentRoute, String from, String to, double price, Date departure, Date arrival, int freeSpace, int order) { - TransportRoute tr = new TransportRoute(parentRoute, from, to, price, departure, arrival, freeSpace, order); + @Transactional + public void createTransportRoute(TransportRoute tr) { em.persist(tr); } @Override - public void deleteTransportRoute(long transportRouteId) { - TransportRoute tr = findTransportRouteById(transportRouteId); + public void deleteTransportRoute(TransportRoute tr) { em.remove(tr); } @Override - public void editTransportRoute(long transportRouteId, TransportAvailible parentRoute, String from, String to, double price, Date departure, Date arrival, int freeSpace, int order) { - TransportRoute tr = findTransportRouteById(transportRouteId); - tr.setParentRoute(parentRoute); - tr.setFrom(from); - tr.setTo(to); - tr.setPrice(price); - tr.setDeparture(departure); - tr.setArrival(arrival); - tr.setFreeSpace(freeSpace); - tr.setOrder(order); + public void editTransportRoute(TransportRoute tr) { em.persist(tr); } + @Override + public List findTransportReservationByTransportId(Transport t) { + return em.createQuery("SELECT tr from TransportReservation tr where tr.transportRoute.parentRoute.transport= :transport") + .setParameter("transport", t) + .getResultList(); + } + } Index: src/main/java/com/tourMate/dao/impl/UsersDaoImpl.java =================================================================== --- src/main/java/com/tourMate/dao/impl/UsersDaoImpl.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dao/impl/UsersDaoImpl.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -28,5 +28,5 @@ @Override public void createUser(String name, String surname, String email, Date birthDate, String address, String contact) { - Role r = em.find(Role.class, 1); + Role r = em.find(Role.class, 2); User user = new User(name, surname, email, passwordEncoder.encode("password"), birthDate, address, contact, r); em.persist(user); @@ -74,4 +74,26 @@ } + @Override + public List getUnapprovedUsers() { + return em.createQuery("select u from User u where not u.enabled").getResultList(); + } + + @Override + @Transactional + public void approveUserProfile(User u) { + u.setEnabled(true); + em.persist(u); + } + + @Override + public Role findById(Long id) { + return em.find(Role.class, id); + } + + @Override + @Transactional + public void updateUser(User s) { + em.persist(s); + } Index: src/main/java/com/tourMate/dto/HotelReservationUserDto.java =================================================================== --- src/main/java/com/tourMate/dto/HotelReservationUserDto.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dto/HotelReservationUserDto.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -7,4 +7,5 @@ public class HotelReservationUserDto { + private Long reservationId; private User user; private HotelRoom hotelRoom; @@ -20,5 +21,6 @@ private Boolean reviewed; - public HotelReservationUserDto(User user, HotelRoom hotelRoom, Date dateFrom, Date dateTo, Integer numBeds, String hotelName, String hotelLocation, String hotelAddress, Long hotelId, Boolean reviewed) { + public HotelReservationUserDto(Long reservationId, User user, HotelRoom hotelRoom, Date dateFrom, Date dateTo, Integer numBeds, String hotelName, String hotelLocation, String hotelAddress, Long hotelId, Boolean reviewed) { + this.reservationId = reservationId; this.user = user; this.hotelRoom = hotelRoom; @@ -31,4 +33,8 @@ this.hotelId = hotelId; this.reviewed = reviewed; + } + + public Long getReservationId() { + return reservationId; } Index: src/main/java/com/tourMate/dto/RestaurantDto.java =================================================================== --- src/main/java/com/tourMate/dto/RestaurantDto.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dto/RestaurantDto.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -5,4 +5,5 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.List; public class RestaurantDto { @@ -14,9 +15,11 @@ private String restaurantEdbs; private Collection menus = new ArrayList(); + private Collection menuImages; private Collection tables; private Collection reviews; private double averageScore; private Collection images; - public RestaurantDto(long restaurantID, String restaurantName, String restaurantLocation, String cousineType, String restaurantDescription, String restaurantEdbs, Collection menus, Collection tables, Collection reviews, double averageScore, Collection images) { + + public RestaurantDto(long restaurantID, String restaurantName, String restaurantLocation, String cousineType, String restaurantDescription, String restaurantEdbs, Collection menus, Collection tables, Collection reviews, double averageScore, Collection images, Collection menuImages) { this.restaurantID = restaurantID; this.restaurantName = restaurantName; @@ -30,4 +33,8 @@ this.averageScore = averageScore; this.images = images; + this.menuImages = menuImages; + } + public Collection getMenuImages() { + return menuImages; } @@ -119,3 +126,4 @@ this.images = images; } + } Index: src/main/java/com/tourMate/dto/RestaurantReservationDto.java =================================================================== --- src/main/java/com/tourMate/dto/RestaurantReservationDto.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) +++ src/main/java/com/tourMate/dto/RestaurantReservationDto.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -0,0 +1,37 @@ +package com.tourMate.dto; + +import com.tourMate.entities.HotelRoom; +import com.tourMate.entities.RestaurantsTable; +import com.tourMate.entities.User; + +import java.util.Date; + +public class RestaurantReservationDto { + private User user; + private RestaurantsTable restaurantsTable; + private Date dateFrom; + private Date dateTo; + + public RestaurantReservationDto(User user, RestaurantsTable restaurantsTable, Date dateFrom, Date dateTo) { + this.user = user; + this.restaurantsTable = restaurantsTable; + this.dateFrom = dateFrom; + this.dateTo = dateTo; + } + + public User getUser() { + return user; + } + + public RestaurantsTable getRestaurantsTable() { + return restaurantsTable; + } + + public Date getDateFrom() { + return dateFrom; + } + + public Date getDateTo() { + return dateTo; + } +} Index: src/main/java/com/tourMate/dto/RestaurantReservationUserDto.java =================================================================== --- src/main/java/com/tourMate/dto/RestaurantReservationUserDto.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dto/RestaurantReservationUserDto.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -8,4 +8,5 @@ public class RestaurantReservationUserDto { + private Long reservationId; private User user; private RestaurantsTable restaurantsTable; @@ -21,5 +22,6 @@ private Boolean reviewed; - public RestaurantReservationUserDto(User user, RestaurantsTable restaurantsTable, Date dateFrom, Date dateTo, Integer numPeople, String restaurantName, String restaurantLocation, String restaurantAddress, Long restaurantId, Boolean reviewed) { + public RestaurantReservationUserDto(Long reservationId, User user, RestaurantsTable restaurantsTable, Date dateFrom, Date dateTo, Integer numPeople, String restaurantName, String restaurantLocation, String restaurantAddress, Long restaurantId, Boolean reviewed) { + this.reservationId = reservationId; this.user = user; this.restaurantsTable = restaurantsTable; @@ -32,4 +34,8 @@ this.restaurantId = restaurantId; this.reviewed = reviewed; + } + + public Long getReservationId() { + return reservationId; } Index: src/main/java/com/tourMate/dto/RouteListingDto.java =================================================================== --- src/main/java/com/tourMate/dto/RouteListingDto.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dto/RouteListingDto.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -18,6 +18,7 @@ private Date time; private Collection routes; + private Double maxPrice; - public RouteListingDto(long transportAvailibleId, String from, String to, Date date, int freeSpace, Date time, Collection routes) { + public RouteListingDto(long transportAvailibleId, String from, String to, Date date, int freeSpace, Date time, Collection routes, Double maxPrice) { this.transportAvailibleId = transportAvailibleId; this.from = from; @@ -27,4 +28,5 @@ this.time = time; this.routes = routes.stream().map(x -> x.getFrom()).distinct().skip(1).toList(); + this.maxPrice = maxPrice; } @@ -84,3 +86,7 @@ this.routes = routes; } + + public Double getMaxPrice() { + return maxPrice; + } } Index: src/main/java/com/tourMate/dto/TransportDto.java =================================================================== --- src/main/java/com/tourMate/dto/TransportDto.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dto/TransportDto.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -16,7 +16,8 @@ private User owner; private String carPlate; + private Double maxPrice; private Collection availableRoutes; - public TransportDto(long transportID, String transportName, String carBrand, String carType, int carManufacturedYear, int noPassengers, int noBags, long EMBG, User owner, String carPlate, Collection availableRoutes) { + public TransportDto(long transportID, String transportName, String carBrand, String carType, int carManufacturedYear, int noPassengers, int noBags, long EMBG, User owner, String carPlate, Collection availableRoutes, Double maxPrice) { this.transportID = transportID; this.transportName = transportName; @@ -30,4 +31,5 @@ this.carPlate = carPlate; this.availableRoutes = availableRoutes; + this.maxPrice = maxPrice; } Index: src/main/java/com/tourMate/dto/TransportReservationUserDto.java =================================================================== --- src/main/java/com/tourMate/dto/TransportReservationUserDto.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/dto/TransportReservationUserDto.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -10,4 +10,5 @@ public class TransportReservationUserDto { + private Long reservationId; private User user; private TransportRoute transportRoute; @@ -19,5 +20,6 @@ private Boolean reviewed; - public TransportReservationUserDto(User user, TransportRoute transportRoute, Long transportId, Integer numPeople, String carBrand, String carType, User owner, Boolean reviewed) { + public TransportReservationUserDto(Long reservationId, User user, TransportRoute transportRoute, Long transportId, Integer numPeople, String carBrand, String carType, User owner, Boolean reviewed) { + this.reservationId = reservationId; this.user = user; this.transportRoute = transportRoute; @@ -28,4 +30,7 @@ this.owner = owner; this.reviewed = reviewed; + } + public Long getReservationId() { + return reservationId; } Index: src/main/java/com/tourMate/entities/Business.java =================================================================== --- src/main/java/com/tourMate/entities/Business.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/entities/Business.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -88,5 +88,5 @@ } - @OneToOne(fetch = FetchType.LAZY) + @OneToOne(fetch = FetchType.EAGER) @JoinColumn(name = "owner_id", unique = false, nullable = false, foreignKey = @ForeignKey(name = "fk_ref_od_biznis_kon_korisnik")) public User getUser() { @@ -107,3 +107,4 @@ this.approved = approved; } + } Index: src/main/java/com/tourMate/entities/HotelRoom.java =================================================================== --- src/main/java/com/tourMate/entities/HotelRoom.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/entities/HotelRoom.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -1,3 +1,2 @@ -<<<<<<< HEAD package com.tourMate.entities; @@ -160,140 +159,2 @@ } } -======= -package com.tourMate.entities; - -import jakarta.persistence.*; -import com.fasterxml.jackson.annotation.JsonIgnore; - -import javax.validation.constraints.NotNull; - -@Entity -@Table(name="hotel_rooms", schema = "public") -public class HotelRoom { - private long hotelRoomId; - @JsonIgnore - private Hotels hotel; - private String hotelRoomDescription; - @Enumerated(EnumType.STRING) - private String hotelRoomName; - private double price; - private Boolean kitchenAvailable; - private Boolean airConditioning; - private Boolean balcony; - - public HotelRoom(long hotelRoomId, Hotels hotel, String hotelRoomDescription, String hotelRoomName, double price, Boolean kitchenAvailable, Boolean airConditioning, Boolean balcony) { - this.hotelRoomId = hotelRoomId; - this.hotel = hotel; - this.hotelRoomDescription = hotelRoomDescription; - this.hotelRoomName = hotelRoomName; - this.price = price; - this.kitchenAvailable = kitchenAvailable; - this.airConditioning = airConditioning; - this.balcony = balcony; - } - - public HotelRoom(Hotels hotel, String hotelRoomDescription, String type, - Boolean kitchenAvailable, Boolean airConditioning, Boolean balcony, double price) { - this.hotel = hotel; - this.hotelRoomDescription = hotelRoomDescription; - this.hotelRoomName = type; - this.kitchenAvailable = kitchenAvailable; - this.airConditioning = airConditioning; - this.balcony = balcony; - this.price = price; - } - - public HotelRoom(String hotelRoomDescription, String type, - Boolean kitchenAvailable, Boolean airConditioning, Boolean balcony, double price) { - this.hotel = hotel; - this.hotelRoomDescription = hotelRoomDescription; - this.hotelRoomName = type; - this.kitchenAvailable = kitchenAvailable; - this.airConditioning = airConditioning; - this.balcony = balcony; - this.price = price; - } - - public HotelRoom() { - - } - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "room_id",unique = true,nullable = false) - public long getHotelRoomId() { - return hotelRoomId; - } - - public void setHotelRoomId(long hotelRoomId) { - this.hotelRoomId = hotelRoomId; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "hotel_id", unique = false, nullable = false, foreignKey = @ForeignKey(name = "fk_ref_od_room_kon_hotel")) - public Hotels getHotel() { - return hotel; - } - - public void setHotel(Hotels hotelId) { - this.hotel = hotelId; - } - - @Column(name="hotel_room_description",unique = false,nullable = false) - @NotNull - public String getHotelRoomDescription() { - return hotelRoomDescription; - } - - public void setHotelRoomDescription(String hotelRoomDescription) { - this.hotelRoomDescription = hotelRoomDescription; - } - - @Column(name="hotel_room_price",unique = false,nullable = false) - @NotNull - public double getPrice() { - return price; - } - - @Column(name="hotel_room_name",unique = false,nullable = false) - @NotNull - public String getHotelRoomName() { - return hotelRoomName; - } - - - public void setHotelRoomName(String name) { - this.hotelRoomName = name; - } - public void setPrice(double type) { - this.price = type; - } - @Column(name="hotel_room_kitchen",unique = false,nullable = false) - @NotNull - public Boolean getKitchenAvailable() { - return kitchenAvailable; - } - - public void setKitchenAvailable(Boolean kitchenAvailable) { - this.kitchenAvailable = kitchenAvailable; - } - @Column(name="hotel_room_ac",unique = false,nullable = false) - @NotNull - public Boolean getAirConditioning() { - return airConditioning; - } - - public void setAirConditioning(Boolean airConditioning) { - this.airConditioning = airConditioning; - } - @Column(name="hotel_room_balcony",unique = false,nullable = false) - @NotNull - public Boolean getBalcony() { - return balcony; - } - - public void setBalcony(Boolean balcony) { - this.balcony = balcony; - } -} ->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) Index: src/main/java/com/tourMate/entities/HotelRoomReservations.java =================================================================== --- src/main/java/com/tourMate/entities/HotelRoomReservations.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/entities/HotelRoomReservations.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -43,5 +43,5 @@ } - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "room_id", unique = false, nullable = false, foreignKey = @ForeignKey(name = "fk_ref_od_roomres_kon_room")) public HotelRoom getHotelRoom() { @@ -59,5 +59,5 @@ } - @OneToOne(fetch = FetchType.LAZY) + @OneToOne(fetch = FetchType.EAGER) @JoinColumn(name = "user_id", unique = false, nullable = false, foreignKey = @ForeignKey(name = "fk_ref_od_roomres_kon_user")) public User getUser() { Index: src/main/java/com/tourMate/entities/MenuImages.java =================================================================== --- src/main/java/com/tourMate/entities/MenuImages.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) +++ src/main/java/com/tourMate/entities/MenuImages.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -0,0 +1,46 @@ +package com.tourMate.entities; + +import jakarta.persistence.*; +import lombok.Data; + +@Entity +public class MenuImages { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long imageId; + @ManyToOne + private Menu menu; + private String url; + + public MenuImages(Menu menu, String url) { + this.menu = menu; + this.url = url; + } + + public MenuImages() { + } + + public long getImageId() { + return imageId; + } + + public void setImageId(long imageId) { + this.imageId = imageId; + } + + public Menu getMenu() { + return menu; + } + + public void setMenu(Menu menu) { + this.menu = menu; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } +} Index: src/main/java/com/tourMate/entities/RestaurantImages.java =================================================================== --- src/main/java/com/tourMate/entities/RestaurantImages.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/entities/RestaurantImages.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -31,5 +31,5 @@ } - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name="restaurant_id",unique = false,nullable = false,foreignKey = @ForeignKey(name = "fk_ref_od_restimg_kon_restoran")) public Restaurant getRestaurant() { Index: src/main/java/com/tourMate/entities/RestaurantReservations.java =================================================================== --- src/main/java/com/tourMate/entities/RestaurantReservations.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/entities/RestaurantReservations.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -82,5 +82,5 @@ } - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "user_id", unique = false, nullable = false, foreignKey = @ForeignKey(name = "fk_ref_od_rezervacija_restoran_kon_korisnik")) public User getUser() { Index: src/main/java/com/tourMate/entities/Reviews.java =================================================================== --- src/main/java/com/tourMate/entities/Reviews.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/entities/Reviews.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -75,5 +75,5 @@ @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "hotel_id", unique = false, nullable = false, foreignKey = @ForeignKey(name = "fk_ref_od_review_kon_hotel")) + @JoinColumn(name = "hotel_id", unique = false, nullable = true, foreignKey = @ForeignKey(name = "fk_ref_od_review_kon_hotel")) public Hotels getHotel () { return hotel; @@ -85,5 +85,5 @@ @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "restaurant_id", unique = false, nullable = false, foreignKey = @ForeignKey(name = "fk_ref_od_review_kon_restorani")) + @JoinColumn(name = "restaurant_id", unique = false, nullable = true, foreignKey = @ForeignKey(name = "fk_ref_od_review_kon_restorani")) public Restaurant getRestaurant () { return restaurant; @@ -95,5 +95,5 @@ @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "transport_id", unique = false, nullable = false, foreignKey = @ForeignKey(name = "fk_ref_od_review_kon_transport")) + @JoinColumn(name = "transport_id", unique = false, nullable = true, foreignKey = @ForeignKey(name = "fk_ref_od_review_kon_transport")) public Transport getTransport () { return transport; Index: src/main/java/com/tourMate/entities/User.java =================================================================== --- src/main/java/com/tourMate/entities/User.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/entities/User.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -52,5 +52,5 @@ private Role role; @Column(name = "locked", unique = false, nullable = false) - boolean locked; + boolean locked = false; @Column(name = "enabled", unique = false, nullable = false) @@ -96,4 +96,7 @@ } + public boolean isLocked() { + return locked; + } public long getUserID() { @@ -162,5 +165,5 @@ @Override public boolean isAccountNonLocked() { - return true; + return locked; } Index: src/main/java/com/tourMate/services/BusinessManager.java =================================================================== --- src/main/java/com/tourMate/services/BusinessManager.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/services/BusinessManager.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -8,8 +8,12 @@ public void createBusiness(Business business, long userId); public List getUnapprovedBusinessesOfUser(long userId); - public void deleteBusiness(long businessId); - public List getCreatedBusinesses(); + + void deleteBusiness(long businessId); + + public List getUnapprovedBusinesses(); + public void approveBusiness(Long businessId); public Business findBusinessById (long businessId); - public void editBusiness(long businessId, String name, String phone, String address, String edbs, User user, boolean approved); public boolean hasBusiness(long userId); + + void editBusiness(long businessId, String name, String phone, String address, String edbs, User user, boolean approved); } Index: src/main/java/com/tourMate/services/HotelManager.java =================================================================== --- src/main/java/com/tourMate/services/HotelManager.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/services/HotelManager.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -2,10 +2,10 @@ import com.tourMate.dto.HotelDto; +import com.tourMate.dto.HotelReservationDto; +import com.tourMate.dto.HotelReservationUserDto; import com.tourMate.entities.*; -import org.springframework.web.multipart.MultipartFile; import java.util.Date; import java.util.List; -import java.util.Map; public interface HotelManager { @@ -24,14 +24,8 @@ public List getRoomsOfHotel (long hotelId); public HotelRoom findRoomById (long hotelRoomId); -<<<<<<< HEAD public List getRoomImages(Long hotelRoom); public void createRoom(Hotels hotel, String hotelRoomDescription, String hotelRoomName, Boolean kitchenAvailable, Boolean airConditioning, Boolean balcony, double price, int numOfBeds); -======= - public List getRoomImages(HotelRoom hotelRoom); - public void createRoom(Hotels hotel, String hotelRoomDescription, String hotelRoomName, Boolean kitchenAvailable, Boolean airConditioning, Boolean balcony, double price); ->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) public void editRoom(long hotelRoomId, Hotels hotel, String hotelRoomDescription, String hotelRoomName, Boolean kitchenAvailable, Boolean airConditioning, Boolean balcony, double price); public void deleteRoom(long hotelRoomId); - public List getRoomsAvailable(Long id); public void createRoomAvailible(HotelRoom hotelRoom, Date dateFrom, Date dateTo, int numberOfBeds); public void editRoomAvailible(long hotelRoomAvailableId, HotelRoom hotelRoom, Date dateFrom, Date dateTo, int numberOfBeds); @@ -40,9 +34,12 @@ public HotelRoomAvailable findAvailibleRoomById(long hotelRoomAvailableId); public List getRoomsAvailibility(); + public List getRoomsAvailableById(Long id); public List getRoomsAvailibilityByHotel(Hotels hotel); - public List getRoomsAvailibilityByDateAndLocation(String hotelLocation, Date dateFrom, Date dateTo, int numberOfBeds); + public List getRoomsAvailibilityByDateAndLocation(String hotelLocation, Date dateFrom, Date dateTo, int numberOfBeds, Boolean flexible); public void createReservation(Long userId, Long hotelRoomId, Long hotelRoomAvailableId, Date dateFrom, Date dateTo, Integer numberOfBeds); public void editReservation(long hotelRoomReservedId, User user, HotelRoom hotelRoom, Date dateFrom, Date dateTo, Integer numberOfBeds); public void deleteReservation(long hotelRoomReservedId); + public List findVaidReseravtionsByHotel(Long hotelId); + public List findValidHotelReservationsByUser(Long userId); public HotelRoomReservations findReservationById(long hotelRoomReservedId); public List findReservationByUser(User user); @@ -54,3 +51,4 @@ void addRoomImage(Long id, List filesToAdd); + void setReservationReviewed(Long reservationId); } Index: src/main/java/com/tourMate/services/RestaurantManager.java =================================================================== --- src/main/java/com/tourMate/services/RestaurantManager.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/services/RestaurantManager.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -2,4 +2,5 @@ import com.tourMate.dto.RestaurantDto; +import com.tourMate.dto.RestaurantReservationDto; import com.tourMate.dto.RestaurantReservationUserDto; import com.tourMate.entities.*; @@ -10,46 +11,68 @@ public interface RestaurantManager { public void createRestaurant(Restaurant restaurant, long userId); - public void deleteRestaurant(long restaurantID); + public void addMenuToRestaurant(long restaurantId, Menu menu); + public List getRestaurantsByUser(long userId); - void deleteHotel(long restaurantID); + public void deleteRestaurant(Long restaurantID); + + void deleteRestaurant(long restaurantID); public List getRestaurants(); - public Restaurant findRestaurantByID (long restaurantID); + + public Restaurant findRestaurantByID(long restaurantID); + public void addRestaurantImage(Long restaurant, List url); + public void removeRestaurantImage(long restaurantImageId); + public RestaurantImages findRestaurantImageById(long restaurantImageId); public List getRestaurantImages(long restaurantID); + public void editRestaurant(long restaurantID, String restaurantName, String restaurantLocation, String cousineType, String restaurantDescription, String restaurantEdbs, User restaurantOwner); + + void editReservation(long restaurantsTableId, RestaurantsTable rt, Date hourFrom, Date hourTo, int noSeats, User user); + public List getRestaurantTables(long restaurantID); - public List getTablesByDateAndLocation(String restaurantLocation, Date hourFrom, Date hourTo, int noSeats ); + + public List getTablesByDateAndLocation(String restaurantLocation, Date hourFrom, Date hourTo, int noSeats); + public RestaurantsTable findTableById(long tableId); + public void createTable(Long restaurantId, int noSeats); + public void editTable(Restaurant restaurant, long tableId, int noSeats); + public void deleteTable(long tableId); - public void createTableAvailable(Long rt, Date hourFrom, Date hourTo); + public void createTableAvailable(Long rt, Date hourFrom, Date hourTo, int numTables); public void editTableAvailable(long tableId, Restaurant restaurant, int noSeats); + public void deleteTableAvailable(long tableId); - public List getTablesAvailability(); + public List getTablesAvailabilityById(Long id); - public void createReservation(Restaurant restaurant, int noSeats); + + RestaurantsAvailible findAvailableReservationByID(long tableId); void createReservation(RestaurantsTable rt, Date dateFrom, Date dateTo, User user); - public void editReservation(long tableId, Restaurant restaurant, int noSeats); public void deleteReservation(long tableId); + public RestaurantReservations findReservationByID(long tableId); - public List findAvailableReservationByID(); - List findAvailableReservationByID(long reservationId); +// List findAvailableReservationByID(long reservationId); public List findReservationByUser(User user); - public List findReservationByRestaurant(Restaurant restaurant); + + public List findReservationByRestaurant(Long restaurant); + public List getReservations(); + public List searchByRestaurantName(String restaurantName); + public List searchByRestaurantLocation(String restaurantLocation); + public List searchByNoSeats(int noSeats); @@ -61,3 +84,13 @@ List findPastRestaurantReservationsByUser(Long userId); + + List getMenuImages(Long id); + + void addMenuImage(Long restaurant, List url); + + Menu findMenuById(Long menuId); + + void setReservationReviewed(Long reservationId); + + List getMenuImagesByRestaurant(long restaurantId); } Index: src/main/java/com/tourMate/services/ReviewManager.java =================================================================== --- src/main/java/com/tourMate/services/ReviewManager.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/services/ReviewManager.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -9,5 +9,5 @@ public interface ReviewManager{ - public void createReview(String title, int numStar, String description, Long hotel, Long restaurant, Long transport); + public void createReview(String title, int numStar, String description, Long hotel, Long restaurant, Long transport, Long reservationId); public void deleteReview(long id); public Reviews findReviewById(long id); Index: src/main/java/com/tourMate/services/TransportManager.java =================================================================== --- src/main/java/com/tourMate/services/TransportManager.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/services/TransportManager.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -13,5 +13,5 @@ public interface TransportManager { - public void createTransport(String transportName, String carBrand, String carType, int carManufacturedYear, int noPassengers, int noBags, long EMBG, User owner, String carPlate); + public void createTransport(String transportName, String carBrand, String carType, int carManufacturedYear, int noPassengers, int noBags, long EMBG, Long userId, String carPlate); public void deleteTransport(long transportId); @@ -30,4 +30,6 @@ public TransportReservation findTransportReservationByID(long reservationID); + List findTransportReservationByTransportId(long reservationID); + public List getTransportReservations(); @@ -35,11 +37,7 @@ public Transport getTransportById(long transportId); -<<<<<<< HEAD List getReviewsForTransport(long transportId); public List getTransportsAvailableByFilters (String from, String to, Date date, int numPassengers); -======= - public List getTransportsAvailableByFilters (String from, String to, Date date); ->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) public List getTransportsReservationsByUserID(long userID); @@ -48,7 +46,4 @@ public void createTransportAvailable(Transport transport, String departureLocation, String arrivalLocation, Date date, Integer noSeats, Date departureHour, Collection routes); - - public void editTransportReservation(Transport transport, long reservationID, String departureLocation, String arrivalLocation, Date date, Integer noSeats, User user, Date departureHour); - public void editTransportAvailable(Transport transport, long availableID, String departureLocation, String arrivalLocation, Date date, Integer noSeats, Date departureHour); @@ -67,4 +62,6 @@ List findPastTransportReservationsByUser(Long userId); + + void setReservationReviewed(Long reservationId); } Index: src/main/java/com/tourMate/services/UsersManager.java =================================================================== --- src/main/java/com/tourMate/services/UsersManager.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/services/UsersManager.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -16,3 +16,7 @@ public void editUser(long userID, String name, String surname, String email, Date birthDate, String address, String contact); + public List getUnapprovedUsers(); + public void approveUserProfile(long userId); + + void unlock(Long id); } Index: src/main/java/com/tourMate/services/impl/BusinessManagerImpl.java =================================================================== --- src/main/java/com/tourMate/services/impl/BusinessManagerImpl.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/services/impl/BusinessManagerImpl.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -2,7 +2,10 @@ import com.tourMate.dao.BusinessDao; +import com.tourMate.dao.UsersDao; import com.tourMate.entities.Business; +import com.tourMate.entities.Role; import com.tourMate.entities.User; import com.tourMate.services.BusinessManager; +import com.tourMate.services.UsersManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,29 +19,54 @@ @Autowired BusinessDao businessDao; + @Autowired + UsersDao usersDao; + @Autowired + UsersManager usersManager; @Override public void createBusiness(Business business, long userId) { - businessDao.createBusiness(business, userId); + User u = usersManager.findUserByID(userId); + business.setUser(u); + businessDao.createBusiness(business); } @Override public List getUnapprovedBusinessesOfUser(long userId) { - return businessDao.getUnapprovedBusinessesOfUser(userId); + User u = usersManager.findUserByID(userId); + return businessDao.getUnapprovedBusinessesOfUser(u); } @Override public void deleteBusiness(long businessId) { - businessDao.deleteBusiness(businessId); + Business business = businessDao.findBusinessById(businessId); + businessDao.deleteBusiness(business); } @Override - public boolean hasBusiness(long userId){ - return businessDao.hasBusiness(userId); + public List getUnapprovedBusinesses() { + return businessDao.getUnapprovedBusinesses(); } @Override - public List getCreatedBusinesses() { - return businessDao.getCreatedBusinesses(); + public void approveBusiness(Long businessId) { + Business b = findBusinessById(businessId); + b.setApproved(true); + businessDao.approveBusiness(b); + changeUserRoleBusiness(b.getUser().getUserID()); + } + + private void changeUserRoleBusiness(Long userId) + { + User u = usersDao.findUserByID(userId); + Role r = usersDao.findById(3L); + u.setRole(r); + usersDao.updateUser(u); + } + + @Override + public boolean hasBusiness(long userId){ + User u = usersManager.findUserByID(userId); + return businessDao.hasBusiness(u); } @@ -50,5 +78,12 @@ @Override public void editBusiness(long businessId, String name, String phone, String address, String edbs, User user, boolean approved) { - businessDao.editBusiness(businessId, name, phone, address, edbs, user, approved); + Business business = findBusinessById(businessId); + business.setName(name); + business.setPhone(phone); + business.setAddress(address); + business.setEdbs(edbs); + business.setUser(user); + business.setApproved(approved); + businessDao.editBusiness(business); } Index: src/main/java/com/tourMate/services/impl/HotelManagerImpl.java =================================================================== --- src/main/java/com/tourMate/services/impl/HotelManagerImpl.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/services/impl/HotelManagerImpl.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -4,12 +4,13 @@ import com.tourMate.dao.UsersDao; import com.tourMate.dto.HotelDto; +import com.tourMate.dto.HotelReservationDto; +import com.tourMate.dto.HotelReservationUserDto; import com.tourMate.entities.*; import com.tourMate.services.HotelManager; +import com.tourMate.services.UsersManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; import java.time.Duration; -import java.util.Collection; import java.util.Date; import java.util.List; @@ -24,5 +25,6 @@ @Autowired UsersDao usersDao; - + @Autowired + UsersManager usersManager; @Override @@ -33,5 +35,7 @@ @Override public void createHotel(Hotels hotels, long userId) { - hotelDao.createHotel(hotels, userId); + User u = usersManager.findUserByID(userId); + hotels.setOwner(u); + hotelDao.createHotel(hotels); } @@ -39,5 +43,4 @@ @Override public List getHotels() { - List hoteli = hotelDao.getHotels(); return hotelDao.getHotels(); } @@ -45,5 +48,6 @@ @Override public List getHotelsForUser(long userId) { - return hotelDao.getHotelsForUser(userId); + User u = usersManager.findUserByID(userId); + return hotelDao.getHotelsForUser(u); } @@ -55,10 +59,19 @@ @Override public void editHotel(long hotelId, String hotelName, String hotelDescripiton, String hotelLocation, String hotelEDBS, Boolean parking, Boolean petFriendly, Boolean internetAvailable) { - hotelDao.editHotel(hotelId, hotelName, hotelDescripiton, hotelLocation, hotelEDBS, parking, petFriendly, internetAvailable); + Hotels hotel = hotelDao.findHotelByID(hotelId); + hotel.setHotelName(hotelName); + hotel.setHotelDescripiton(hotelDescripiton); + hotel.setHotelLocation(hotelLocation); + hotel.setHotelEDBS(hotelEDBS); + hotel.setParking(parking); + hotel.setPetFriendly(petFriendly); + hotel.setInternetAvailable(internetAvailable); + hotelDao.editHotel(hotel); } @Override public void deleteHotel(long hotelId) { - hotelDao.deleteHotel(hotelId); + Hotels h = findHotelByID(hotelId); + hotelDao.deleteHotel(h); } @@ -76,5 +89,6 @@ @Override public List getRoomsOfHotel(long hotelId) { - return hotelDao.getRoomsOfHotel(hotelId); + Hotels h = findHotelByID(hotelId); + return hotelDao.getRoomsOfHotel(h); } @@ -99,5 +113,6 @@ @Override public void deleteHotelImage(long hotelImageId){ - hotelDao.deleteHotelImage(hotelImageId); + HotelsImages hotelsImages = findHotelImageById(hotelImageId); + hotelDao.deleteHotelImage(hotelsImages); } @@ -108,20 +123,31 @@ @Override - public void createRoom(Hotels hotel, String hotelRoomDescription, String hotelRoomName, Boolean kitchenAvailable, Boolean airConditioning, Boolean balcony, double price) { - hotelDao.createRoom(hotel, hotelRoomDescription, hotelRoomName, kitchenAvailable, airConditioning, balcony, price); + public void createRoom(Hotels hotel, String hotelRoomDescription, String hotelRoomName, Boolean kitchenAvailable, Boolean airConditioning, Boolean balcony, double price, int numOfBeds) { + HotelRoom hotelRoom = new HotelRoom(hotel, hotelRoomDescription, hotelRoomName, kitchenAvailable, airConditioning, balcony, price, numOfBeds); + hotelDao.createRoom(hotelRoom); } @Override public void editRoom(long hotelRoomId, Hotels hotel, String hotelRoomDescription, String hotelRoomName, Boolean kitchenAvailable, Boolean airConditioning, Boolean balcony, double price) { - hotelDao.editRoom(hotelRoomId, hotel, hotelRoomDescription, hotelRoomName, kitchenAvailable, airConditioning, balcony, price); + HotelRoom hr = findRoomById(hotelRoomId); + hr.setHotel(hotel); + hr.setHotelRoomDescription(hotelRoomDescription); + hr.setHotelRoomName(hotelRoomName); + hr.setKitchenAvailable(kitchenAvailable); + hr.setAirConditioning(airConditioning); + hr.setBalcony(balcony); + hr.setPrice(price); + hotelDao.editRoom(hr); } @Override public void deleteRoom(long hotelRoomId) { - hotelDao.deleteRoom(hotelRoomId); - } - - @Override - public List getRoomsAvailable(Long id) { + HotelRoom hr = findRoomById(hotelRoomId); + hotelDao.deleteRoom(hr); + } + + + @Override + public List getRoomsAvailableById(Long id) { return hotelDao.getRoomsAvailable(id); } @@ -129,10 +155,16 @@ @Override public void createRoomAvailible(HotelRoom hotelRoom, Date dateFrom, Date dateTo, int numberOfBeds) { - hotelDao.createRoomAvailible(hotelRoom, dateFrom, dateTo, numberOfBeds); + HotelRoomAvailable hra = new HotelRoomAvailable(hotelRoom, dateFrom, dateTo, numberOfBeds); + hotelDao.createRoomAvailible(hra); } @Override public void editRoomAvailible(long hotelRoomAvailableId, HotelRoom hotelRoom, Date dateFrom, Date dateTo, int numberOfBeds) { - hotelDao.editRoomAvailible(hotelRoomAvailableId, hotelRoom, dateFrom, dateTo, numberOfBeds); + HotelRoomAvailable hr = findAvailibleRoomById(hotelRoomAvailableId); + hr.setHotelRoom(hotelRoom); + hr.setDateFrom(dateFrom); + hr.setDateTo(dateTo); + hr.setNumberOfBeds(numberOfBeds); + hotelDao.editRoomAvailible(hr); } @@ -142,11 +174,14 @@ roomAvailable.setNumberOfBeds(numberOfBeds-1); HotelRoom room = hotelDao.findRoomById(hotelRoomId); - hotelDao.createRoomAvailible(room, roomAvailable.getDateFrom(), from, 1); - hotelDao.createRoomAvailible(room, to, roomAvailable.getDateTo(), 1); + HotelRoomAvailable hra = new HotelRoomAvailable(room,roomAvailable.getDateFrom(),from,1); + hotelDao.createRoomAvailible(hra); + HotelRoomAvailable hra1 = new HotelRoomAvailable(room,to,roomAvailable.getDateTo(),1); + hotelDao.createRoomAvailible(hra1); } @Override public void deleteRoomAvailible(long hotelRoomAvailableId) { - hotelDao.deleteRoomAvailible(hotelRoomAvailableId); + HotelRoomAvailable hra = findAvailibleRoomById(hotelRoomAvailableId); + hotelDao.deleteRoomAvailible(hra); } @@ -167,7 +202,7 @@ @Override - public List getRoomsAvailibilityByDateAndLocation(String hotelLocation, Date dateFrom, Date dateTo, int numberOfBeds) { + public List getRoomsAvailibilityByDateAndLocation(String hotelLocation, Date dateFrom, Date dateTo, int numberOfBeds, Boolean flexible) { long numberOfNights = Duration.between(dateFrom.toInstant(), dateTo.toInstant()).toDays(); - List roomsAvailible = hotelDao.getRoomsAvailibilityByDateAndLocation(hotelLocation, dateFrom, dateTo, numberOfBeds); + List roomsAvailible = hotelDao.getRoomsAvailibilityByDateAndLocation(hotelLocation, dateFrom, dateTo, numberOfBeds, flexible); Map> roomsByHotels = roomsAvailible.stream().collect(Collectors.groupingBy(x -> x.getHotelRoom().getHotel())); List hotelsList = roomsByHotels.keySet().stream() @@ -195,20 +230,30 @@ HotelRoom room = hotelDao.findRoomById(hotelRoomId); User user = usersDao.findUserByID(userId); - hotelDao.createReservation(user, room, dateFrom, dateTo, numberOfBeds); + HotelRoomReservations r = new HotelRoomReservations(user, room, dateFrom, dateTo, numberOfBeds); editRoomAvailibleReservation(hotelRoomAvailableId, hotelRoomId, dateFrom, dateTo, numberOfBeds); + hotelDao.createReservation(r); + } @Override public void editReservation(long hotelRoomReservedId, User user, HotelRoom hotelRoom, Date dateFrom, Date dateTo, Integer numberOfBeds) { - hotelDao.editReservation(hotelRoomReservedId, user, hotelRoom, dateFrom, dateTo, numberOfBeds); + HotelRoomReservations hr = findReservationById(hotelRoomReservedId); + hr.setUser(user); + hr.setHotelRoom(hotelRoom); + hr.setDateFrom(dateFrom); + hr.setDateTo(dateTo); + hr.setNumberOfBeds(numberOfBeds); + hotelDao.editReservation(hr); } @Override public void deleteReservation(long hotelRoomReservedId) { - hotelDao.deleteReservation(hotelRoomReservedId); - } - - @Override -<<<<<<< HEAD + HotelRoomReservations r = findReservationById(hotelRoomReservedId); + HotelRoomAvailable hra = new HotelRoomAvailable(r.getHotelRoom(), r.getDateFrom(), r.getDateTo(), r.getNumberOfBeds()); + hotelDao.createRoomAvailible(hra); + hotelDao.deleteReservation(r); + } + + @Override public List findVaidReseravtionsByHotel(Long hotelId) { Hotels hotel = findHotelByID(hotelId); @@ -230,4 +275,5 @@ List reservations = hotelDao.findReservationByUser(u); return reservations.stream().map(x -> new HotelReservationUserDto( + x.getHotelRoomReservedId(), x.getUser(), x.getHotelRoom(), @@ -244,6 +290,4 @@ @Override -======= ->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) public HotelRoomReservations findReservationById(long hotelRoomReservedId) { return hotelDao.findReservationById(hotelRoomReservedId); @@ -276,4 +320,5 @@ List reservations = hotelDao.findPastReservationByUser(u); return reservations.stream().map(x -> new HotelReservationUserDto( + x.getHotelRoomReservedId(), x.getUser(), x.getHotelRoom(), @@ -294,3 +339,10 @@ filesToAdd.stream().map(file -> new HotelRoomImages(hr, file)).forEach(x -> hotelDao.addRoomImage(x)); } + + @Override + public void setReservationReviewed(Long reservationId) { + HotelRoomReservations hotelRoomReservations = findReservationById(reservationId); + hotelRoomReservations.setReviewed(true); + hotelDao.saveReservation(hotelRoomReservations); + } } Index: src/main/java/com/tourMate/services/impl/ImageManagerImpl.java =================================================================== --- src/main/java/com/tourMate/services/impl/ImageManagerImpl.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/services/impl/ImageManagerImpl.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -56,4 +56,8 @@ hotelManager.addRoomImage(id, filesToAdd); } + else if(type.equals("menu")) + { + restaurantManager.addMenuImage(id, filesToAdd); + } return filesToAdd; Index: src/main/java/com/tourMate/services/impl/MenuManagerImpl.java =================================================================== --- src/main/java/com/tourMate/services/impl/MenuManagerImpl.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/services/impl/MenuManagerImpl.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -17,10 +17,11 @@ @Override public void createMenu(String name, String ingredients, double price) { - menuDao.createMenu(name, ingredients, price); + menuDao.createMenu(new Menu(name, ingredients, price)); } @Override public void deleteMenu(long menuId) { - menuDao.deleteMenu(menuId); + Menu menu = findMenuById(menuId); + menuDao.deleteMenu(menu); } @@ -37,5 +38,9 @@ @Override public void editMenu(long menuId, String name, String ingredients, double price) { - menuDao.editMenu(menuId, name, ingredients, price); + Menu menu = findMenuById(menuId); + menu.setName(name); + menu.setIngredients(ingredients); + menu.setPrice(price); + menuDao.editMenu(menu); } } Index: src/main/java/com/tourMate/services/impl/RestaurantManagerImpl.java =================================================================== --- src/main/java/com/tourMate/services/impl/RestaurantManagerImpl.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/services/impl/RestaurantManagerImpl.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -3,4 +3,5 @@ import com.tourMate.dao.RestaurantDao; import com.tourMate.dto.RestaurantDto; +import com.tourMate.dto.RestaurantReservationDto; import com.tourMate.dto.RestaurantReservationUserDto; import com.tourMate.services.RestaurantManager; @@ -22,29 +23,35 @@ @Autowired UsersManager usersManager; + @Override public void createRestaurant(Restaurant restaurant, long userId) { - restaurantDao.createRestaurant(restaurant, userId); - } - - + User u = usersManager.findUserByID(userId); + Restaurant r = new Restaurant(restaurant.getRestaurantName(), restaurant.getRestaurantLocation(), restaurant.getCousineType(), restaurant.getRestaurantDescription(), restaurant.getRestaurantEdbs(), u); + restaurantDao.createRestaurant(r); + } + + @Override + public void deleteRestaurant(Long restaurantID) { + Restaurant r = findRestaurantByID(restaurantID); + restaurantDao.deleteRestaurant(r); + } + + @Override + public void addMenuToRestaurant(long restaurantId, Menu menu) { + Restaurant r = findRestaurantByID(restaurantId); + menu.setRestaurant(r); + restaurantDao.addMenuToRestaurant(menu); + } + + @Override + public List getRestaurantsByUser(long userId) { + User u = usersManager.findUserByID(userId); + return restaurantDao.getRestaurantsByUser(u); + } @Override public void deleteRestaurant(long restaurantID) { - restaurantDao.deleteRestaurant(restaurantID); - } - - @Override - public void addMenuToRestaurant(long restaurantId, Menu menu) { - restaurantDao.addMenuToRestaurant(restaurantId, menu); - } - - @Override - public List getRestaurantsByUser(long userId) { - return restaurantDao.getRestaurantsByUser(userId); - } - - @Override - public void deleteHotel(long restaurantID) { - restaurantDao.deleteRestaurant(restaurantID); + Restaurant r = findRestaurantByID(restaurantID); + restaurantDao.deleteRestaurant(r); } @@ -67,5 +74,6 @@ @Override public void removeRestaurantImage(long restaurantImageId) { - restaurantDao.removeRestaurantImage(restaurantImageId); + RestaurantImages restaurantImage = findRestaurantImageById(restaurantImageId); + restaurantDao.removeRestaurantImage(restaurantImage); } @@ -81,5 +89,5 @@ @Override - public List getTablesByDateAndLocation(String restaurantLocation, Date hourFrom, Date hourTo, int noSeats){ + public List getTablesByDateAndLocation(String restaurantLocation, Date hourFrom, Date hourTo, int noSeats) { List restaurantsAvailibles = restaurantDao.getTablesByDateAndLocation(restaurantLocation, hourFrom, hourTo, noSeats); Map> tablesByRestaurants = restaurantsAvailibles.stream().collect(Collectors.groupingBy(x -> x.getRestaurantTable().getRestaurant())); @@ -96,5 +104,6 @@ getReviewsForRestaurant(x.getRestaurantID()), getReviewsForRestaurant(x.getRestaurantID()).stream().mapToDouble(Reviews::getNumStar).average().orElse(0), - getRestaurantImages(x.getRestaurantID()) + getRestaurantImages(x.getRestaurantID()), + getMenuImagesByRestaurant(x.getRestaurantID()) )).toList(); return restaurantsList; @@ -103,5 +112,23 @@ @Override public void editRestaurant(long restaurantID, String restaurantName, String restaurantLocation, String cousineType, String restaurantDescription, String restaurantEdbs, User restaurantOwner) { - restaurantDao.editRestaurant(restaurantID, restaurantName, restaurantLocation, cousineType, restaurantDescription, restaurantEdbs, restaurantOwner); + Restaurant res = findRestaurantByID(restaurantID); + res.setRestaurantName(restaurantName); + res.setRestaurantLocation(restaurantLocation); + res.setRestaurantEdbs(restaurantEdbs); + res.setRestaurantDescription(restaurantDescription); + res.setRestaurantOwner(restaurantOwner); + res.setCousineType(cousineType); + restaurantDao.createRestaurant(res); + } + + @Override + public void editReservation(long restaurantsTableId, RestaurantsTable rt, Date hourFrom, Date hourTo, int noSeats, User user){ + RestaurantReservations r = findReservationByID(restaurantsTableId); + r.setTable(rt); + r.setTimeFrom(hourFrom); + r.setTimeTo(hourTo); + r.setNoSeats(noSeats); + r.setUser(user); + restaurantDao.saveReservation(r); } @@ -119,26 +146,31 @@ public void createTable(Long restaurantId, int noSeats) { Restaurant r = restaurantDao.findRestaurantByID(restaurantId); - restaurantDao.createTable(r, noSeats); + RestaurantsTable restaurantsTable = new RestaurantsTable(r, noSeats); + restaurantDao.saveTable(restaurantsTable); } @Override public void editTable(Restaurant restaurant, long tableId, int noSeats) { - restaurantDao.editTable(restaurant, tableId, noSeats); + RestaurantsTable resTable = findTableById(tableId); + resTable.setRestaurant(restaurant); + resTable.setNoSeats(noSeats); + restaurantDao.saveTable(resTable); } @Override public void deleteTable(long tableId) { - restaurantDao.deleteTable(tableId); - } - - @Override - public void createTableAvailable(Long rt, Date hourFrom, Date hourTo) { + RestaurantsTable rt = findTableById(tableId); + restaurantDao.deleteTable(rt); + } + + @Override + public void createTableAvailable(Long rt, Date hourFrom, Date hourTo, int numTables) { RestaurantsTable rtabl = findTableById(rt); - restaurantDao.createTableAvailable(rtabl, hourFrom, hourTo); - } - - @Override - public List getTablesAvailabilityById(Long id) - { + RestaurantsAvailible ra = new RestaurantsAvailible(rtabl, hourFrom, hourTo, numTables); + restaurantDao.saveTableAvailable(ra); + } + + @Override + public List getTablesAvailabilityById(Long id) { return restaurantDao.getTablesAvailabilityById(id); } @@ -146,20 +178,19 @@ @Override public void editTableAvailable(long tableId, Restaurant restaurant, int noSeats) { - restaurantDao.editTableAvailable(tableId, restaurant, noSeats); + RestaurantsTable rt = findTableById(tableId); + rt.setRestaurant(restaurant); + rt.setNoSeats(noSeats); + restaurantDao.saveTable(rt); } @Override public void deleteTableAvailable(long tableId) { - restaurantDao.deleteTableAvailable(tableId); - } - - @Override - public List getTablesAvailability() { - return null; - } - - @Override - public void createReservation(Restaurant restaurant, int noSeats) { - + RestaurantsAvailible ra = findAvailableReservationByID(tableId); + restaurantDao.deleteTableAvailable(ra); + } + + @Override + public RestaurantsAvailible findAvailableReservationByID(long tableId){ + return restaurantDao.findAvailableReservationByID(tableId); } @@ -170,29 +201,17 @@ } - @Override - public void editReservation(long tableId, Restaurant restaurant, int noSeats) { - //restaurantDao.editReservation(tableId, restaurant, noSeats); - } @Override public void deleteReservation(long tableId) { - restaurantDao.deleteReservation(tableId); + RestaurantReservations r = findReservationByID(tableId); + RestaurantsAvailible ra = new RestaurantsAvailible(r.getTable(), r.getTimeFrom(), r.getTimeTo(), r.getNoSeats()); + restaurantDao.saveTableAvailable(ra); + restaurantDao.deleteReservation(r); } @Override public RestaurantReservations findReservationByID(long tableId) { - //return restaurantDao.findReservationByID(tableId); - return null; - } - - @Override - public List findAvailableReservationByID() { - return null; - } - - @Override - public List findAvailableReservationByID(long reservationId) { - return null; - // return restaurantDao.findAvailableReservationByID(reservationId); + return restaurantDao.findReservationByID(tableId); + //return null; } @@ -203,6 +222,13 @@ @Override - public List findReservationByRestaurant(Restaurant restaurant) { - return restaurantDao.findReservationByRestaurant(restaurant); + public List findReservationByRestaurant(Long restaurant) { + Restaurant r = findRestaurantByID(restaurant); + List res = restaurantDao.findReservationByRestaurant(r); + return res.stream().map(x -> new RestaurantReservationDto( + x.getUser(), + x.getTable(), + x.getTimeFrom(), + x.getTimeTo() + )).collect(Collectors.toList()); } @@ -251,9 +277,11 @@ } - public void editTableAvailability(RestaurantsAvailible restaurantsAvailible, RestaurantsTable table, Date dateFrom, Date dateTo) - { + public void editTableAvailability(RestaurantsAvailible restaurantsAvailible, RestaurantsTable table, Date dateFrom, Date dateTo) { restaurantsAvailible.setNumTables(restaurantsAvailible.getNumTables() - 1); - restaurantDao.createTableAvailable(table, restaurantsAvailible.getHourFrom(), dateFrom, 1); - restaurantDao.createTableAvailable(table, dateTo, restaurantsAvailible.getHourTo(), 1); + RestaurantsAvailible ra1 = new RestaurantsAvailible(table, restaurantsAvailible.getHourFrom(), dateFrom, 1); + RestaurantsAvailible ra2 = new RestaurantsAvailible(table, dateTo, restaurantsAvailible.getHourTo(), 1); + + restaurantDao.saveTableAvailable(ra1); + restaurantDao.saveTableAvailable(ra2); } @@ -263,4 +291,5 @@ List reservations = restaurantDao.findReservationByUser(u); return reservations.stream().map(x -> new RestaurantReservationUserDto( + x.getReservationId(), x.getUser(), x.getTable(), @@ -281,4 +310,5 @@ List reservations = restaurantDao.findPastReservationsByUser(u); return reservations.stream().map(x -> new RestaurantReservationUserDto( + x.getReservationId(), x.getUser(), x.getTable(), @@ -293,3 +323,32 @@ )).toList(); } + + @Override + public List getMenuImages(Long id) { + return restaurantDao.getMenuImages(id); + } + + @Override + public void addMenuImage(Long menuId, List url) { + Menu r = restaurantDao.findMenuId(menuId); + url.stream().map(file -> new MenuImages(r, file)).forEach(x -> restaurantDao.addMenuImage(x)); + } + + @Override + public Menu findMenuById(Long menuId) { + return restaurantDao.findMenuId(menuId); + } + + @Override + public void setReservationReviewed(Long reservationId) { + RestaurantReservations restaurantReservations = findReservationByID(reservationId); + restaurantReservations.setReviewed(true); + restaurantDao.saveReservation(restaurantReservations); + } + + @Override + public List getMenuImagesByRestaurant(long restaurantId) { + Restaurant r = findRestaurantByID(restaurantId); + return restaurantDao.getMenuImagesByRestaurant(r); + } } Index: src/main/java/com/tourMate/services/impl/ReviewManagerImpl.java =================================================================== --- src/main/java/com/tourMate/services/impl/ReviewManagerImpl.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/services/impl/ReviewManagerImpl.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -3,8 +3,5 @@ import com.tourMate.dao.ReviewDao; import com.tourMate.dao.ReviewManager; -import com.tourMate.entities.Hotels; -import com.tourMate.entities.Restaurant; -import com.tourMate.entities.Reviews; -import com.tourMate.entities.Transport; +import com.tourMate.entities.*; import com.tourMate.services.HotelManager; import com.tourMate.services.RestaurantManager; @@ -29,5 +26,5 @@ @Override - public void createReview(String title, int numStar, String description, Long hotel, Long restaurant, Long transport) { + public void createReview(String title, int numStar, String description, Long hotel, Long restaurant, Long transport, Long reservationId) { Hotels h = null; Restaurant r = null; @@ -36,12 +33,15 @@ { h = hotelManager.findHotelByID(hotel); + hotelManager.setReservationReviewed(reservationId); } if(restaurant != null) { r = restaurantManager.findRestaurantByID(restaurant); + restaurantManager.setReservationReviewed(reservationId); } if(transport != null) { t = transportManager.getTransportById(transport); + transportManager.setReservationReviewed(reservationId); } Reviews review = new Reviews (title, numStar, description, h, r, t); @@ -51,5 +51,6 @@ @Override public void deleteReview(long id) { - reviewDao.deleteReview(id); + Reviews review = findReviewById(id); + reviewDao.deleteReview(review); } @@ -61,5 +62,12 @@ @Override public void editReview(long id, String title, String description, int numStar, Hotels hotel, Restaurant restaurant, Transport transport) { - reviewDao.editReview(id, title, description, numStar, hotel, restaurant, transport); + Reviews review = findReviewById(id); + review.setDescription(description); + review.setHotel(hotel); + review.setRestaurant(restaurant); + review.setTitle(title); + review.setNumStar(numStar); + review.setTransport(transport); + reviewDao.editReview(review); } Index: src/main/java/com/tourMate/services/impl/TransportManagerImpl.java =================================================================== --- src/main/java/com/tourMate/services/impl/TransportManagerImpl.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/services/impl/TransportManagerImpl.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -24,12 +24,16 @@ UsersManager usersManager; - @Override - public void createTransport(String transportName, String carBrand, String carType, int carManufacturedYear, int noPassengers, int noBags, long EMBG, User owner, String carPlate) { - transportDao.createTransport(transportName, carBrand, carType, carManufacturedYear, noPassengers, noBags, EMBG, owner, carPlate); + + @Override + public void createTransport(String transportName, String carBrand, String carType, int carManufacturedYear, int noPassengers, int noBags, long EMBG, Long userId, String carPlate) { + User u = usersManager.findUserByID(userId); + Transport t=new Transport(transportName,carBrand,carType,carManufacturedYear,noPassengers,noBags,EMBG,u,carPlate); + transportDao.createTransport(t); } @Override public void deleteTransport(long transportId) { - transportDao.deleteTransport(transportId); + Transport t=getTransportById(transportId); + transportDao.deleteTransport(t); } @@ -41,10 +45,12 @@ @Override public List getTransportsByUser(long userId) { - return transportDao.getTransportsByUser(userId); + User u = usersManager.findUserByID(userId); + return transportDao.getTransportsByUser(u); } @Override public List getRoutesForTransport(long transportId) { - return transportDao.getRoutesForTransport(transportId); + Transport t = getTransportById(transportId); + return transportDao.getRoutesForTransport(t); } @@ -61,5 +67,15 @@ @Override public void editTransport(long transportID, String transportName, String carBrand, String carType, int carManufacturedYear, int noPassengers, int noBags, long EMBG, User owner, String carPlate) { - transportDao.editTransport(transportID, transportName, carBrand, carType, carManufacturedYear, noPassengers, noBags, EMBG, owner, carPlate); + Transport t=getTransportById(transportID); + t.setTransportName(transportName); + t.setCarBrand(carBrand); + t.setCarType(carType); + t.setCarManufacturedYear(carManufacturedYear); + t.setNoPassengers(noPassengers); + t.setNoBags(noBags); + t.setEMBG(EMBG); + t.setOwner(owner); + t.setCarPlate(carPlate); + transportDao.editTransport(t); } @@ -78,4 +94,10 @@ @Override + public List findTransportReservationByTransportId(long reservationID) { + Transport t = getTransportById(reservationID); + return transportDao.findTransportReservationByTransportId(t); + } + + @Override public List getTransportReservations() { return transportDao.getTransportReservations(); @@ -93,5 +115,4 @@ @Override -<<<<<<< HEAD public List getReviewsForTransport(long transportId) { Transport transport = getTransportById(transportId); @@ -102,8 +123,4 @@ public List getTransportsAvailableByFilters(String from, String to, Date date, int numPassengers) { List transportAvailable = transportDao.getTransportsAvailableByFilters(from, to, date, numPassengers); -======= - public List getTransportsAvailableByFilters(String from, String to, Date date) { - List transportAvailable = transportDao.getTransportsAvailableByFilters(from, to, date); ->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl) Map> transportsByTransporter = transportAvailable.stream().collect(Collectors.groupingBy(x -> x.getParentRoute())); List transportList = transportsByTransporter.keySet().stream().toList().stream() @@ -136,40 +153,61 @@ @Override public void createTransportAvailable(Transport transport, String departureLocation, String arrivalLocation, Date date, Integer noSeats, Date departureHour, Collection routes) { - transportDao.createTransportAvailable(transport, departureLocation, arrivalLocation, date, noSeats, departureHour, routes); - } - - @Override - public void editTransportReservation(Transport transport, long reservationID, String departureLocation, String arrivalLocation, Date date, Integer noSeats, User user, Date departureHour) { - transportDao.editTransportReservation(transport, reservationID, departureLocation, arrivalLocation, date, noSeats, user, departureHour); + TransportAvailible ta=new TransportAvailible(transport,departureLocation,arrivalLocation,date,noSeats,departureHour); + transportDao.createTransportAvailable(ta); + routes.forEach(x -> { + TransportRoute tr = new TransportRoute(ta, x.getFrom(), x.getTo(), x.getPrice(), x.getDeparture(), x.getArrival(), x.getFreeSpace(), x.getOrder()); + transportDao.createTransportRoute(tr); + }); } @Override public void editTransportAvailable(Transport transport, long availableID, String departureLocation, String arrivalLocation, Date date, Integer noSeats, Date departureHour) { - transportDao.editTransportAvailable(transport, availableID, departureLocation, arrivalLocation, date, noSeats, departureHour); + TransportAvailible ta=findTransportAvailableByID(availableID); + ta.setTransport(transport); + ta.setFrom(departureLocation); + ta.setTo(arrivalLocation); + ta.setDate(date); + ta.setFreeSpace(noSeats); + ta.setTime(departureHour); + transportDao.editTransportAvailable(ta); } @Override public void deleteTransportReservation(long reservationID) { - transportDao.deleteTransportReservation(reservationID); + TransportReservation tr=findTransportReservationByID(reservationID); + transportDao.deleteTransportReservation(tr); } @Override public void deleteTransportAvailable(long availableID) { - transportDao.deleteTransportAvailable(availableID); + TransportAvailible ta=findTransportAvailableByID(availableID); + transportDao.deleteTransportAvailable(ta); } @Override public void createTransportRoute(TransportAvailible parentRoute, String from, String to, double price, Date departure, Date arrival, int freeSpace, int order) { - transportDao.createTransportRoute(parentRoute, from, to, price, departure, arrival, freeSpace, order); + TransportRoute tr = new TransportRoute(parentRoute, from, to, price, departure, arrival, freeSpace, order); + + transportDao.createTransportRoute(tr); } @Override public void deleteTransportRoute(long transportRouteId) { - transportDao.deleteTransportRoute(transportRouteId); + TransportRoute tr = transportDao.findTransportRouteById(transportRouteId); + transportDao.deleteTransportRoute(tr); } @Override public void editTransportRoute(long transportRouteId, TransportAvailible parentRoute, String from, String to, double price, Date departure, Date arrival, int freeSpace, int order) { - transportDao.editTransportRoute(transportRouteId, parentRoute, from, to, price, departure, arrival, freeSpace, order); + TransportRoute tr = transportDao.findTransportRouteById(transportRouteId); + tr.setParentRoute(parentRoute); + tr.setFrom(from); + tr.setTo(to); + tr.setPrice(price); + tr.setDeparture(departure); + tr.setArrival(arrival); + tr.setFreeSpace(freeSpace); + tr.setOrder(order); + transportDao.editTransportRoute(tr); } @@ -179,4 +217,5 @@ List reservations = transportDao.findReservationByUser(u); return reservations.stream().map(x -> new TransportReservationUserDto( + x.getReservationID(), x.getUser(), x.getTransportRoute(), @@ -195,4 +234,5 @@ List reservations = transportDao.findPastReservationByUser(u); return reservations.stream().map(x -> new TransportReservationUserDto( + x.getReservationID(), x.getUser(), x.getTransportRoute(), @@ -206,4 +246,11 @@ } + @Override + public void setReservationReviewed(Long reservationId) { + TransportReservation transportReservation = findTransportReservationByID(reservationId); + transportReservation.setReviewed(true); + transportDao.saveReservation(transportReservation); + } + } Index: src/main/java/com/tourMate/services/impl/UsersManagerImpl.java =================================================================== --- src/main/java/com/tourMate/services/impl/UsersManagerImpl.java (revision 5528b99794e1d3a36baa8eb2f1829125b75f0174) +++ src/main/java/com/tourMate/services/impl/UsersManagerImpl.java (revision 07f4e8b52fa18ab7781f9660c09d7982d8cd5a0b) @@ -45,4 +45,23 @@ @Override + public List getUnapprovedUsers() { + return usersDao.getUnapprovedUsers(); + } + + @Override + public void approveUserProfile(long userId) { + User u = findUserByID(userId); + usersDao.approveUserProfile(u); + } + + @Override + public void unlock(Long id) { + User u = findUserByID(id); + u.setLocked(!u.isLocked()); + u.setEnabled(true); + usersDao.updateUser(u); + } + + @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { return usersDao.findUserByUsername(username);