version 1.0

Author: tsiupa-coder

src/main/java/com/serve/api/controler/ArriveController.java

@@ -19,10 +19,10 @@
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 public class ArriveController {
 
-    ArriveService service;
-
-    @PostMapping
-    public boolean arrive(@RequestBody ArriveDto arriveDto) {
-        return service.arrive(arriveDto);
-    }
+//    ArriveService service;
+//
+//    @PostMapping
+//    public boolean arrive(@RequestBody ArriveDto arriveDto) {
+//        return service.arrive(arriveDto);
+//    }
 }

src/main/java/com/serve/api/controler/UserController.java

@@ -3,6 +3,7 @@
 import com.serve.api.dto.UserDto;
 import com.serve.api.model.User;
 import com.serve.api.service.UserService;
+import liquibase.pro.packaged.L;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.experimental.FieldDefaults;
@@ -24,7 +25,7 @@ public class UserController {
     UserService service;
 
     @GetMapping("{id}")
-    public UserDto getUser(@PathVariable String id) {
+    public UserDto getUser(@PathVariable Long id) {
 
 
         return service.get(id);

src/main/java/com/serve/api/dto/UserDto.java

@@ -15,5 +15,4 @@ public class UserDto {
     String first_name;
     String second_name;
     String position;
-    String companyname;
 }

src/main/java/com/serve/api/model/Arrive.java

@@ -1,16 +1,19 @@
 package com.serve.api.model;
 
 import com.serve.api.dto.ArriveDto;
-import com.serve.api.dto.UserDto;
+import com.serve.api.model.base.BaseEntity;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.experimental.FieldDefaults;
 
+import javax.persistence.Entity;
+
 @Data
 @FieldDefaults(level= AccessLevel.PRIVATE)
 @AllArgsConstructor
-public class Arrive {
+@Entity(name = "arrive")
+public class Arrive extends BaseEntity {
     String company_id;
     String user_token;
     Type type;
@@ -25,7 +28,6 @@ public ArriveDto toDto() {
     public static Arrive getArrive(ArriveDto dto) {
 
         Arrive arrive = new Arrive(dto.getCompany_id(), dto.getUser_token(), dto.getType());
-
         return arrive;
     }
 }

src/main/java/com/serve/api/model/Company.java

@@ -1,13 +1,17 @@
 package com.serve.api.model;
 
 import com.serve.api.dto.CompanyDto;
+import com.serve.api.model.base.BaseEntity;
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.experimental.FieldDefaults;
 
+import javax.persistence.Entity;
+
 @Data
 @FieldDefaults(level= AccessLevel.PRIVATE)
-public class Company {
+@Entity(name = "company")
+public class Company extends BaseEntity {
 
     String name;
     String description;

src/main/java/com/serve/api/model/User.java

@@ -1,38 +1,41 @@
 package com.serve.api.model;
 
 import com.serve.api.dto.UserDto;
+import com.serve.api.model.base.BaseEntity;
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.experimental.FieldDefaults;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.ManyToMany;
 import java.util.ArrayList;
 
 @Data
 @FieldDefaults(level= AccessLevel.PRIVATE)
-public class User {
+@Entity(name = "users")
+public class User extends BaseEntity {
 
+    @Column(name = "firstname")
     String first_name;
+    @Column(name = "secondname")
     String second_name;
+    @Column(name = "position")
     String position;
-    ArrayList<WorkTime> works;
-    Company company;
 
     public static User getUser(UserDto userDto) {
 
         User user = new User();
         user.setFirst_name(userDto.getFirst_name());
         user.setSecond_name(user.getSecond_name());
         user.setPosition(user.getPosition());
-        Company companyUser = new Company();
-        companyUser.setName(userDto.getCompanyname());
-        user.setCompany(companyUser);
 
         return user;
     }
 
     public UserDto getDto() {
 
-        UserDto userDto = new UserDto(this.getFirst_name(), this.getSecond_name(), this.getPosition(), this.getCompany().getName());
+        UserDto userDto = new UserDto(this.getFirst_name(), this.getSecond_name(), this.getPosition());
         return userDto;
     }
 }

src/main/java/com/serve/api/model/WorkTime.java

@@ -5,8 +5,6 @@
 import lombok.Data;
 import lombok.experimental.FieldDefaults;
 
-import java.util.Date;
-
 @Data
 @FieldDefaults(level= AccessLevel.PRIVATE)
 public class WorkTime {

src/main/java/com/serve/api/model/base/BaseEntity.java

@@ -0,0 +1,24 @@
+package com.serve.api.model.base;
+
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.UpdateTimestamp;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import java.time.LocalDateTime;
+
+@MappedSuperclass
+public class BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    public Long id;
+
+    @CreationTimestamp
+    private LocalDateTime createDateTime;
+
+    @UpdateTimestamp
+    private LocalDateTime updateDateTime;
+}

src/main/java/com/serve/api/repository/ArriveRepository.java

@@ -1,10 +1,10 @@
 package com.serve.api.repository;
 
 import com.serve.api.model.Arrive;
+import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface ArriveRepository {
+public interface ArriveRepository extends CrudRepository<Arrive, Long>{
 
-    public boolean arrive(Arrive arrive);
 }

src/main/java/com/serve/api/repository/CompanyRepository.java

@@ -1,15 +1,15 @@
 package com.serve.api.repository;
 
 import com.serve.api.model.Company;
+import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 import java.util.Optional;
 
 @Repository
-public interface CompanyRepository {
+public interface CompanyRepository extends CrudRepository<Company, Long> {
 
-    public Optional<Company> get(String id);
-    public List<Company> get();
-    public boolean create(Company company);
+//    public Optional<Company> get(String id);
+//    public List<Company> get();
 }

src/main/java/com/serve/api/repository/UserRepository.java

@@ -1,15 +1,16 @@
 package com.serve.api.repository;
 
 import com.serve.api.model.User;
+import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 import java.util.Optional;
 
 @Repository
-public interface UserRepository {
+public interface UserRepository extends CrudRepository<User, Long> {
 
-    Optional<User> get(String id);
-    boolean create(User user);
-    List<User> getAll();
+//    Optional<User> get(String id);
+//    boolean create(User user);
+//    List<User> getAll();
 }

src/main/java/com/serve/api/service/ArriveService.java

@@ -13,11 +13,11 @@
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 public class ArriveService {
 
-    ArriveRepository repository;
-
-    public boolean arrive(ArriveDto arriveDto) {
-
-        return repository.arrive(Arrive.getArrive(arriveDto));
-
-    }
+//    ArriveRepository repository;
+//
+//    public boolean arrive(ArriveDto arriveDto) {
+//
+//        return repository.arrive(Arrive.getArrive(arriveDto));
+//
+//    }
 }

src/main/java/com/serve/api/service/CompanyService.java

@@ -21,19 +21,15 @@ public class CompanyService {
 
     public CompanyDto get(String id) {
 
-        return repository.get(id).orElseThrow().toDto();
+        return null;
     }
 
     public List<CompanyDto> get(){
-        return repository
-                .get()
-                .stream()
-                .map(Company::toDto)
-                .collect(Collectors.toList());
+        return null;
     }
 
     public boolean create(CompanyDto company) {
 
-        return repository.create(Company.getCompany(company));
+        return false;
     }
 }

src/main/java/com/serve/api/service/UserService.java

@@ -18,19 +18,19 @@ public class UserService {
 
     UserRepository repository;
 
-    public UserDto get(String id) {
+    public UserDto get(Long id) {
 
-        return repository.get(id).orElseThrow().getDto();
+        return null;
     }
 
     public boolean create(UserDto user) {
 
 
-        return repository.create(User.getUser(user));
+        return false;
     }
 
     public List<UserDto> getAll(){
 
-        return repository.getAll().stream().map(User::getDto).collect(Collectors.toList());
+        return null;
     }
 }