Skip to content

Commit 5b763f5

Browse files
committed
remove Admin, update entity Worker
1 parent 8fd51c4 commit 5b763f5

File tree

4 files changed

+19
-24
lines changed

4 files changed

+19
-24
lines changed

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

Lines changed: 0 additions & 19 deletions
This file was deleted.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import lombok.experimental.FieldDefaults;
88

99

10+
import javax.persistence.Column;
1011
import javax.persistence.Entity;
1112
import javax.persistence.JoinColumn;
1213
import javax.persistence.ManyToOne;
@@ -26,7 +27,7 @@ public class Arrive extends BaseEntity {
2627
@JoinColumn(name = "user_id", nullable = false)
2728
Worker worker;
2829

29-
// Link to Arrive | only for Type.exit
30+
@Column(columnDefinition = "Link to Arrive | only for Type.exit")
3031
long enter_id;
3132

3233
}

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,35 @@
44
import lombok.AccessLevel;
55
import lombok.Data;
66
import lombok.experimental.FieldDefaults;
7+
import org.aspectj.weaver.Position;
78

89
import javax.persistence.Column;
910
import javax.persistence.Entity;
1011
import javax.persistence.JoinColumn;
1112
import javax.persistence.ManyToOne;
1213

14+
15+
// TODO: 12.08.22 dataBase drop table ADMIN , and WORKER
1316
@Data
1417
@FieldDefaults(level = AccessLevel.PRIVATE)
1518
@Entity(name = "worker")
1619
public class Worker extends BaseEntity {
1720

1821
@Column(name = "firstname")
1922
String first_name;
23+
2024
@Column(name = "secondname")
2125
String second_name;
26+
2227
@Column(name = "position")
23-
String position;
28+
Position position;
29+
2430
@Column(name = "isActive")
2531
boolean isActive;
2632

27-
@ManyToOne
28-
@JoinColumn(name = "company_id", nullable = true)
29-
Company company;
33+
@Column(name = "password")
34+
String password;
35+
36+
@Column(name = "email")
37+
String email;
3038
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.serve.api.model.enumeration;
2+
3+
public enum Position {
4+
Admin, Worker, Coo
5+
}

0 commit comments

Comments
 (0)