fix ex_lab_2

.vscode/launch.json

@@ -6,7 +6,7 @@
             "request": "launch",
             "cwd": "${workspaceFolder}",
             "mainClass": "com.example.demo.DemoApplication",
-            "projectName": "demo",
+            "projectName": "demo-internet_programming_example",
             "args": "--populate",
             "envFile": "${workspaceFolder}/.env"
         }

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.2.2'
+	id 'org.springframework.boot' version '3.2.3'
 	id 'io.spring.dependency-management' version '1.1.4'
 }
 
@@ -17,7 +17,9 @@ repositories {
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+	implementation 'org.modelmapper:modelmapper:3.2.0'
 
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }

src/main/java/com/example/demo/ApiController.java

@@ -1,74 +0,0 @@
-package com.example.demo;
-
-import java.util.Date;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/api-test")
-public class ApiController {
-    private final Logger log = LoggerFactory.getLogger(ApiController.class);
-    // List<TestDto> data = new ArrayList<>();
-    // List<TestDto> getAll() @GetMapping
-    // TestDto get(@PathVariable() int id) @GetMapping("/{id}")
-    // TestDto create(@RequestBody TestDto obj) @PostMapping
-    // TestDto update(@PathVariable() int id, @RequestBody TestDto obj)
-    // @PutMapping("/{id}")
-    // TestDto delete(@PathVariable() int id) @DeleteMapping("/{id}")
-
-    @GetMapping
-    public String get(@RequestParam(name = "name", defaultValue = "World") String name) {
-        return String.format("Hello, %s", name);
-    }
-
-    @GetMapping("/{id}")
-    public Integer getMethodName(@PathVariable(name = "id") Integer id) {
-        return id;
-    }
-
-    @GetMapping("/test")
-    public String getTest() {
-        return new Date().toString();
-    }
-
-    @GetMapping("/num")
-    public Integer getNum() {
-        return 10;
-    }
-
-    @GetMapping("/list")
-    public List<Integer> getList() {
-        return List.of(10, 20, 30, 40, 50);
-    }
-
-    @GetMapping("/map")
-    public TestDto getMap() {
-        return new TestDto("Ivanov", "Ivan");
-    }
-
-    @PostMapping("/map")
-    public TestDto postMap(@RequestBody TestDto testDto) {
-        return testDto;
-    }
-
-    @PostMapping
-    public String postMethodName(@RequestBody String name) {
-        return get(name);
-    }
-
-    @DeleteMapping("/{name}")
-    public String putMethodName(@PathVariable(name = "name") String name, @RequestBody String entity) {
-        log.info("The body value is {}", entity);
-        return get(name);
-    }
-}

src/main/java/com/example/demo/DemoApplication.java

@@ -1,12 +1,50 @@
 package com.example.demo;
 
+import java.util.Objects;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+import com.example.demo.items.model.ItemEntity;
+import com.example.demo.items.service.ItemService;
+import com.example.demo.types.model.TypeEntity;
+import com.example.demo.types.service.TypeService;
+
 @SpringBootApplication
-public class DemoApplication {
+public class DemoApplication implements CommandLineRunner {
+	private final Logger log = LoggerFactory.getLogger(DemoApplication.class);
+
+	private final TypeService typeService;
+	private final ItemService itemService;
+
+	public DemoApplication(TypeService typeService, ItemService itemService) {
+		this.typeService = typeService;
+		this.itemService = itemService;
+	}
 
 	public static void main(String[] args) {
 		SpringApplication.run(DemoApplication.class, args);
 	}
+
+	@Override
+	public void run(String... args) throws Exception {
+		if (args.length > 0 && Objects.equals("--populate", args[0])) {
+			log.info("Create default types values");
+			final var type1 = typeService.create(new TypeEntity(null, "Ноутбук"));
+			final var type2 = typeService.create(new TypeEntity(null, "Телефон"));
+			final var type3 = typeService.create(new TypeEntity(null, "Игровая приставка"));
+
+			log.info("Create default items values");
+			itemService.create(new ItemEntity(null, type1, 49999.00, 20));
+			itemService.create(new ItemEntity(null, type1, 129999.00, 3));
+			itemService.create(new ItemEntity(null, type2, 15450.50, 30));
+			itemService.create(new ItemEntity(null, type2, 69900.50, 10));
+			itemService.create(new ItemEntity(null, type2, 150000.00, 6));
+			itemService.create(new ItemEntity(null, type3, 75000.00, 6));
+			itemService.create(new ItemEntity(null, type3, 67800.00, 3));
+		}
+	}
 }

src/main/java/com/example/demo/TestDto.java

@@ -1,29 +0,0 @@
-package com.example.demo;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class TestDto {
-    private String shortName;
-    private String fullName;
-
-    // public TestDto() {
-    // }
-
-    @JsonCreator
-    public TestDto(
-            @JsonProperty(value = "shortName") String shortName,
-            @JsonProperty(value = "fullName") String fullName) {
-        this.shortName = shortName;
-        this.fullName = fullName;
-    }
-
-    public String getShortName() {
-        return shortName;
-    }
-
-    public String getFullName() {
-        return fullName;
-    }
-
-}

src/main/java/com/example/demo/core/configuration/Constants.java

@@ -0,0 +1,8 @@
+package com.example.demo.core.configuration;
+
+public class Constants {
+    public static final String API_URL = "/api/1.0";
+
+    private Constants() {
+    }
+}

src/main/java/com/example/demo/core/configuration/MapperConfiguration.java

@@ -0,0 +1,13 @@
+package com.example.demo.core.configuration;
+
+import org.modelmapper.ModelMapper;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MapperConfiguration {
+    @Bean
+    ModelMapper modelMapper() {
+        return new ModelMapper();
+    }
+}

src/main/java/com/example/demo/core/configuration/WebConfiguration.java

@@ -1,4 +1,4 @@
-package com.example.demo;
+package com.example.demo.core.configuration;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.lang.NonNull;
@@ -6,7 +6,7 @@ import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
-public class WebConfig implements WebMvcConfigurer {
+public class WebConfiguration implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(@NonNull CorsRegistry registry) {
         registry.addMapping("/**")

src/main/java/com/example/demo/core/error/NotFoundException.java

@@ -0,0 +1,7 @@
+package com.example.demo.core.error;
+
+public class NotFoundException extends RuntimeException {
+    public NotFoundException(Long id) {
+        super(String.format("Entity with id [%s] is not found or not exists", id));
+    }
+}

src/main/java/com/example/demo/core/model/BaseEntity.java

@@ -0,0 +1,20 @@
+package com.example.demo.core.model;
+
+public abstract class BaseEntity {
+    protected Long id;
+
+    protected BaseEntity() {
+    }
+
+    protected BaseEntity(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+}

src/main/java/com/example/demo/core/repository/CommonRepository.java

@@ -0,0 +1,17 @@
+package com.example.demo.core.repository;
+
+import java.util.List;
+
+public interface CommonRepository<E, T> {
+    List<E> getAll();
+
+    E get(T id);
+
+    E create(E entity);
+
+    E update(E entity);
+
+    E delete(E entity);
+
+    void deleteAll();
+}

src/main/java/com/example/demo/core/repository/MapRepository.java

@@ -0,0 +1,57 @@
+package com.example.demo.core.repository;
+
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import com.example.demo.core.model.BaseEntity;
+
+public abstract class MapRepository<E extends BaseEntity> implements CommonRepository<E, Long> {
+    private final Map<Long, E> entities = new TreeMap<>();
+    private Long lastId = 0L;
+
+    protected MapRepository() {
+    }
+
+    @Override
+    public List<E> getAll() {
+        return entities.values().stream().toList();
+    }
+
+    @Override
+    public E get(Long id) {
+        return entities.get(id);
+    }
+
+    @Override
+    public E create(E entity) {
+        lastId++;
+        entity.setId(lastId);
+        entities.put(lastId, entity);
+        return entity;
+    }
+
+    @Override
+    public E update(E entity) {
+        if (get(entity.getId()) == null) {
+            return null;
+        }
+        entities.put(entity.getId(), entity);
+        return entity;
+    }
+
+    @Override
+    public E delete(E entity) {
+        if (get(entity.getId()) == null) {
+            return null;
+        }
+        entities.remove(entity.getId());
+        return entity;
+    }
+
+    @Override
+    public void deleteAll() {
+        lastId = 0L;
+        entities.clear();
+    }
+}

src/main/java/com/example/demo/items/api/ItemController.java

@@ -0,0 +1,70 @@
+package com.example.demo.items.api;
+
+import java.util.List;
+
+import org.modelmapper.ModelMapper;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.example.demo.core.configuration.Constants;
+import com.example.demo.items.model.ItemEntity;
+import com.example.demo.items.service.ItemService;
+import com.example.demo.types.service.TypeService;
+
+import jakarta.validation.Valid;
+
+@RestController
+@RequestMapping(Constants.API_URL + "/item")
+public class ItemController {
+    private final ItemService itemService;
+    private final TypeService typeService;
+    private final ModelMapper modelMapper;
+
+    public ItemController(ItemService itemService, TypeService typeService, ModelMapper modelMapper) {
+        this.itemService = itemService;
+        this.typeService = typeService;
+        this.modelMapper = modelMapper;
+    }
+
+    private ItemDto toDto(ItemEntity entity) {
+        return modelMapper.map(entity, ItemDto.class);
+    }
+
+    private ItemEntity toEntity(ItemDto dto) {
+        final ItemEntity entity = modelMapper.map(dto, ItemEntity.class);
+        entity.setType(typeService.get(dto.getTypeId()));
+        return entity;
+    }
+
+    @GetMapping
+    public List<ItemDto> getAll(@RequestParam(name = "typeId", defaultValue = "0") Long typeId) {
+        return itemService.getAll(typeId).stream().map(this::toDto).toList();
+    }
+
+    @GetMapping("/{id}")
+    public ItemDto get(@PathVariable(name = "id") Long id) {
+        return toDto(itemService.get(id));
+    }
+
+    @PostMapping
+    public ItemDto create(@RequestBody @Valid ItemDto dto) {
+        return toDto(itemService.create(toEntity(dto)));
+    }
+
+    @PutMapping("/{id}")
+    public ItemDto update(@PathVariable(name = "id") Long id, @RequestBody ItemDto dto) {
+        return toDto(itemService.update(id, toEntity(dto)));
+    }
+
+    @DeleteMapping("/{id}")
+    public ItemDto delete(@PathVariable(name = "id") Long id) {
+        return toDto(itemService.delete(id));
+    }
+}

src/main/java/com/example/demo/items/api/ItemDto.java

@@ -0,0 +1,57 @@
+package com.example.demo.items.api;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+
+public class ItemDto {
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private Long id;
+    @NotNull
+    @Min(1)
+    private Long typeId;
+    @NotNull
+    @Min(1)
+    private Double price;
+    @NotNull
+    @Min(1)
+    private Integer count;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Long typeId) {
+        this.typeId = typeId;
+    }
+
+    public Double getPrice() {
+        return price;
+    }
+
+    public void setPrice(Double price) {
+        this.price = price;
+    }
+
+    public Integer getCount() {
+        return count;
+    }
+
+    public void setCount(Integer count) {
+        this.count = count;
+    }
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    public Double getSum() {
+        return price * count;
+    }
+}

src/main/java/com/example/demo/items/model/ItemEntity.java

@@ -0,0 +1,65 @@
+package com.example.demo.items.model;
+
+import java.util.Objects;
+
+import com.example.demo.core.model.BaseEntity;
+import com.example.demo.types.model.TypeEntity;
+
+public class ItemEntity extends BaseEntity {
+    private TypeEntity type;
+    private Double price;
+    private Integer count;
+
+    public ItemEntity() {
+        super();
+    }
+
+    public ItemEntity(Long id, TypeEntity type, Double price, Integer count) {
+        super(id);
+        this.type = type;
+        this.price = price;
+        this.count = count;
+    }
+
+    public TypeEntity getType() {
+        return type;
+    }
+
+    public void setType(TypeEntity type) {
+        this.type = type;
+    }
+
+    public Double getPrice() {
+        return price;
+    }
+
+    public void setPrice(Double price) {
+        this.price = price;
+    }
+
+    public Integer getCount() {
+        return count;
+    }
+
+    public void setCount(Integer count) {
+        this.count = count;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, type, price, count);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null || getClass() != obj.getClass())
+            return false;
+        final ItemEntity other = (ItemEntity) obj;
+        return Objects.equals(other.getId(), id)
+                && Objects.equals(other.getType(), type)
+                && Objects.equals(other.getPrice(), price)
+                && Objects.equals(other.getCount(), count);
+    }
+}

src/main/java/com/example/demo/items/repository/ItemRepository.java

@@ -0,0 +1,10 @@
+package com.example.demo.items.repository;
+
+import org.springframework.stereotype.Repository;
+
+import com.example.demo.core.repository.MapRepository;
+import com.example.demo.items.model.ItemEntity;
+
+@Repository
+public class ItemRepository extends MapRepository<ItemEntity> {
+}

src/main/java/com/example/demo/items/service/ItemService.java

@@ -0,0 +1,51 @@
+package com.example.demo.items.service;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import org.springframework.stereotype.Service;
+
+import com.example.demo.core.error.NotFoundException;
+import com.example.demo.items.model.ItemEntity;
+import com.example.demo.items.repository.ItemRepository;
+
+@Service
+public class ItemService {
+    private final ItemRepository repository;
+
+    public ItemService(ItemRepository repository) {
+        this.repository = repository;
+    }
+
+    public List<ItemEntity> getAll(Long typeId) {
+        if (Objects.equals(typeId, 0L)) {
+            return repository.getAll();
+        }
+        return repository.getAll().stream()
+                .filter(item -> item.getType().getId().equals(typeId))
+                .toList();
+    }
+
+    public ItemEntity get(Long id) {
+        return Optional.ofNullable(repository.get(id))
+                .orElseThrow(() -> new NotFoundException(id));
+    }
+
+    public ItemEntity create(ItemEntity entity) {
+        return repository.create(entity);
+    }
+
+    public ItemEntity update(Long id, ItemEntity entity) {
+        final ItemEntity existsEntity = get(id);
+        existsEntity.setType(entity.getType());
+        existsEntity.setPrice(entity.getPrice());
+        existsEntity.setCount(entity.getCount());
+        return repository.update(existsEntity);
+    }
+
+    public ItemEntity delete(Long id) {
+        final ItemEntity existsEntity = get(id);
+        return repository.delete(existsEntity);
+    }
+}

src/main/java/com/example/demo/speaker/api/SpeakerController.java

@@ -0,0 +1,23 @@
+package com.example.demo.speaker.api;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.example.demo.speaker.service.SpeakerService;
+
+@RestController
+public class SpeakerController {
+    private final SpeakerService speakerService;
+
+    public SpeakerController(SpeakerService speakerService) {
+        this.speakerService = speakerService;
+    }
+
+    @GetMapping
+    public String hello(
+            @RequestParam(value = "name", defaultValue = "Мир") String name,
+            @RequestParam(value = "lang", defaultValue = "ru") String lang) {
+        return speakerService.say(name, lang);
+    }
+}

src/main/java/com/example/demo/speaker/configuration/SpeakerConfiguration.java

@@ -0,0 +1,27 @@
+package com.example.demo.speaker.configuration;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.example.demo.speaker.domain.Speaker;
+import com.example.demo.speaker.domain.SpeakerEng;
+import com.example.demo.speaker.domain.SpeakerRus;
+
+@Configuration
+public class SpeakerConfiguration {
+    private final Logger log = LoggerFactory.getLogger(SpeakerConfiguration.class);
+
+    @Bean(value = "ru", initMethod = "init", destroyMethod = "destroy")
+    public SpeakerRus createRusSpeaker() {
+        log.info("Call createRusSpeaker()");
+        return new SpeakerRus();
+    }
+
+    @Bean(value = "en")
+    public Speaker createEngSpeaker() {
+        log.info("Call createEngSpeaker()");
+        return new SpeakerEng();
+    }
+}

src/main/java/com/example/demo/speaker/domain/Speaker.java

@@ -0,0 +1,5 @@
+package com.example.demo.speaker.domain;
+
+public interface Speaker {
+    String say();
+}

src/main/java/com/example/demo/speaker/domain/SpeakerDeu.java

@@ -0,0 +1,28 @@
+package com.example.demo.speaker.domain;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+
+@Component(value = "de")
+public class SpeakerDeu implements Speaker {
+    private final Logger log = LoggerFactory.getLogger(SpeakerDeu.class);
+
+    @Override
+    public String say() {
+        return "Hallo";
+    }
+
+    @PostConstruct
+    public void init() {
+        log.info("SpeakerDeu.init()");
+    }
+
+    @PreDestroy
+    public void destroy() {
+        log.info("SpeakerDeu.destroy()");
+    }
+}

src/main/java/com/example/demo/speaker/domain/SpeakerEng.java

@@ -0,0 +1,26 @@
+package com.example.demo.speaker.domain;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+
+public class SpeakerEng implements Speaker, InitializingBean, DisposableBean {
+    private final Logger log = LoggerFactory.getLogger(SpeakerEng.class);
+
+    @Override
+    public String say() {
+        return "Hello";
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+        log.info("SpeakerEng.afterPropertiesSet()");
+    }
+
+    @Override
+    public void destroy() {
+        log.info("SpeakerEng.destroy()");
+
+    }
+}

src/main/java/com/example/demo/speaker/domain/SpeakerRus.java

@@ -0,0 +1,21 @@
+package com.example.demo.speaker.domain;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SpeakerRus implements Speaker {
+    private final Logger log = LoggerFactory.getLogger(SpeakerRus.class);
+
+    @Override
+    public String say() {
+        return "Привет";
+    }
+
+    public void init() {
+        log.info("SpeakerRus.init()");
+    }
+
+    public void destroy() {
+        log.info("SpeakerRus.destroy()");
+    }
+}

src/main/java/com/example/demo/speaker/service/SpeakerService.java

@@ -0,0 +1,20 @@
+package com.example.demo.speaker.service;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Service;
+
+import com.example.demo.speaker.domain.Speaker;
+
+@Service
+public class SpeakerService {
+    private final ApplicationContext applicationContext;
+
+    public SpeakerService(ApplicationContext applicationContext) {
+        this.applicationContext = applicationContext;
+    }
+
+    public String say(String name, String lang) {
+        final Speaker speaker = (Speaker) applicationContext.getBean(lang);
+        return String.format("%s, %s!", speaker.say(), name);
+    }
+}

src/main/java/com/example/demo/types/api/TypeController.java

@@ -0,0 +1,64 @@
+package com.example.demo.types.api;
+
+import java.util.List;
+
+import org.modelmapper.ModelMapper;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.example.demo.core.configuration.Constants;
+import com.example.demo.types.model.TypeEntity;
+import com.example.demo.types.service.TypeService;
+
+import jakarta.validation.Valid;
+
+@RestController
+@RequestMapping(Constants.API_URL + "/type")
+public class TypeController {
+    private final TypeService typeService;
+    private final ModelMapper modelMapper;
+
+    public TypeController(TypeService typeService, ModelMapper modelMapper) {
+        this.typeService = typeService;
+        this.modelMapper = modelMapper;
+    }
+
+    private TypeDto toDto(TypeEntity entity) {
+        return modelMapper.map(entity, TypeDto.class);
+    }
+
+    private TypeEntity toEntity(TypeDto dto) {
+        return modelMapper.map(dto, TypeEntity.class);
+    }
+
+    @GetMapping
+    public List<TypeDto> getAll() {
+        return typeService.getAll().stream().map(this::toDto).toList();
+    }
+
+    @GetMapping("/{id}")
+    public TypeDto get(@PathVariable(name = "id") Long id) {
+        return toDto(typeService.get(id));
+    }
+
+    @PostMapping
+    public TypeDto create(@RequestBody @Valid TypeDto dto) {
+        return toDto(typeService.create(toEntity(dto)));
+    }
+
+    @PutMapping("/{id}")
+    public TypeDto update(@PathVariable(name = "id") Long id, @RequestBody TypeDto dto) {
+        return toDto(typeService.update(id, toEntity(dto)));
+    }
+
+    @DeleteMapping("/{id}")
+    public TypeDto delete(@PathVariable(name = "id") Long id) {
+        return toDto(typeService.delete(id));
+    }
+}

src/main/java/com/example/demo/types/api/TypeDto.java

@@ -0,0 +1,28 @@
+package com.example.demo.types.api;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import jakarta.validation.constraints.NotBlank;
+
+public class TypeDto {
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private Long id;
+    @NotBlank
+    private String name;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

src/main/java/com/example/demo/types/model/TypeEntity.java

@@ -0,0 +1,43 @@
+package com.example.demo.types.model;
+
+import java.util.Objects;
+
+import com.example.demo.core.model.BaseEntity;
+
+public class TypeEntity extends BaseEntity {
+    private String name;
+
+    public TypeEntity() {
+        super();
+    }
+
+    public TypeEntity(Long id, String name) {
+        super(id);
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, name);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null || getClass() != obj.getClass())
+            return false;
+        final TypeEntity other = (TypeEntity) obj;
+        return Objects.equals(other.getId(), id)
+                && Objects.equals(other.getName(), name);
+    }
+
+}

src/main/java/com/example/demo/types/repository/TypeRepository.java

@@ -0,0 +1,10 @@
+package com.example.demo.types.repository;
+
+import org.springframework.stereotype.Repository;
+
+import com.example.demo.core.repository.MapRepository;
+import com.example.demo.types.model.TypeEntity;
+
+@Repository
+public class TypeRepository extends MapRepository<TypeEntity> {
+}

src/main/java/com/example/demo/types/service/TypeService.java

@@ -0,0 +1,43 @@
+package com.example.demo.types.service;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.stereotype.Service;
+
+import com.example.demo.core.error.NotFoundException;
+import com.example.demo.types.model.TypeEntity;
+import com.example.demo.types.repository.TypeRepository;
+
+@Service
+public class TypeService {
+    private final TypeRepository repository;
+
+    public TypeService(TypeRepository repository) {
+        this.repository = repository;
+    }
+
+    public List<TypeEntity> getAll() {
+        return repository.getAll();
+    }
+
+    public TypeEntity get(Long id) {
+        return Optional.ofNullable(repository.get(id))
+                .orElseThrow(() -> new NotFoundException(id));
+    }
+
+    public TypeEntity create(TypeEntity entity) {
+        return repository.create(entity);
+    }
+
+    public TypeEntity update(Long id, TypeEntity entity) {
+        final TypeEntity existsEntity = get(id);
+        existsEntity.setName(entity.getName());
+        return repository.update(existsEntity);
+    }
+
+    public TypeEntity delete(Long id) {
+        final TypeEntity existsEntity = get(id);
+        return repository.delete(existsEntity);
+    }
+}

src/test/java/com/example/demo/SpeakerSrviceTests.java

@@ -0,0 +1,38 @@
+package com.example.demo;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import com.example.demo.speaker.service.SpeakerService;
+
+@SpringBootTest
+class SpeakerSrviceTests {
+    @Autowired
+    SpeakerService speakerService;
+
+    @Test
+    void testSpeakerRus() {
+        final String res = speakerService.say("Мир", "ru");
+        Assertions.assertEquals("Привет, Мир!", res);
+    }
+
+    @Test
+    void testSpeakerEng() {
+        final String res = speakerService.say("World", "en");
+        Assertions.assertEquals("Hello, World!", res);
+    }
+
+    @Test
+    void testSpeakerDeu() {
+        final String res = speakerService.say("Welt", "de");
+        Assertions.assertEquals("Hallo, Welt!", res);
+    }
+
+    @Test
+    void testSpeakerErrorWired() {
+        Assertions.assertThrows(NoSuchBeanDefinitionException.class, () -> speakerService.say("Мир", "rus"));
+    }
+}

src/test/java/com/example/demo/TypeServiceTests.java

@@ -0,0 +1,61 @@
+package com.example.demo;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import com.example.demo.core.error.NotFoundException;
+import com.example.demo.types.model.TypeEntity;
+import com.example.demo.types.service.TypeService;
+
+@SpringBootTest
+@TestMethodOrder(OrderAnnotation.class)
+class TypeServiceTests {
+	@Autowired
+	private TypeService typeService;
+
+	@Test
+	void getTest() {
+		Assertions.assertThrows(NotFoundException.class, () -> typeService.get(0L));
+	}
+
+	@Test
+	@Order(1)
+	void createTest() {
+		typeService.create(new TypeEntity(null, "Ноутбук"));
+		typeService.create(new TypeEntity(null, "Телефон"));
+		final TypeEntity last = typeService.create(new TypeEntity(null, "Игровая приставка"));
+		Assertions.assertEquals(3, typeService.getAll().size());
+		Assertions.assertEquals(last, typeService.get(3L));
+	}
+
+	@Test
+	@Order(2)
+	void updateTest() {
+		final String test = "TEST";
+		final TypeEntity entity = typeService.get(3L);
+		final String oldName = entity.getName();
+		final TypeEntity newEntity = typeService.update(3L, new TypeEntity(1L, test));
+		Assertions.assertEquals(3, typeService.getAll().size());
+		Assertions.assertEquals(newEntity, typeService.get(3L));
+		Assertions.assertEquals(test, newEntity.getName());
+		Assertions.assertNotEquals(oldName, newEntity.getName());
+	}
+
+	@Test
+	@Order(3)
+	void deleteTest() {
+		typeService.delete(3L);
+		Assertions.assertEquals(2, typeService.getAll().size());
+		final TypeEntity last = typeService.get(2L);
+		Assertions.assertEquals(2L, last.getId());
+
+		final TypeEntity newEntity = typeService.create(new TypeEntity(null, "Игровая приставка"));
+		Assertions.assertEquals(3, typeService.getAll().size());
+		Assertions.assertEquals(4L, newEntity.getId());
+	}
+}