Changeset 53765dd

Timestamp:

01/04/24 09:07:47 (11 months ago)

Author:

gjoko kostadinov <gjokokostadinov@…>

Branches:

master

Children:

e8999eb

Parents:

1413ee2

Message:

Fix bugs.

Location:

src/main

Files:

• java/edu/gjoko/schedlr/config/AppSecurityConfig.java (modified) (1 diff)
• java/edu/gjoko/schedlr/controllers/LoginController.java (modified) (1 diff)
• java/edu/gjoko/schedlr/controllers/rest/NomenclatureApi.java (modified) (2 diffs)
• java/edu/gjoko/schedlr/entity/Service.java (modified) (1 diff)
• java/edu/gjoko/schedlr/repositories/ServiceTypeRepository.java (modified) (1 diff)
• java/edu/gjoko/schedlr/services/NomenclaturesService.java (modified) (2 diffs)
• resources/data.sql (modified) (1 diff)
• resources/static/js/business_admin.js (modified) (6 diffs)
• resources/static/js/customer_admin.js (modified) (3 diffs)
• resources/static/js/homepage.js (modified) (2 diffs)
• resources/static/js/register_business.js (modified) (3 diffs)

src/main/java/edu/gjoko/schedlr/config/AppSecurityConfig.java

@@ -68 +68 @@
                 .antMatchers("/register_customer").permitAll()
                 .antMatchers("/register_business").permitAll()
-                .antMatchers("/api/nomenclatures/*").permitAll()
+                .antMatchers("/api/nomenclature/*").permitAll()
                 .antMatchers("/api/user/me").permitAll()
                 .antMatchers("/api/business").permitAll()

src/main/java/edu/gjoko/schedlr/controllers/LoginController.java

@@ -22 +22 @@
     @PostMapping(path = "/login")
     public String loginCustomer(@ModelAttribute Stakeholder customer, Model model) {
-        return "redirect:homepage";
+        return "redirect:login";
     }
 }

src/main/java/edu/gjoko/schedlr/controllers/rest/NomenclatureApi.java

@@ -2 +2 @@
 
 import edu.gjoko.schedlr.entity.BusinessType;
+import edu.gjoko.schedlr.entity.ServiceType;
 import edu.gjoko.schedlr.services.NomenclaturesService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @RestController
-@RequestMapping("api/nomenclatures")
+@RequestMapping("api/nomenclature")
 @AllArgsConstructor
 public class NomenclatureApi {
@@ -20 +23 @@
         return nomenclaturesService.getBusinessTypes();
     }
+
+    @GetMapping( "/serviceTypes/me")
+    public List<ServiceType> getServiceTypesForBusinessType( HttpServletRequest request) {
+        Long ownerId = (long) request.getSession(true).getAttribute("stakeholderId");
+        return nomenclaturesService.findAppropriateBusinessTypesForBusinessByOwnerId(ownerId);
+    }
 }

src/main/java/edu/gjoko/schedlr/entity/Service.java

@@ -56 +56 @@
     @Column(name = "service_status")
     @Enumerated(EnumType.STRING)
-    private ServiceStatus serviceStatus;
+    private ServiceStatus serviceStatus = ServiceStatus.ACTIVE;
 
     @Column(name = "created")

src/main/java/edu/gjoko/schedlr/repositories/ServiceTypeRepository.java

@@ -1 +1 @@
 package edu.gjoko.schedlr.repositories;
 
-import edu.gjoko.schedlr.entity.BusinessType;
+import edu.gjoko.schedlr.entity.Service;
 import edu.gjoko.schedlr.entity.ServiceType;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface ServiceTypeRepository extends JpaRepository<ServiceType, Long> {
+
+    List<ServiceType> findAllByBusinessType_Id(Long businessTypeId);
+
+    @Query(value = "select b.businessType.serviceTypes from Business as b " +
+            " where b.owner.id = :ownerId")
+    List<ServiceType> findAppropriateBusinessTypesForBusinessByOwnerId(Long ownerId);
 }

src/main/java/edu/gjoko/schedlr/services/NomenclaturesService.java

@@ -2 +2 @@
 
 import edu.gjoko.schedlr.entity.BusinessType;
+import edu.gjoko.schedlr.entity.ServiceType;
 import edu.gjoko.schedlr.repositories.BusinessTypeRepository;
 import edu.gjoko.schedlr.repositories.ServiceTypeRepository;
@@ -20 +21 @@
         return businessTypeRepository.findAll();
     }
+
+    public List<ServiceType> findAppropriateBusinessTypesForBusinessByOwnerId(Long ownerId) {
+        return serviceTypeRepository.findAppropriateBusinessTypesForBusinessByOwnerId(ownerId);
+    }
 }

src/main/resources/data.sql

@@ -13 +13 @@
        (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'waxing', 6),
        (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'nail extensions', 2),
-       (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'dress shortening', 1),
-       (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'holes fixing', 1);
+       (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'dress sewing', 1),
+       (nextval('hibernate_sequence'), current_timestamp, current_timestamp, 'pants shortening', 1);
 
 insert into stakeholder (id, created, phone_number, email, first_name, last_name, modified, password, stakeholder_type, username)

src/main/resources/static/js/business_admin.js

@@ -1 +1 @@
 $(document).ready(function() {
     var business = {};
-
-    getBusinessInfo().then(function (data) {
-        business = data;
-    });
+    var serviceTypeList = {};
+
+    getServiceTypes().then(function (serviceTypes) {
+        serviceTypeList = serviceTypes;
+        getBusinessInfo(serviceTypes).then(function (data) {
+            business = data;
+        });
+    });
+
+
 
     getAppointments();
@@ -71 +77 @@
 
         updateServices(servicesObj).then(function (response) {
-            getBusinessInfo().then(function (data) {
+            getBusinessInfo(serviceTypeList).then(function (data) {
                 business = data;
             });
@@ -78 +84 @@
         if (servicesForDelete.length > 0) {
             deleteServices(servicesForDelete).then(function (response) {
-                getBusinessInfo().then(function (data) {
+                getBusinessInfo(serviceTypeList).then(function (data) {
                     business = data;
                 });
@@ -101 +107 @@
 
         updateBusinessInfo(businesses).then(function() {
-            getBusinessInfo().then(function (found) {
+            getBusinessInfo(serviceTypeList).then(function (found) {
                 business = found;
             });
@@ -205 +211 @@
 }
 
-function getBusinessInfo() {
+function getServiceTypes() {
+    return $.ajax({
+        url: "http://localhost:8080/api/nomenclature/serviceTypes/me"
+    }).then(function (serviceTypes) {
+        return serviceTypes;
+    });
+}
+
+function getBusinessInfo(serviceTypeList) {
     return $.ajax({
         url: "http://localhost:8080/api/business/me"
@@ -231 +245 @@
         var $el = $("#predefined_services_admin_panel");
         $el.empty();
+        const existingServiceTypeIds = business['services'].map(service => service['serviceType']['id']);
+        const missingAddedServiceTypes = serviceTypeList.filter(serviceType => existingServiceTypeIds.indexOf(serviceType['id']) === -1);
+        //console.log(missingAddedServiceTypes);
 
         $.each(business['services'], function (index, obj) {

src/main/resources/static/js/customer_admin.js

@@ -1 +1 @@
 $(document).ready(function() {
-
-    getCustomerInfo();
+    var customer = {};
+
+    getCustomerInfo().then(function (customerData) {
+        customer = customerData;
+    });
 
     getFutureAppointments();
@@ -70 +73 @@
 
 function getCustomerInfo() {
-    $.ajax({
+    return $.ajax({
         url: "http://localhost:8080/api/customer/me"
     }).success(function (customer) {
@@ -82 +85 @@
         $('#email').val(customer['email']);
         $('#username').val(customer['username']);
+        return customer;
     }).error(function (error) {
         console.log(JSON.stringify(error));

src/main/resources/static/js/homepage.js

@@ -59 +59 @@
 
     $.ajax({
-        url: "http://localhost:8080/api/nomenclatures/businessTypes"
+        url: "http://localhost:8080/api/nomenclature/businessTypes"
     }).then(function (data) {
         businessTypes = data;
@@ -338 +338 @@
     }).then(function (data) {
         var $el = $("#reviewsModalBody");
-        $('#reviews-ul').append($('<td class="form-outline mb-4"><button type="button" id="reviews-li" class="btn btn-primary btn-block" data-bs-toggle="modal" data-bs-target="#showReviewsModal">Checkout reviews</button></td>'));
+        $('#reviews-ul').append($('<button type="button" id="reviews-li" class="btn btn-primary btn-block" data-bs-toggle="modal" data-bs-target="#showReviewsModal">Checkout reviews</button>'));
         $el.empty();
 

src/main/resources/static/js/register_business.js

@@ -2 +2 @@
     var enumerations = {};
     $.ajax({
-        url: "http://localhost:8080/api/nomenclatures/businessTypes"
+        url: "http://localhost:8080/api/nomenclature/businessTypes"
     }).then(function (data) {
         enumerations = data;
         var $el = $("#companyType");
-        //$el.empty(); // remove old options
 
         $.each(data, function (index, obj) {
@@ -103 +102 @@
         });
         businessObj['services'] = servicesObj;
-        console.log(businessObj);
         $.ajax({
             url: "http://localhost:8080/api/business",
@@ -113 +111 @@
                 alert( "Well done! You have finished the registration process. " +
                     "Please check periodically to see if the company has been approved." );
-                window.location.href = "/homepage";
+                window.location.href = "/login";
             },
             error: function(err) {