Compare commits
3 Commits
55b906d64d
...
36e4d29063
| Author | SHA1 | Date | |
|---|---|---|---|
| 36e4d29063 | |||
| 77b6acf18a | |||
| 1f9337074e |
@@ -1,7 +1,7 @@
|
|||||||
package com.drinkool.dtos;
|
package com.drinkool.dtos;
|
||||||
|
|
||||||
|
import java.time.LocalDate;
|
||||||
import java.time.LocalTime;
|
import java.time.LocalTime;
|
||||||
import java.util.Date;
|
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import org.eclipse.microprofile.graphql.NonNull;
|
import org.eclipse.microprofile.graphql.NonNull;
|
||||||
|
|
||||||
@@ -9,7 +9,7 @@ import org.eclipse.microprofile.graphql.NonNull;
|
|||||||
public class CreateShift {
|
public class CreateShift {
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
public Date date;
|
public LocalDate date;
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
public LocalTime startTime;
|
public LocalTime startTime;
|
||||||
|
|||||||
@@ -8,9 +8,9 @@ import jakarta.persistence.JoinColumn;
|
|||||||
import jakarta.persistence.ManyToOne;
|
import jakarta.persistence.ManyToOne;
|
||||||
import jakarta.persistence.OneToMany;
|
import jakarta.persistence.OneToMany;
|
||||||
import jakarta.persistence.Table;
|
import jakarta.persistence.Table;
|
||||||
|
import java.time.LocalDate;
|
||||||
import java.time.LocalTime;
|
import java.time.LocalTime;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@@ -22,7 +22,7 @@ public class ShiftEntity extends BaseEntity {
|
|||||||
public EateryEntity eatery;
|
public EateryEntity eatery;
|
||||||
|
|
||||||
@Column(nullable = false)
|
@Column(nullable = false)
|
||||||
public Date date;
|
public LocalDate date;
|
||||||
|
|
||||||
@Column(nullable = false)
|
@Column(nullable = false)
|
||||||
public LocalTime startTime;
|
public LocalTime startTime;
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import jakarta.persistence.FetchType;
|
|||||||
import jakarta.persistence.JoinColumn;
|
import jakarta.persistence.JoinColumn;
|
||||||
import jakarta.persistence.ManyToOne;
|
import jakarta.persistence.ManyToOne;
|
||||||
import jakarta.persistence.Table;
|
import jakarta.persistence.Table;
|
||||||
import java.sql.Timestamp;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
@@ -30,11 +29,11 @@ public class ShiftRegistrationEntity extends BaseEntity {
|
|||||||
ShiftEntity registratingShift
|
ShiftEntity registratingShift
|
||||||
) {
|
) {
|
||||||
return list(
|
return list(
|
||||||
"staffId = ?1 and shift.startTime < ?2 and shift.endTime > ?3 and shift.date = ?3",
|
"staffId = ?1 and shift.startTime < ?2 and shift.endTime > ?3 and shift.date = ?4",
|
||||||
staffId,
|
staffId,
|
||||||
registratingShift.endTime,
|
registratingShift.endTime,
|
||||||
registratingShift.startTime,
|
registratingShift.startTime,
|
||||||
new Timestamp(registratingShift.date.getTime())
|
registratingShift.date
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ import com.drinkool.entities.ShiftEntity;
|
|||||||
import com.drinkool.entities.ShiftRegistrationEntity;
|
import com.drinkool.entities.ShiftRegistrationEntity;
|
||||||
import io.quarkus.test.junit.QuarkusTest;
|
import io.quarkus.test.junit.QuarkusTest;
|
||||||
import jakarta.transaction.Transactional;
|
import jakarta.transaction.Transactional;
|
||||||
|
import java.time.LocalDate;
|
||||||
import java.time.LocalTime;
|
import java.time.LocalTime;
|
||||||
import java.util.Date;
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
@@ -208,7 +208,7 @@ public class ShiftServiceTest {
|
|||||||
) {
|
) {
|
||||||
ShiftEntity shift = new ShiftEntity();
|
ShiftEntity shift = new ShiftEntity();
|
||||||
shift.eatery = eatery;
|
shift.eatery = eatery;
|
||||||
shift.date = new Date();
|
shift.date = LocalDate.now();
|
||||||
shift.startTime = LocalTime.parse(start);
|
shift.startTime = LocalTime.parse(start);
|
||||||
shift.endTime = LocalTime.parse(end);
|
shift.endTime = LocalTime.parse(end);
|
||||||
shift.wage = 10000;
|
shift.wage = 10000;
|
||||||
|
|||||||
Reference in New Issue
Block a user