Ignore:
Timestamp:
11/11/21 11:55:43 (3 years ago)
Author:
andrejTavchioski <andrej.tavchioski@…>
Branches:
master
Children:
2ace8f0
Parents:
3a58bd6
Message:

fixed deleteVraboten and deleteRegistriranParkirac

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sources/app/src/main/java/parkup/services/AdministratorService.java

    r3a58bd6 r97fbc67  
    11package parkup.services;
    22
    3 import java.time.LocalDateTime;
    43import java.util.List;
    54import java.util.Objects;
    … …  
    1413import org.springframework.stereotype.Service;
    1514import parkup.configs.email.EmailValidator;
    16 import parkup.configs.token.ConfirmationToken;
    1715import parkup.configs.token.ConfirmationTokenService;
    1816import parkup.entities.Administrator;
    … …  
    4240    }
    4341
    44     public void addAdministrator(Administrator administrator) {
     42    public Optional<Administrator> addAdministrator(Administrator administrator) {
    4543        Optional<Administrator> administratorOpt = this.administratorRepository.findAdministratorByEmail(administrator.getEmail());
    4644        if (administratorOpt.isPresent()) {
    4745            throw new IllegalStateException("Email already taken, try adding an administrator with a different valid email address");
    4846        } else {
    49             System.out.println(administrator);
    50             this.administratorRepository.save(administrator);
     47            if (administrator.getEmail() != null && administrator.getEmail().length() > 1 && administrator.getEmail().contains("@")) {
     48                //System.out.println(regPark);
     49                this.administratorRepository.save(administrator);
     50            }
     51            else {
     52                throw new IllegalStateException("email not valid");
     53            }
    5154        }
     55        return administratorOpt;
    5256    }
    5357
    5458    @Transactional
    55     public void updateAdministrator(int administratorId, String firstName, String lastName, String mobile, String email) {
     59    public Administrator updateAdministrator(int administratorId, String firstName, String lastName, String mobile, String email) {
    5660        Optional<Administrator> administratorOpt = Optional.ofNullable(this.administratorRepository.findByAdministratorId(administratorId));
    5761        if (administratorOpt.isPresent()) {
    … …  
    6266                    throw new IllegalStateException("email taken");
    6367                }
    64 
    6568                administratorNov.setEmail(email);
     69            }else{
     70                throw new IllegalStateException("email not valid");
    6671            }
    6772
    … …  
    7782                administratorNov.setMobile(mobile);
    7883            }
     84            return administratorNov;
    7985        }
     86        else {
     87            throw new IllegalStateException("Administrator doesn't exist, therefore can't be updated");
     88        }
     89
    8090    }
    8191
    82     public void deleteAdministrator(int administratorId) {
     92    public Optional<Administrator> deleteAdministrator(int administratorId) {
    8393        Optional<Administrator> administratorOpt = Optional.ofNullable(this.administratorRepository.findByAdministratorId(administratorId));
    8494        if (administratorOpt.isPresent()) {
    … …  
    8797            throw new IllegalStateException("Administrator doesn't exist, therefore can't be deleted");
    8898        }
     99        return administratorOpt;
    89100    }
    90101
    … …  
    126137
    127138        String token = UUID.randomUUID().toString();
    128         ConfirmationToken confirmationToken = new ConfirmationToken(
    129                 token,
    130                 LocalDateTime.now(),
    131                 LocalDateTime.now().plusMinutes(15),
    132                 administrator
    133         );
     139//        ConfirmationTokenRP confirmationToken = new ConfirmationTokenRP(
     140//                token,
     141//                LocalDateTime.now(),
     142//                LocalDateTime.now().plusMinutes(15),
     143//                administrator
     144//        );
    134145
    135         confirmationTokenService.saveConfirmationToken(confirmationToken);
     146        //confirmationTokenService.saveConfirmationToken(confirmationToken);
    136147
    137148        // TODO: SEND EMAIL
Note: See TracChangeset for help on using the changeset viewer.