Skip to content

Commit 8fd51c4

Browse files
committed
fix mistakes and trie to add tests
1 parent 5fd5a6c commit 8fd51c4

File tree

8 files changed

+22
-2
lines changed

8 files changed

+22
-2
lines changed

pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,18 @@
5555
<artifactId>junit</artifactId>
5656
<scope>test</scope>
5757
</dependency>
58+
<dependency>
59+
<groupId>org.springframework.boot</groupId>
60+
<artifactId>spring-boot-starter-data-jpa</artifactId>
61+
</dependency>
62+
<dependency>
63+
<groupId>com.h2database</groupId>
64+
<artifactId>h2</artifactId>
65+
</dependency>
66+
<dependency>
67+
<groupId>org.springframework.boot</groupId>
68+
<artifactId>spring-boot-starter-test</artifactId>
69+
</dependency>
5870
</dependencies>
5971

6072

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import com.serve.api.dto.AdminDto;
44
import com.serve.api.model.entity.Admin;
5+
import org.springframework.stereotype.Service;
56

7+
@Service
68
public class AdminDtoMapper {
79

810
public AdminDto toDto(Admin admin) {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import com.serve.api.dto.AdminPswDto;
44
import com.serve.api.model.entity.Admin;
5+
import org.springframework.stereotype.Service;
56

7+
@Service
68
public class AdminPswMapper {
79

810
public AdminPswDto toDto(Admin admin) {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
import com.serve.api.dto.TerminalDto;
44
import com.serve.api.model.entity.Terminal;
5+
import org.springframework.stereotype.Service;
56

67
import java.util.Objects;
78

9+
@Service
810
public class TerminalMapper {
911

1012
public TerminalDto toDto(Terminal terminal) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ public class Terminal extends BaseEntity {
2020
String description;
2121

2222
@ManyToOne
23-
@JoinColumn(name = "company_id", nullable = false)
23+
@JoinColumn(name = "company_id", nullable = true)
2424
Company company;
2525
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ public class Worker extends BaseEntity {
2525
boolean isActive;
2626

2727
@ManyToOne
28-
@JoinColumn(name = "company_id", nullable = false)
28+
@JoinColumn(name = "company_id", nullable = true)
2929
Company company;
3030
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
import com.serve.api.mapper.TerminalMapper;
55
import com.serve.api.model.entity.Terminal;
66
import com.serve.api.repository.TerminalRepository;
7+
import lombok.AllArgsConstructor;
78
import org.springframework.stereotype.Service;
89

910
import java.util.List;
1011
import java.util.Objects;
1112
import java.util.stream.Collectors;
1213

1314
@Service
15+
@AllArgsConstructor
1416
public class TerminalService {
1517

1618
TerminalRepository repository;

src/main/resources/application.test.properties

Whitespace-only changes.

0 commit comments

Comments
 (0)