Skip to content

Commit 4d18a9e

Browse files
committed
rename user to worker
1 parent 6b6c265 commit 4d18a9e

File tree

8 files changed

+62
-62
lines changed

8 files changed

+62
-62
lines changed

src/main/java/com/serve/api/controler/UserController.java renamed to src/main/java/com/serve/api/controler/WorkerController.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.serve.api.controler;
22

3-
import com.serve.api.dto.UserDto;
4-
import com.serve.api.service.UserService;
3+
import com.serve.api.dto.WorkerDto;
4+
import com.serve.api.service.WorkerService;
55
import lombok.AccessLevel;
66
import lombok.AllArgsConstructor;
77
import lombok.experimental.FieldDefaults;
@@ -20,29 +20,29 @@
2020
import java.util.List;
2121

2222
import static com.serve.api.controler.endpoints.Endpoints.ID;
23-
import static com.serve.api.controler.endpoints.Endpoints.USER;
23+
import static com.serve.api.controler.endpoints.Endpoints.WORKERS;
2424

2525
@RestController
2626
@AllArgsConstructor
27-
@RequestMapping(USER)
27+
@RequestMapping(WORKERS)
2828
@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
29-
public class UserController {
29+
public class WorkerController {
3030

31-
UserService service;
31+
WorkerService service;
3232

3333
@GetMapping(ID)
34-
public UserDto getUser(@PathVariable Long id) {
34+
public WorkerDto getWorker(@PathVariable Long id) {
3535
return service.get(id);
3636
}
3737

3838
@PostMapping
3939
@ResponseStatus(code = HttpStatus.CREATED)
40-
public void create(@RequestBody UserDto user) {
41-
service.create(user);
40+
public void create(@RequestBody WorkerDto workerDto) {
41+
service.create(workerDto);
4242
}
4343

4444
@GetMapping
45-
public List<UserDto> get() {
45+
public List<WorkerDto> get() {
4646
return service.getAll();
4747
}
4848

src/main/java/com/serve/api/controler/endpoints/Endpoints.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ public class Endpoints {
44

55
public static final String ARRIVE = "/arrive";
66
public static final String COMPANY = "/company";
7-
public static final String USER = "/user";
7+
public static final String WORKERS = "/workers";
88
public static final String TERMINAL = "/terminal";
99

1010
public static final String ID = "{id}";

src/main/java/com/serve/api/dto/UserDto.java renamed to src/main/java/com/serve/api/dto/WorkerDto.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@Data
1010
@FieldDefaults(level = AccessLevel.PRIVATE)
1111
@AllArgsConstructor
12-
public class UserDto {
12+
public class WorkerDto {
1313

1414
String first_name;
1515
String second_name;

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

Lines changed: 0 additions & 31 deletions
This file was deleted.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package com.serve.api.mapper;
2+
3+
import com.serve.api.dto.WorkerDto;
4+
import com.serve.api.model.entity.Worker;
5+
import org.springframework.stereotype.Service;
6+
7+
import java.util.Objects;
8+
9+
@Service
10+
public class WorkerMapper {
11+
12+
public WorkerDto toDto(Worker worker) {
13+
14+
if (Objects.isNull(worker)) throw new NullPointerException("User is null");
15+
return new WorkerDto(worker.getFirst_name(), worker.getSecond_name(), worker.getPosition());
16+
}
17+
18+
public Worker toModel(WorkerDto dto) {
19+
20+
if (Objects.isNull(dto)) throw new NullPointerException("Dto is null");
21+
22+
Worker worker = new Worker();
23+
worker.setFirst_name(dto.getFirst_name());
24+
worker.setSecond_name(dto.getSecond_name());
25+
worker.setPosition(dto.getPosition());
26+
27+
return worker;
28+
}
29+
30+
}
31+

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
@Data
1212
@FieldDefaults(level = AccessLevel.PRIVATE)
13-
@Entity(name = "users")
14-
public class User extends BaseEntity {
13+
@Entity(name = "worker")
14+
public class Worker extends BaseEntity {
1515

1616
@Column(name = "firstname")
1717
String first_name;
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.serve.api.repository;
22

3-
import com.serve.api.model.entity.User;
3+
import com.serve.api.model.entity.Worker;
44
import org.springframework.data.jpa.repository.JpaRepository;
55
import org.springframework.stereotype.Repository;
66

77
@Repository
8-
public interface UserRepository extends JpaRepository<User, Long> {
8+
public interface WorkerRepository extends JpaRepository<Worker, Long> {
99
}

src/main/java/com/serve/api/service/UserService.java renamed to src/main/java/com/serve/api/service/WorkerService.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.serve.api.service;
22

3-
import com.serve.api.dto.UserDto;
4-
import com.serve.api.mapper.UserMapper;
5-
import com.serve.api.model.entity.User;
6-
import com.serve.api.repository.UserRepository;
3+
import com.serve.api.dto.WorkerDto;
4+
import com.serve.api.mapper.WorkerMapper;
5+
import com.serve.api.model.entity.Worker;
6+
import com.serve.api.repository.WorkerRepository;
77
import lombok.AccessLevel;
88
import lombok.AllArgsConstructor;
99
import lombok.experimental.FieldDefaults;
@@ -17,29 +17,29 @@
1717
@Service
1818
@AllArgsConstructor
1919
@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
20-
public class UserService {
20+
public class WorkerService {
2121

22-
UserRepository repository;
23-
UserMapper mapper;
22+
WorkerRepository repository;
23+
WorkerMapper mapper;
2424

25-
public UserDto get(Long id) {
25+
public WorkerDto get(Long id) {
2626

2727
if (Objects.isNull(id)) throw new NullPointerException("Id is null");
2828

2929
return mapper.toDto(repository.findById(id).orElseThrow());
3030
}
3131

32-
public void create(UserDto dto) {
32+
public void create(WorkerDto dto) {
3333

3434
if (Objects.isNull(dto)) throw new NullPointerException("User is null");
35-
User user = mapper.toModel(dto);
35+
Worker user = mapper.toModel(dto);
3636

3737
repository.save(user);
3838
}
3939

40-
public List<UserDto> getAll() {
40+
public List<WorkerDto> getAll() {
4141

42-
List<UserDto> dtos = repository.findAll().stream().map(user -> mapper.toDto(user)).collect(Collectors.toList());
42+
List<WorkerDto> dtos = repository.findAll().stream().map(user -> mapper.toDto(user)).collect(Collectors.toList());
4343

4444
return dtos;
4545
}
@@ -49,10 +49,10 @@ public void update(Long id, String position) {
4949
if (Objects.isNull(id)) throw new NullPointerException("Id is null");
5050
if (Objects.isNull(position) || position.isBlank()) throw new NullPointerException("position is null");
5151

52-
User user = repository.findById(id).orElseThrow();
53-
user.setPosition(position);
52+
Worker worker = repository.findById(id).orElseThrow();
53+
worker.setPosition(position);
5454

55-
repository.save(user);
55+
repository.save(worker);
5656
}
5757

5858
public void remove(Long id) {

0 commit comments

Comments
 (0)