package management

Author: tsiupa-coder

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

@@ -1,6 +1,6 @@
 package com.serve.api.dto;
 
-import com.serve.api.model.Type;
+import com.serve.api.model.enumeration.Type;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/serve/api/mapper/ArriveMapper.java

@@ -1,7 +1,7 @@
 package com.serve.api.mapper;
 
 import com.serve.api.dto.ArriveDto;
-import com.serve.api.model.Arrive;
+import com.serve.api.model.entity.Arrive;
 import org.springframework.stereotype.Service;
 
 @Service

src/main/java/com/serve/api/mapper/CompanyMapper.java

@@ -1,7 +1,7 @@
 package com.serve.api.mapper;
 
 import com.serve.api.dto.CompanyDto;
-import com.serve.api.model.Company;
+import com.serve.api.model.entity.Company;
 import org.springframework.stereotype.Service;
 
 import java.util.Objects;

src/main/java/com/serve/api/mapper/UserMapper.java

@@ -1,7 +1,7 @@
 package com.serve.api.mapper;
 
 import com.serve.api.dto.UserDto;
-import com.serve.api.model.User;
+import com.serve.api.model.entity.User;
 import org.springframework.stereotype.Service;
 
 import java.util.Objects;

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

@@ -1,4 +1,4 @@
-package com.serve.api.model;
+package com.serve.api.model.diff;
 
 
 import lombok.AccessLevel;

src/main/java/com/serve/api/model/WorkTime.java renamed to src/main/java/com/serve/api/model/diff/WorkTime.java

@@ -1,5 +1,6 @@
-package com.serve.api.model;
+package com.serve.api.model.entity;
 
+import com.serve.api.model.enumeration.Type;
 import com.serve.api.model.base.BaseEntity;
 import lombok.AccessLevel;
 import lombok.Data;

src/main/java/com/serve/api/model/Arrive.java renamed to src/main/java/com/serve/api/model/entity/Arrive.java

@@ -0,0 +1,19 @@
+package com.serve.api.model.entity;
+
+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)
+@Entity(name = "company")
+public class Company extends BaseEntity {
+
+    String name;
+    String description;
+    String token;
+}

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

@@ -1,4 +1,4 @@
-package com.serve.api.model;
+package com.serve.api.model.entity;
 
 import com.serve.api.dto.UserDto;
 import com.serve.api.model.base.BaseEntity;
@@ -20,20 +20,4 @@ public class User extends BaseEntity {
     String second_name;
     @Column(name = "position")
     String position;
-
-    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());
-
-        return user;
-    }
-
-    public UserDto getDto() {
-
-        UserDto userDto = new UserDto(this.getFirst_name(), this.getSecond_name(), this.getPosition());
-        return userDto;
-    }
 }

src/main/java/com/serve/api/model/User.java renamed to src/main/java/com/serve/api/model/entity/User.java

@@ -1,4 +1,4 @@
-package com.serve.api.model;
+package com.serve.api.model.enumeration;
 
 /***
  *

src/main/java/com/serve/api/model/Type.java renamed to src/main/java/com/serve/api/model/enumeration/Type.java

@@ -1,6 +1,6 @@
 package com.serve.api.repository;
 
-import com.serve.api.model.Arrive;
+import com.serve.api.model.entity.Arrive;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.serve.api.repository;
 
-import com.serve.api.model.Company;
+import com.serve.api.model.entity.Company;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.serve.api.repository;
 
-import com.serve.api.model.User;
+import com.serve.api.model.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -2,7 +2,7 @@
 
 import com.serve.api.dto.ArriveDto;
 import com.serve.api.mapper.ArriveMapper;
-import com.serve.api.model.Arrive;
+import com.serve.api.model.entity.Arrive;
 import com.serve.api.repository.ArriveRepository;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

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

@@ -2,7 +2,7 @@
 
 import com.serve.api.dto.CompanyDto;
 import com.serve.api.mapper.CompanyMapper;
-import com.serve.api.model.Company;
+import com.serve.api.model.entity.Company;
 import com.serve.api.repository.CompanyRepository;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

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

@@ -2,7 +2,7 @@
 
 import com.serve.api.dto.UserDto;
 import com.serve.api.mapper.UserMapper;
-import com.serve.api.model.User;
+import com.serve.api.model.entity.User;
 import com.serve.api.repository.UserRepository;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;