Index: src/main/java/com/example/domify/config/CustomUsernamePasswordAuthenticationProvider.java =================================================================== --- src/main/java/com/example/domify/config/CustomUsernamePasswordAuthenticationProvider.java (revision 9f8306e5719d5a03b6d96517cb7d316b035d6b1c) +++ src/main/java/com/example/domify/config/CustomUsernamePasswordAuthenticationProvider.java (revision 546d4ed297bce443acf230de3eff85d4aabc634f) @@ -1,113 +1,0 @@ -//package com.example.domify.config; -// -//import org.springframework.security.authentication.AuthenticationProvider; -//import org.springframework.security.authentication.BadCredentialsException; -//import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -//import org.springframework.security.core.Authentication; -//import org.springframework.security.core.AuthenticationException; -//import org.springframework.security.core.userdetails.UserDetails; -//import org.springframework.security.crypto.password.PasswordEncoder; -//import org.springframework.stereotype.Component; -// -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; -//import org.springframework.security.authentication.AuthenticationManager; -//import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -//import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; -//import org.springframework.security.config.annotation.web.builders.HttpSecurity; -//import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -//import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; -//import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer; -//import org.springframework.security.core.userdetails.User; -//import org.springframework.security.core.userdetails.UserDetails; -//import org.springframework.security.core.userdetails.UserDetailsService; -//import org.springframework.security.crypto.password.PasswordEncoder; -//import org.springframework.security.provisioning.InMemoryUserDetailsManager; -//import org.springframework.security.web.SecurityFilterChain; -// -// -//@Configuration -//@EnableWebSecurity -//@EnableMethodSecurity -//public class WebSecurityConfig { -// -// private final PasswordEncoder passwordEncoder; -// private final CustomUsernamePasswordAuthenticationProvider authProvider; -// -// public WebSecurityConfig(PasswordEncoder passwordEncoder, CustomUsernamePasswordAuthenticationProvider authProvider) { -// this.passwordEncoder = passwordEncoder; -// this.authProvider = authProvider; -// } -// -// @Bean -// public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { -// -// http -// .csrf(AbstractHttpConfigurer::disable) -// .headers((headers) -> headers -// .frameOptions(HeadersConfigurer.FrameOptionsConfig::sameOrigin) -// ) -// .authorizeHttpRequests((requests) -> requests -// .requestMatchers("/", "/home", "/assets/**", "/register") -// .permitAll() -// .requestMatchers("/admin/**").hasRole("ADMIN") -// .anyRequest() -// .authenticated() -// ) -// .formLogin((form) -> form -// .loginPage("/login") -// .permitAll() -// .failureUrl("/login?error=BadCredentials") -// .defaultSuccessUrl("/products", true) -// ) -// .logout((logout) -> logout -// .logoutUrl("/logout") -// .clearAuthentication(true) -// .invalidateHttpSession(true) -// .deleteCookies("JSESSIONID") -// .logoutSuccessUrl("/login") -// ) -// .exceptionHandling((ex) -> ex -// .accessDeniedPage("/access_denied") -// ); -// -// return http.build(); -// } -// -// // In Memory Authentication -// // @Bean -// public UserDetailsService userDetailsService() { -// UserDetails user1 = User.builder() -// .username("elena.atanasoska") -// .password(passwordEncoder.encode("ea")) -// .roles("USER") -// .build(); -// UserDetails user2 = User.builder() -// .username("darko.sasanski") -// .password(passwordEncoder.encode("ds")) -// .roles("USER") -// .build(); -// UserDetails user3 = User.builder() -// .username("ana.todorovska") -// .password(passwordEncoder.encode("at")) -// .roles("USER") -// .build(); -// UserDetails admin = User.builder() -// .username("admin") -// .password(passwordEncoder.encode("admin")) -// .roles("ADMIN") -// .build(); -// -// return new InMemoryUserDetailsManager(user1, user2, user3, admin); -// } -// -// @Bean -// public AuthenticationManager authManager(HttpSecurity http) throws Exception { -// AuthenticationManagerBuilder authenticationManagerBuilder = -// http.getSharedObject(AuthenticationManagerBuilder.class); -// authenticationManagerBuilder.authenticationProvider(authProvider); -// return authenticationManagerBuilder.build(); -// } -//} -// -// Index: src/main/java/com/example/domify/config/WebSecurityConfig.java =================================================================== --- src/main/java/com/example/domify/config/WebSecurityConfig.java (revision 9f8306e5719d5a03b6d96517cb7d316b035d6b1c) +++ src/main/java/com/example/domify/config/WebSecurityConfig.java (revision 546d4ed297bce443acf230de3eff85d4aabc634f) @@ -1,4 +1,0 @@ -//package com.example.domify.config; -// -//public class WebSecurityConfig { -//} Index: src/main/java/com/example/domify/service/impl/LeaseServiceImpl.java =================================================================== --- src/main/java/com/example/domify/service/impl/LeaseServiceImpl.java (revision 9f8306e5719d5a03b6d96517cb7d316b035d6b1c) +++ src/main/java/com/example/domify/service/impl/LeaseServiceImpl.java (revision 546d4ed297bce443acf230de3eff85d4aabc634f) @@ -43,10 +43,10 @@ @Transactional - public void rateUser(Long leaseId, Long raterId, Integer rating, boolean isRatingTenant) { + public void rateUser(Long leaseId, Long raterProfileId, Integer rating, boolean isRatingTenant) { Lease lease = leaseRepository.findById(leaseId) .orElseThrow(() -> new IllegalArgumentException("Lease not found")); - boolean isRaterLandlord = lease.getLandlord().getId().equals(raterId); - boolean isRaterTenant = lease.getTenant().getId().equals(raterId); + boolean isRaterLandlord = lease.getLandlord().getId().equals(raterProfileId); + boolean isRaterTenant = lease.getTenant().getId().equals(raterProfileId); if (!isRaterLandlord && !isRaterTenant) { @@ -63,4 +63,5 @@ UserD userToRate = isRatingTenant ? lease.getTenant().getUser() : lease.getLandlord().getUser(); + userService.updateUserRating(userToRate.getId(), BigDecimal.valueOf(rating)); } Index: src/main/java/com/example/domify/web/GlobalControllerAdvice.java =================================================================== --- src/main/java/com/example/domify/web/GlobalControllerAdvice.java (revision 546d4ed297bce443acf230de3eff85d4aabc634f) +++ src/main/java/com/example/domify/web/GlobalControllerAdvice.java (revision 546d4ed297bce443acf230de3eff85d4aabc634f) @@ -0,0 +1,31 @@ +package com.example.domify.web; + +import com.example.domify.model.UserD; +import com.example.domify.service.UserService; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.ui.Model; + +@ControllerAdvice +public class GlobalControllerAdvice { + + private final UserService userService; + + public GlobalControllerAdvice(UserService userService) { + this.userService = userService; + } + + @ModelAttribute + public void addCommonAttributes(HttpServletRequest request, Model model) { + UserD user = (UserD) request.getSession().getAttribute("user"); + model.addAttribute("user", user); + + if (user != null) { + boolean isLandlord = userService.isLandlord(user.getId()); + model.addAttribute("isLandlord", isLandlord); + } else { + model.addAttribute("isLandlord", false); + } + } +} Index: src/main/java/com/example/domify/web/LeaseController.java =================================================================== --- src/main/java/com/example/domify/web/LeaseController.java (revision 9f8306e5719d5a03b6d96517cb7d316b035d6b1c) +++ src/main/java/com/example/domify/web/LeaseController.java (revision 546d4ed297bce443acf230de3eff85d4aabc634f) @@ -11,4 +11,5 @@ import java.time.LocalDate; import java.util.List; +import java.util.Map; @Controller @@ -36,11 +37,6 @@ public String showCreateForm(@RequestParam Long listingId, @RequestParam Long tenantId, - Model model, - HttpServletRequest request) { - UserD user = (UserD) request.getSession().getAttribute("user"); - if (user == null || !userService.isLandlord(user.getId())) { - return "redirect:/login"; - } - + Model model + ) { model.addAttribute("listingId", listingId); model.addAttribute("tenantId", tenantId); @@ -85,5 +81,5 @@ listingService.save(listing); - return "redirect:/properties/" + listing.getUnit().getProperty().getId(); + return "redirect:/lease"; } catch (Exception e) { @@ -95,8 +91,4 @@ public String getUserLeases(Model model, HttpServletRequest request) { UserD user = (UserD) request.getSession().getAttribute("user"); - if (user == null) { - return "redirect:/login"; - } - List leases; if (userService.isLandlord(user.getId())) { @@ -106,4 +98,5 @@ } + model.addAttribute("isLandlord",userService.isLandlord(user.getId())); model.addAttribute("user", user); model.addAttribute("leases", leases); @@ -113,16 +106,9 @@ @GetMapping("/{id}/details") public String getLeaseDetails(@PathVariable Long id, - Model model, - HttpServletRequest request) { - UserD user = (UserD) request.getSession().getAttribute("user"); - if (user == null) { - return "redirect:/login"; - } - + Model model + ) { Lease lease = leaseService.findById(id); - model.addAttribute("lease", lease); - model.addAttribute("user", user); - return "lease-details"; + return "lease"; } @@ -146,10 +132,10 @@ } - @PostMapping("/{id}/rate-tenant") + @PostMapping("/api/leases/{id}/rate") @ResponseBody - public String rateTenant(@PathVariable Long id, - @RequestParam Integer rating, - HttpServletRequest request) { - UserD user = (UserD) request.getSession().getAttribute("user"); + public String rateUser(@PathVariable Long id, + @RequestBody Map request, + HttpServletRequest httpRequest) { + UserD user = (UserD) httpRequest.getSession().getAttribute("user"); if (user == null) { return "{\"status\":\"error\",\"message\":\"Not authenticated\"}"; @@ -157,7 +143,25 @@ try { - // Landlord rates tenant - leaseService.rateUser(id, user.getId(), rating, true); - return "{\"status\":\"success\",\"message\":\"Tenant rating saved\"}"; + Integer rating = (Integer) request.get("rating"); + if (rating == null || rating < 1 || rating > 5) { + return "{\"status\":\"error\",\"message\":\"Invalid rating\"}"; + } + + Lease lease = leaseService.findById(id); + + boolean isLandlord = lease.getLandlord().getUser().getId().equals(user.getId()); + boolean isTenant = lease.getTenant().getUser().getId().equals(user.getId()); + + if (!isLandlord && !isTenant) { + return "{\"status\":\"error\",\"message\":\"User not part of this lease\"}"; + } + + if (isLandlord) { + leaseService.rateUser(id, lease.getLandlord().getId(), rating, true); + } else { + leaseService.rateUser(id, lease.getTenant().getId(), rating, false); + } + + return "{\"status\":\"success\",\"message\":\"Rating saved successfully\"}"; } catch (Exception e) { return "{\"status\":\"error\",\"message\":\"" + e.getMessage() + "\"}"; Index: src/main/java/com/example/domify/web/ListingController.java =================================================================== --- src/main/java/com/example/domify/web/ListingController.java (revision 9f8306e5719d5a03b6d96517cb7d316b035d6b1c) +++ src/main/java/com/example/domify/web/ListingController.java (revision 546d4ed297bce443acf230de3eff85d4aabc634f) @@ -14,5 +14,4 @@ @RequestMapping(value = {"/", "/listings"}) public class ListingController { - private final AddressService addressService; private final ListingService listingService; private final UserService userService; @@ -21,6 +20,5 @@ private final TenantProfileService tenantProfileService; - public ListingController(AddressService addressService, ListingService listingService, UserService userService, UnitService unitService, InterestedService interestedService, TenantProfileService tenantProfileService) { - this.addressService = addressService; + public ListingController(ListingService listingService, UserService userService, UnitService unitService, InterestedService interestedService, TenantProfileService tenantProfileService) { this.listingService = listingService; this.userService = userService; @@ -32,14 +30,4 @@ @GetMapping public String getListings(HttpServletRequest request,Model model) { - UserD user = (UserD) request.getSession().getAttribute("user"); - if (user != null) - { - model.addAttribute("user",user); - model.addAttribute("isLandlord",userService.isLandlord(user.getId())); - }else { - model.addAttribute("user", null); - model.addAttribute("isLandlord", false); - } - model.addAttribute("listings",listingService.findAll()); return "index"; @@ -47,5 +35,5 @@ @GetMapping("/create") - public String showCreateForm(@RequestParam Long unitId, Model model) { + public String showCreateForm(@RequestParam Long unitId, Model model, HttpServletRequest request) { model.addAttribute("unitId", unitId); return "create-listing"; @@ -81,5 +69,5 @@ listingService.save(listing); - return "redirect:/properties/" + unit.getProperty().getId(); + return "redirect:/listings"; } catch (Exception e) { @@ -93,4 +81,6 @@ HttpServletRequest request) { UserD user = (UserD) request.getSession().getAttribute("user"); + if (user == null) + return "redirect:/login"; boolean isLandlord = userService.isLandlord(user.getId()); Listing listing = listingService.findById(id); @@ -101,5 +91,5 @@ @GetMapping("/{id}/applications") - public String getInterestedTenants(@PathVariable Long id, Model model) { + public String getInterestedTenants(@PathVariable Long id, Model model, HttpServletRequest request) { Listing listing = listingService.findById(id); Index: src/main/java/com/example/domify/web/LoginController.java =================================================================== --- src/main/java/com/example/domify/web/LoginController.java (revision 9f8306e5719d5a03b6d96517cb7d316b035d6b1c) +++ src/main/java/com/example/domify/web/LoginController.java (revision 546d4ed297bce443acf230de3eff85d4aabc634f) @@ -45,4 +45,3 @@ } - } Index: src/main/java/com/example/domify/web/LogoutController.java =================================================================== --- src/main/java/com/example/domify/web/LogoutController.java (revision 546d4ed297bce443acf230de3eff85d4aabc634f) +++ src/main/java/com/example/domify/web/LogoutController.java (revision 546d4ed297bce443acf230de3eff85d4aabc634f) @@ -0,0 +1,18 @@ +package com.example.domify.web; + + +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/logout") +public class LogoutController { + @GetMapping + public String logoutPage(HttpServletRequest request) { + request.getSession().invalidate(); + return "redirect:/login?logout"; + } + +} Index: src/main/java/com/example/domify/web/PropertiesController.java =================================================================== --- src/main/java/com/example/domify/web/PropertiesController.java (revision 9f8306e5719d5a03b6d96517cb7d316b035d6b1c) +++ src/main/java/com/example/domify/web/PropertiesController.java (revision 546d4ed297bce443acf230de3eff85d4aabc634f) @@ -18,26 +18,14 @@ @RequestMapping("/properties") public class PropertiesController { - private static final Logger logger = LoggerFactory.getLogger(PropertiesController.class); - private final PropertiesService propertiesService; - private final UserService userService; private final PropertyTypeRepository propertyRepository; - public PropertiesController(PropertiesService propertiesService, UserService userService, PropertyTypeRepository propertyRepository) { + public PropertiesController(PropertiesService propertiesService, PropertyTypeRepository propertyRepository) { this.propertiesService = propertiesService; - this.userService = userService; this.propertyRepository = propertyRepository; } @GetMapping("/{userId}") - public String getProperties(HttpServletRequest request, @PathVariable Long userId, Model model) { - UserD user = (UserD) request.getSession().getAttribute("user"); - if (user != null) { - model.addAttribute("user", user); - model.addAttribute("isLandlord", userService.isLandlord(user.getId())); - } else { - model.addAttribute("user", null); - model.addAttribute("isLandlord", false); - } + public String getProperties(@PathVariable Long userId, Model model) { model.addAttribute("properties", propertiesService.findByOwnerId(userId)); return "properties"; @@ -45,13 +33,5 @@ @GetMapping("/{propertyId}/details") - public String getPropertiesDetails(HttpServletRequest request, @PathVariable Long propertyId, Model model) { - UserD user = (UserD) request.getSession().getAttribute("user"); - if (user != null) { - model.addAttribute("user", user); - model.addAttribute("isLandlord", userService.isLandlord(user.getId())); - } else { - model.addAttribute("user", null); - model.addAttribute("isLandlord", false); - } + public String getPropertiesDetails(@PathVariable Long propertyId, Model model) { model.addAttribute("property", propertiesService.findDetails(propertyId).get()); return "property"; @@ -59,13 +39,5 @@ @GetMapping("/add") - public String getAddPage(HttpServletRequest request, Model model) { - UserD user = (UserD) request.getSession().getAttribute("user"); - if (user != null) { - model.addAttribute("user", user); - model.addAttribute("isLandlord", userService.isLandlord(user.getId())); - } else { - model.addAttribute("user", null); - model.addAttribute("isLandlord", false); - } + public String getAddPage( Model model) { model.addAttribute("propertyTypes", propertyRepository.findAll()); return "create-property"; Index: src/main/java/com/example/domify/web/UnitController.java =================================================================== --- src/main/java/com/example/domify/web/UnitController.java (revision 9f8306e5719d5a03b6d96517cb7d316b035d6b1c) +++ src/main/java/com/example/domify/web/UnitController.java (revision 546d4ed297bce443acf230de3eff85d4aabc634f) @@ -19,10 +19,8 @@ @RequestMapping("/units") public class UnitController { - private final UserService userService; private final UnitService unitService; private final PropertiesService propertiesService; - public UnitController(UserService userService, UnitService unitService, PropertiesService propertiesService) { - this.userService = userService; + public UnitController( UnitService unitService, PropertiesService propertiesService) { this.unitService = unitService; this.propertiesService = propertiesService; @@ -30,13 +28,5 @@ @GetMapping("/{unitId}/details") - public String getUnitDetails(HttpServletRequest request, @PathVariable Long unitId, Model model) { - UserD user = (UserD) request.getSession().getAttribute("user"); - if (user != null) { - model.addAttribute("user", user); - model.addAttribute("isLandlord", userService.isLandlord(user.getId())); - } else { - model.addAttribute("user", null); - model.addAttribute("isLandlord", false); - } + public String getUnitDetails(@PathVariable Long unitId, Model model) { model.addAttribute("unit", unitService.findDetails(unitId).get()); return "unit"; Index: src/main/resources/application.properties =================================================================== --- src/main/resources/application.properties (revision 9f8306e5719d5a03b6d96517cb7d316b035d6b1c) +++ src/main/resources/application.properties (revision 546d4ed297bce443acf230de3eff85d4aabc634f) @@ -4,5 +4,5 @@ spring.datasource.url=jdbc:postgresql://localhost:5432/domify spring.datasource.username=postgres -spring.datasource.password=miloscar15 +spring.datasource.password=stefanmilos spring.datasource.driver-class-name=org.postgresql.Driver Index: src/main/resources/templates/create-lease.html =================================================================== --- src/main/resources/templates/create-lease.html (revision 9f8306e5719d5a03b6d96517cb7d316b035d6b1c) +++ src/main/resources/templates/create-lease.html (revision 546d4ed297bce443acf230de3eff85d4aabc634f) @@ -26,33 +26,5 @@ -
-
-
-
- -

Domify

- -
-
-
- - -
-
-
-
-
+
Index: src/main/resources/templates/create-listing.html =================================================================== --- src/main/resources/templates/create-listing.html (revision 9f8306e5719d5a03b6d96517cb7d316b035d6b1c) +++ src/main/resources/templates/create-listing.html (revision 546d4ed297bce443acf230de3eff85d4aabc634f) @@ -33,33 +33,6 @@ -
-
-
-
- -

Domify

- -
-
-
- - -
-
-
-
-
+
+
Index: src/main/resources/templates/create-property.html =================================================================== --- src/main/resources/templates/create-property.html (revision 9f8306e5719d5a03b6d96517cb7d316b035d6b1c) +++ src/main/resources/templates/create-property.html (revision 546d4ed297bce443acf230de3eff85d4aabc634f) @@ -33,49 +33,5 @@ -
-
-
-
- -

Domify

- Мои огласи - Мои изнајмувања -
-
-
- - - - - - - -
-
-
-
-
+
Index: src/main/resources/templates/create-unit.html =================================================================== --- src/main/resources/templates/create-unit.html (revision 9f8306e5719d5a03b6d96517cb7d316b035d6b1c) +++ src/main/resources/templates/create-unit.html (revision 546d4ed297bce443acf230de3eff85d4aabc634f) @@ -33,33 +33,6 @@ -
-
-
-
- -

Domify

- -
-
-
- - -
-
-
-
-
+
+
Index: src/main/resources/templates/fragments/header.html =================================================================== --- src/main/resources/templates/fragments/header.html (revision 546d4ed297bce443acf230de3eff85d4aabc634f) +++ src/main/resources/templates/fragments/header.html (revision 546d4ed297bce443acf230de3eff85d4aabc634f) @@ -0,0 +1,45 @@ +
+
+
+
+ + + +

Domify

+ Мои изнајмувања +
+
+
+ + + + + + + +
+
+
+
+
Index: src/main/resources/templates/index.html =================================================================== --- src/main/resources/templates/index.html (revision 9f8306e5719d5a03b6d96517cb7d316b035d6b1c) +++ src/main/resources/templates/index.html (revision 546d4ed297bce443acf230de3eff85d4aabc634f) @@ -22,50 +22,5 @@ - -
-
-
-
- -

Domify

- Мои огласи - Мои изнајмувања -
-
-
- - - - - - - -
-
-
-
-
+
@@ -81,5 +36,4 @@