From 7fa3a11fe646f1dbfe509a99a63563f615f42ed7 Mon Sep 17 00:00:00 2001 From: matveq77 Date: Sun, 15 Feb 2026 21:30:33 +0300 Subject: [PATCH 1/2] done --- 351004/Romanovskiy/main.py | 10 ++++ 351004/Romanovskiy/src/__init__.py | 0 351004/Romanovskiy/src/api/__init__.py | 0 351004/Romanovskiy/src/api/v1/__init__.py | 1 + 351004/Romanovskiy/src/api/v1/dep.py | 38 +++++++++++++ .../src/api/v1/endpoints/__init__.py | 0 .../src/api/v1/endpoints/author.py | 31 +++++++++++ .../Romanovskiy/src/api/v1/endpoints/note.py | 30 +++++++++++ .../Romanovskiy/src/api/v1/endpoints/tag.py | 31 +++++++++++ .../Romanovskiy/src/api/v1/endpoints/topic.py | 30 +++++++++++ 351004/Romanovskiy/src/api/v1/router.py | 10 ++++ 351004/Romanovskiy/src/core/__init__.py | 0 .../src/core/constants/__init__.py | 7 +++ .../Romanovskiy/src/core/errors/__init__.py | 9 ++++ 351004/Romanovskiy/src/core/errors/errors.py | 10 ++++ .../Romanovskiy/src/core/errors/handlers.py | 9 ++++ .../Romanovskiy/src/core/errors/messages.py | 14 +++++ 351004/Romanovskiy/src/domain/__init__.py | 0 .../Romanovskiy/src/domain/models/__init__.py | 4 ++ .../Romanovskiy/src/domain/models/author.py | 10 ++++ 351004/Romanovskiy/src/domain/models/note.py | 8 +++ 351004/Romanovskiy/src/domain/models/tag.py | 7 +++ 351004/Romanovskiy/src/domain/models/topic.py | 11 ++++ .../src/domain/repositories/__init__.py | 0 .../domain/repositories/in_memory/__init__.py | 13 +++++ .../repositories/in_memory/in_memory_topic.py | 20 +++++++ .../repositories/interfaces/__init__.py | 1 + .../domain/repositories/interfaces/base.py | 49 +++++++++++++++++ 351004/Romanovskiy/src/schemas/__init__.py | 0 351004/Romanovskiy/src/schemas/author.py | 15 ++++++ 351004/Romanovskiy/src/schemas/note.py | 15 ++++++ 351004/Romanovskiy/src/schemas/tag.py | 14 +++++ 351004/Romanovskiy/src/schemas/topic.py | 16 ++++++ 351004/Romanovskiy/src/services/__init__.py | 4 ++ 351004/Romanovskiy/src/services/author.py | 54 +++++++++++++++++++ 351004/Romanovskiy/src/services/note.py | 49 +++++++++++++++++ 351004/Romanovskiy/src/services/tag.py | 49 +++++++++++++++++ 351004/Romanovskiy/src/services/topic.py | 52 ++++++++++++++++++ 38 files changed, 621 insertions(+) create mode 100644 351004/Romanovskiy/main.py create mode 100644 351004/Romanovskiy/src/__init__.py create mode 100644 351004/Romanovskiy/src/api/__init__.py create mode 100644 351004/Romanovskiy/src/api/v1/__init__.py create mode 100644 351004/Romanovskiy/src/api/v1/dep.py create mode 100644 351004/Romanovskiy/src/api/v1/endpoints/__init__.py create mode 100644 351004/Romanovskiy/src/api/v1/endpoints/author.py create mode 100644 351004/Romanovskiy/src/api/v1/endpoints/note.py create mode 100644 351004/Romanovskiy/src/api/v1/endpoints/tag.py create mode 100644 351004/Romanovskiy/src/api/v1/endpoints/topic.py create mode 100644 351004/Romanovskiy/src/api/v1/router.py create mode 100644 351004/Romanovskiy/src/core/__init__.py create mode 100644 351004/Romanovskiy/src/core/constants/__init__.py create mode 100644 351004/Romanovskiy/src/core/errors/__init__.py create mode 100644 351004/Romanovskiy/src/core/errors/errors.py create mode 100644 351004/Romanovskiy/src/core/errors/handlers.py create mode 100644 351004/Romanovskiy/src/core/errors/messages.py create mode 100644 351004/Romanovskiy/src/domain/__init__.py create mode 100644 351004/Romanovskiy/src/domain/models/__init__.py create mode 100644 351004/Romanovskiy/src/domain/models/author.py create mode 100644 351004/Romanovskiy/src/domain/models/note.py create mode 100644 351004/Romanovskiy/src/domain/models/tag.py create mode 100644 351004/Romanovskiy/src/domain/models/topic.py create mode 100644 351004/Romanovskiy/src/domain/repositories/__init__.py create mode 100644 351004/Romanovskiy/src/domain/repositories/in_memory/__init__.py create mode 100644 351004/Romanovskiy/src/domain/repositories/in_memory/in_memory_topic.py create mode 100644 351004/Romanovskiy/src/domain/repositories/interfaces/__init__.py create mode 100644 351004/Romanovskiy/src/domain/repositories/interfaces/base.py create mode 100644 351004/Romanovskiy/src/schemas/__init__.py create mode 100644 351004/Romanovskiy/src/schemas/author.py create mode 100644 351004/Romanovskiy/src/schemas/note.py create mode 100644 351004/Romanovskiy/src/schemas/tag.py create mode 100644 351004/Romanovskiy/src/schemas/topic.py create mode 100644 351004/Romanovskiy/src/services/__init__.py create mode 100644 351004/Romanovskiy/src/services/author.py create mode 100644 351004/Romanovskiy/src/services/note.py create mode 100644 351004/Romanovskiy/src/services/tag.py create mode 100644 351004/Romanovskiy/src/services/topic.py diff --git a/351004/Romanovskiy/main.py b/351004/Romanovskiy/main.py new file mode 100644 index 000000000..53780ba3d --- /dev/null +++ b/351004/Romanovskiy/main.py @@ -0,0 +1,10 @@ +from fastapi import FastAPI + +from src.api.v1 import router_v1 +from src.core.errors import register_error_handlers + +app = FastAPI(title="DistComp", version="1.0") + +register_error_handlers(app) + +app.include_router(router_v1, prefix="/api") \ No newline at end of file diff --git a/351004/Romanovskiy/src/__init__.py b/351004/Romanovskiy/src/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/351004/Romanovskiy/src/api/__init__.py b/351004/Romanovskiy/src/api/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/351004/Romanovskiy/src/api/v1/__init__.py b/351004/Romanovskiy/src/api/v1/__init__.py new file mode 100644 index 000000000..07fdaef81 --- /dev/null +++ b/351004/Romanovskiy/src/api/v1/__init__.py @@ -0,0 +1 @@ +from src.api.v1.router import router_v1 \ No newline at end of file diff --git a/351004/Romanovskiy/src/api/v1/dep.py b/351004/Romanovskiy/src/api/v1/dep.py new file mode 100644 index 000000000..dbc04ba58 --- /dev/null +++ b/351004/Romanovskiy/src/api/v1/dep.py @@ -0,0 +1,38 @@ +from functools import lru_cache + +from src.domain.repositories.in_memory import InMemoryAuthorRepository, InMemoryNoteRepository, \ + InMemoryTopicRepository +from src.services import AuthorService, TopicService, NoteService, TagService + + +@lru_cache +def get_author_repo() -> InMemoryAuthorRepository: + return InMemoryAuthorRepository() + +def get_author_service() -> AuthorService: + repo = get_author_repo() + return AuthorService(repo) + +@lru_cache +def get_topic_repo() -> InMemoryTopicRepository: + return InMemoryTopicRepository() + +def get_topic_service() -> TopicService: + repo = get_topic_repo() + return TopicService(repo) + +@lru_cache +def get_note_repo() -> InMemoryNoteRepository: + return InMemoryNoteRepository() + +def get_note_service() -> NoteService: + repo = get_note_repo() + return NoteService(repo) + +@lru_cache +def get_tag_repo() -> InMemoryTopicRepository: + return InMemoryTopicRepository() + +def get_tag_service() -> TagService: + repo = get_tag_repo() + return TagService(repo) \ No newline at end of file diff --git a/351004/Romanovskiy/src/api/v1/endpoints/__init__.py b/351004/Romanovskiy/src/api/v1/endpoints/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/351004/Romanovskiy/src/api/v1/endpoints/author.py b/351004/Romanovskiy/src/api/v1/endpoints/author.py new file mode 100644 index 000000000..654fbfb72 --- /dev/null +++ b/351004/Romanovskiy/src/api/v1/endpoints/author.py @@ -0,0 +1,31 @@ +from http import HTTPStatus +from typing import List + +from fastapi import APIRouter, Depends + +from src.api.v1.dep import get_author_service +from src.schemas.author import AuthorResponseTo, AuthorRequestTo +from src.services.author import AuthorService + +router = APIRouter(prefix="/authors") + +@router.get("", response_model=List[AuthorResponseTo], status_code=HTTPStatus.OK) +def get_all(service: AuthorService = Depends(get_author_service)): + return service.get_all() + +@router.get("/{author_id}", response_model=AuthorResponseTo, status_code=HTTPStatus.OK) +def get_by_id(author_id: int, service: AuthorService = Depends(get_author_service)): + return service.get_one(author_id) + +@router.post("", response_model=AuthorResponseTo, status_code=HTTPStatus.CREATED) +def create(request: AuthorRequestTo, service: AuthorService = Depends(get_author_service)): + return service.create(request) + + +@router.put("/{author_id}", response_model=AuthorResponseTo, status_code=HTTPStatus.OK) +def update(author_id: int, dto: AuthorRequestTo, service: AuthorService = Depends(get_author_service)): + return service.update(author_id, dto) + +@router.delete("/{author_id}", status_code=HTTPStatus.NO_CONTENT) +def delete(author_id: int, service: AuthorService = Depends(get_author_service)): + service.delete(author_id) \ No newline at end of file diff --git a/351004/Romanovskiy/src/api/v1/endpoints/note.py b/351004/Romanovskiy/src/api/v1/endpoints/note.py new file mode 100644 index 000000000..3e10a2f85 --- /dev/null +++ b/351004/Romanovskiy/src/api/v1/endpoints/note.py @@ -0,0 +1,30 @@ +from http import HTTPStatus +from typing import List + +from fastapi import APIRouter, Depends + +from src.api.v1.dep import get_note_service +from src.schemas.note import NoteResponseTo, NoteRequestTo +from src.services import NoteService + +router = APIRouter(prefix="/notes") + +@router.get("", response_model=List[NoteResponseTo], status_code=HTTPStatus.OK) +def get_all(service: NoteService = Depends(get_note_service)): + return service.get_all() + +@router.get("/{note_id}", response_model=NoteResponseTo, status_code=HTTPStatus.OK) +def get_by_id(note_id: int, service: NoteService = Depends(get_note_service)): + return service.get_one(note_id) + +@router.post("", response_model=NoteResponseTo, status_code=HTTPStatus.CREATED) +def create(dto: NoteRequestTo, service: NoteService = Depends(get_note_service)): + return service.create(dto) + +@router.put("/{note_id}", response_model=NoteResponseTo, status_code=HTTPStatus.OK) +def put(note_id: int, dto: NoteRequestTo, service: NoteService = Depends(get_note_service)): + return service.update(note_id, dto) + +@router.delete("/{note_id}", status_code=HTTPStatus.NO_CONTENT) +def delete(note_id: int, service: NoteService = Depends(get_note_service)): + return service.delete(note_id) \ No newline at end of file diff --git a/351004/Romanovskiy/src/api/v1/endpoints/tag.py b/351004/Romanovskiy/src/api/v1/endpoints/tag.py new file mode 100644 index 000000000..d3572ac04 --- /dev/null +++ b/351004/Romanovskiy/src/api/v1/endpoints/tag.py @@ -0,0 +1,31 @@ +from http import HTTPStatus +from typing import List + +from fastapi import APIRouter +from fastapi.params import Depends + +from src.api.v1.dep import get_tag_service +from src.schemas.tag import TagResponseTo, TagRequestTo +from src.services import TagService + +router = APIRouter(prefix="/tags") + +@router.get("", response_model=List[TagResponseTo], status_code=HTTPStatus.OK) +def get_all(service: TagService = Depends(get_tag_service)): + return service.get_all() + +@router.get("/{tag_id}", response_model=TagResponseTo, status_code=HTTPStatus.OK) +def get_by_id(tag_id: int, service: TagService = Depends(get_tag_service)): + return service.get_one(tag_id) + +@router.post("", response_model=TagResponseTo, status_code=HTTPStatus.CREATED) +def create(dto: TagRequestTo, service: TagService = Depends(get_tag_service)): + return service.create(dto) + +@router.put("/{tag_id}", response_model=TagResponseTo, status_code=HTTPStatus.OK) +def update(tag_id: int, dto: TagRequestTo, service: TagService = Depends(get_tag_service)): + return service.update(tag_id, dto) + +@router.delete("/{tag_id}", status_code=HTTPStatus.NO_CONTENT) +def delete(tag_id: int, service: TagService = Depends(get_tag_service)): + service.delete(tag_id) \ No newline at end of file diff --git a/351004/Romanovskiy/src/api/v1/endpoints/topic.py b/351004/Romanovskiy/src/api/v1/endpoints/topic.py new file mode 100644 index 000000000..eff3bd4ea --- /dev/null +++ b/351004/Romanovskiy/src/api/v1/endpoints/topic.py @@ -0,0 +1,30 @@ +from http import HTTPStatus +from typing import List + +from fastapi import APIRouter, Depends + +from src.api.v1.dep import get_topic_service +from src.schemas.topic import TopicRequestTo, TopicResponseTo +from src.services import TopicService + +router = APIRouter(prefix="/topics") + +@router.get("/{topic_id}", response_model=TopicResponseTo, status_code=HTTPStatus.OK) +def get_by_id(topic_id: int, service: TopicService = Depends(get_topic_service)): + return service.get_one(topic_id) + +@router.get("", response_model=List[TopicResponseTo], status_code=HTTPStatus.OK) +def get_all(service: TopicService = Depends(get_topic_service)): + return service.get_all() + +@router.post("", response_model=TopicResponseTo, status_code=HTTPStatus.CREATED) +def create(dto: TopicRequestTo, service: TopicService = Depends(get_topic_service)): + return service.create(dto) + +@router.put("/{topic_id}", response_model=TopicResponseTo, status_code=HTTPStatus.OK) +def update(topic_id: int, dto: TopicRequestTo, service: TopicService = Depends(get_topic_service)): + return service.update(topic_id, dto) + +@router.delete("/{topic_id}", status_code=HTTPStatus.NO_CONTENT) +def delete(topic_id: int, service: TopicService = Depends(get_topic_service)): + service.delete(topic_id) \ No newline at end of file diff --git a/351004/Romanovskiy/src/api/v1/router.py b/351004/Romanovskiy/src/api/v1/router.py new file mode 100644 index 000000000..d1d0aa2c7 --- /dev/null +++ b/351004/Romanovskiy/src/api/v1/router.py @@ -0,0 +1,10 @@ +from fastapi import APIRouter + +from src.api.v1.endpoints import author, topic, note, tag + +router_v1 = APIRouter(prefix="/v1.0") + +router_v1.include_router(author.router, tags=["authors"]) +router_v1.include_router(topic.router, tags=["topics"]) +router_v1.include_router(note.router, tags=["notes"]) +router_v1.include_router(tag.router, tags=["tags"]) \ No newline at end of file diff --git a/351004/Romanovskiy/src/core/__init__.py b/351004/Romanovskiy/src/core/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/351004/Romanovskiy/src/core/constants/__init__.py b/351004/Romanovskiy/src/core/constants/__init__.py new file mode 100644 index 000000000..1cfdfca47 --- /dev/null +++ b/351004/Romanovskiy/src/core/constants/__init__.py @@ -0,0 +1,7 @@ +from enum import IntEnum +from http import HTTPStatus + +__all__ = ["ErrorStatus"] + +class ErrorStatus(IntEnum): + NOT_FOUND = HTTPStatus.NOT_FOUND.value * 100 + 1 \ No newline at end of file diff --git a/351004/Romanovskiy/src/core/errors/__init__.py b/351004/Romanovskiy/src/core/errors/__init__.py new file mode 100644 index 000000000..614446c2b --- /dev/null +++ b/351004/Romanovskiy/src/core/errors/__init__.py @@ -0,0 +1,9 @@ +from fastapi import FastAPI + +from src.core.errors.errors import HttpNotFoundError +from src.core.errors.handlers import not_found_handler +from src.core.errors.messages import NoteErrorMessage, AuthorErrorMessage, TopicErrorMessage + + +def register_error_handlers(app: FastAPI) -> None: + app.add_exception_handler(HttpNotFoundError, not_found_handler) \ No newline at end of file diff --git a/351004/Romanovskiy/src/core/errors/errors.py b/351004/Romanovskiy/src/core/errors/errors.py new file mode 100644 index 000000000..201710d2f --- /dev/null +++ b/351004/Romanovskiy/src/core/errors/errors.py @@ -0,0 +1,10 @@ +from src.core.constants import ErrorStatus + + +class HttpError(Exception): + def __init__(self, message: str, error_code: ErrorStatus): + super().__init__(message) + self.error_code = error_code + +class HttpNotFoundError(HttpError): + pass \ No newline at end of file diff --git a/351004/Romanovskiy/src/core/errors/handlers.py b/351004/Romanovskiy/src/core/errors/handlers.py new file mode 100644 index 000000000..c43d66872 --- /dev/null +++ b/351004/Romanovskiy/src/core/errors/handlers.py @@ -0,0 +1,9 @@ +from http import HTTPStatus + +from starlette.responses import JSONResponse + +from src.core.errors.errors import HttpNotFoundError + + +def not_found_handler(_, exc: HttpNotFoundError): + return JSONResponse(status_code=HTTPStatus.NOT_FOUND, content={"errorMessage": str(exc), "errorCode": exc.error_code}) \ No newline at end of file diff --git a/351004/Romanovskiy/src/core/errors/messages.py b/351004/Romanovskiy/src/core/errors/messages.py new file mode 100644 index 000000000..37b2bd9c7 --- /dev/null +++ b/351004/Romanovskiy/src/core/errors/messages.py @@ -0,0 +1,14 @@ +from enum import Enum + + +class TopicErrorMessage(str, Enum): + NOT_FOUND = "Topic not found" + +class AuthorErrorMessage(str, Enum): + NOT_FOUND = "Author not found" + +class NoteErrorMessage(str, Enum): + NOT_FOUND = "Note not found" + +class TagErrorMessage(str, Enum): + NOT_FOUND = "Tag not found" \ No newline at end of file diff --git a/351004/Romanovskiy/src/domain/__init__.py b/351004/Romanovskiy/src/domain/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/351004/Romanovskiy/src/domain/models/__init__.py b/351004/Romanovskiy/src/domain/models/__init__.py new file mode 100644 index 000000000..cf61a0aa3 --- /dev/null +++ b/351004/Romanovskiy/src/domain/models/__init__.py @@ -0,0 +1,4 @@ +from src.domain.models.author import Author +from src.domain.models.note import Note +from src.domain.models.tag import Tag +from src.domain.models.topic import Topic diff --git a/351004/Romanovskiy/src/domain/models/author.py b/351004/Romanovskiy/src/domain/models/author.py new file mode 100644 index 000000000..806c20a52 --- /dev/null +++ b/351004/Romanovskiy/src/domain/models/author.py @@ -0,0 +1,10 @@ +from dataclasses import dataclass + + +@dataclass +class Author: + id: int + login: str + password: str + firstname: str + lastname: str \ No newline at end of file diff --git a/351004/Romanovskiy/src/domain/models/note.py b/351004/Romanovskiy/src/domain/models/note.py new file mode 100644 index 000000000..fe7f7c94b --- /dev/null +++ b/351004/Romanovskiy/src/domain/models/note.py @@ -0,0 +1,8 @@ +from dataclasses import dataclass + + +@dataclass +class Note: + id: int + content: str + topic_id: int diff --git a/351004/Romanovskiy/src/domain/models/tag.py b/351004/Romanovskiy/src/domain/models/tag.py new file mode 100644 index 000000000..591eb75db --- /dev/null +++ b/351004/Romanovskiy/src/domain/models/tag.py @@ -0,0 +1,7 @@ +from dataclasses import dataclass + + +@dataclass +class Tag: + id: int + name: str \ No newline at end of file diff --git a/351004/Romanovskiy/src/domain/models/topic.py b/351004/Romanovskiy/src/domain/models/topic.py new file mode 100644 index 000000000..5d9cf7bb9 --- /dev/null +++ b/351004/Romanovskiy/src/domain/models/topic.py @@ -0,0 +1,11 @@ +from dataclasses import dataclass +from datetime import datetime + +@dataclass +class Topic: + id: int + title: str + content: str + author_id: int + created_at: datetime | None = None + updated_at: datetime | None = None diff --git a/351004/Romanovskiy/src/domain/repositories/__init__.py b/351004/Romanovskiy/src/domain/repositories/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/351004/Romanovskiy/src/domain/repositories/in_memory/__init__.py b/351004/Romanovskiy/src/domain/repositories/in_memory/__init__.py new file mode 100644 index 000000000..e18db7276 --- /dev/null +++ b/351004/Romanovskiy/src/domain/repositories/in_memory/__init__.py @@ -0,0 +1,13 @@ +from src.domain.models import Author, Note, Tag +from src.domain.repositories.in_memory.in_memory_topic import InMemoryTopicRepository +from src.domain.repositories.interfaces import InMemoryRepository + + +class InMemoryAuthorRepository(InMemoryRepository[Author]): + pass + +class InMemoryNoteRepository(InMemoryRepository[Note]): + pass + +class InMemoryTagRepository(InMemoryRepository[Tag]): + pass \ No newline at end of file diff --git a/351004/Romanovskiy/src/domain/repositories/in_memory/in_memory_topic.py b/351004/Romanovskiy/src/domain/repositories/in_memory/in_memory_topic.py new file mode 100644 index 000000000..024b96477 --- /dev/null +++ b/351004/Romanovskiy/src/domain/repositories/in_memory/in_memory_topic.py @@ -0,0 +1,20 @@ +from datetime import datetime + +from src.domain.models import Topic +from src.domain.repositories.interfaces import InMemoryRepository + + +class InMemoryTopicRepository(InMemoryRepository[Topic]): + def create(self, topic: Topic) -> Topic: + new_id = self._next_id() + topic.id = new_id + topic.created_at = datetime.now() + topic.updated_at = datetime.now() + self._data[new_id] = topic + return topic + + def update(self, topic: Topic) -> Topic: + topic.created_at = self._data[topic.id].created_at + topic.updated_at = datetime.now() + self._data[topic.id] = topic + return topic \ No newline at end of file diff --git a/351004/Romanovskiy/src/domain/repositories/interfaces/__init__.py b/351004/Romanovskiy/src/domain/repositories/interfaces/__init__.py new file mode 100644 index 000000000..5d2b2f99f --- /dev/null +++ b/351004/Romanovskiy/src/domain/repositories/interfaces/__init__.py @@ -0,0 +1 @@ +from src.domain.repositories.interfaces.base import InMemoryRepository, Repository diff --git a/351004/Romanovskiy/src/domain/repositories/interfaces/base.py b/351004/Romanovskiy/src/domain/repositories/interfaces/base.py new file mode 100644 index 000000000..377b75870 --- /dev/null +++ b/351004/Romanovskiy/src/domain/repositories/interfaces/base.py @@ -0,0 +1,49 @@ +from abc import abstractmethod, ABC +from typing import Generic, TypeVar, List, Dict + +T = TypeVar("T") + +class Repository(ABC, Generic[T]): + @abstractmethod + def get_one(self, entity_id: int) -> T: + pass + @abstractmethod + def get_all(self) -> List[T]: + pass + @abstractmethod + def create(self, entity: T) -> T: + pass + @abstractmethod + def update(self, entity: T) -> T: + pass + @abstractmethod + def delete(self, entity_id: int) -> None: + pass + +class InMemoryRepository(Repository[T]): + def __init__(self) -> None: + self._data: Dict[int, T] = {} + self._id = 0 + + def _next_id(self) -> int: + self._id += 1 + return self._id + + def get_one(self, entity_id: int) -> T: + return self._data[entity_id] + + def get_all(self) -> List[T]: + return list(self._data.values()) + + def create(self, entity: T) -> T: + new_id = self._next_id() + entity.id = new_id + self._data[new_id] = entity + return entity + + def update(self, entity: T) -> T: + self._data[entity.id] = entity + return entity + + def delete(self, entity_id: int) -> None: + self._data.pop(entity_id) \ No newline at end of file diff --git a/351004/Romanovskiy/src/schemas/__init__.py b/351004/Romanovskiy/src/schemas/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/351004/Romanovskiy/src/schemas/author.py b/351004/Romanovskiy/src/schemas/author.py new file mode 100644 index 000000000..95afe5110 --- /dev/null +++ b/351004/Romanovskiy/src/schemas/author.py @@ -0,0 +1,15 @@ +from pydantic import BaseModel, ConfigDict + +class AuthroBase(BaseModel): + login: str + password: str + firstname: str + lastname: str + + model_config = ConfigDict(from_attributes=True) + +class AuthorRequestTo(AuthroBase): + pass + +class AuthorResponseTo(AuthroBase): + id: int \ No newline at end of file diff --git a/351004/Romanovskiy/src/schemas/note.py b/351004/Romanovskiy/src/schemas/note.py new file mode 100644 index 000000000..4900c5e2d --- /dev/null +++ b/351004/Romanovskiy/src/schemas/note.py @@ -0,0 +1,15 @@ +from pydantic import BaseModel, ConfigDict +from pydantic.alias_generators import to_camel + + +class NoteBase(BaseModel): + content: str + topic_id: int + + model_config = ConfigDict(from_attributes=True, alias_generator=to_camel, validate_by_name=True) + +class NoteRequestTo(NoteBase): + pass + +class NoteResponseTo(NoteBase): + id: int \ No newline at end of file diff --git a/351004/Romanovskiy/src/schemas/tag.py b/351004/Romanovskiy/src/schemas/tag.py new file mode 100644 index 000000000..f53382880 --- /dev/null +++ b/351004/Romanovskiy/src/schemas/tag.py @@ -0,0 +1,14 @@ +from pydantic import BaseModel, ConfigDict +from pydantic.alias_generators import to_camel + + +class TagBase(BaseModel): + name: str + + model_config = ConfigDict(from_attributes=True, alias_generator=to_camel, validate_by_alias=True) + +class TagRequestTo(TagBase): + pass + +class TagResponseTo(TagBase): + id: int \ No newline at end of file diff --git a/351004/Romanovskiy/src/schemas/topic.py b/351004/Romanovskiy/src/schemas/topic.py new file mode 100644 index 000000000..a37ca10fe --- /dev/null +++ b/351004/Romanovskiy/src/schemas/topic.py @@ -0,0 +1,16 @@ +from pydantic import BaseModel, ConfigDict +from pydantic.alias_generators import to_camel + + +class TopicBase(BaseModel): + title: str + content: str + author_id: int + + model_config = ConfigDict(from_attributes=True, alias_generator=to_camel, validate_by_name=True) + +class TopicRequestTo(TopicBase): + pass + +class TopicResponseTo(TopicBase): + id: int \ No newline at end of file diff --git a/351004/Romanovskiy/src/services/__init__.py b/351004/Romanovskiy/src/services/__init__.py new file mode 100644 index 000000000..051180e30 --- /dev/null +++ b/351004/Romanovskiy/src/services/__init__.py @@ -0,0 +1,4 @@ +from src.services.author import AuthorService +from src.services.note import NoteService +from src.services.tag import TagService +from src.services.topic import TopicService diff --git a/351004/Romanovskiy/src/services/author.py b/351004/Romanovskiy/src/services/author.py new file mode 100644 index 000000000..b250aac0e --- /dev/null +++ b/351004/Romanovskiy/src/services/author.py @@ -0,0 +1,54 @@ +from typing import List + +from src.core.constants import ErrorStatus +from src.core.errors import HttpNotFoundError, TopicErrorMessage +from src.domain.models.author import Author +from src.domain.repositories.interfaces.base import Repository +from src.schemas.author import AuthorResponseTo, AuthorRequestTo + + +class AuthorService: + def __init__(self, repo: Repository[Author]) -> None: + self._repo = repo + + def get_one(self, author_id: int) -> AuthorResponseTo: + try: + author = self._repo.get_one(author_id) + except KeyError: + raise HttpNotFoundError(TopicErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) + return AuthorResponseTo.model_validate(author) + + def get_all(self) -> List[AuthorResponseTo]: + authors = self._repo.get_all() + return [AuthorResponseTo.model_validate(a) for a in authors] + + def create(self, dto: AuthorRequestTo) -> AuthorResponseTo: + author = Author( + id=0, + login=dto.login, + password=dto.password, + lastname=dto.lastname, + firstname=dto.firstname, + ) + created_author = self._repo.create(author) + return AuthorResponseTo.model_validate(created_author) + + def update(self, author_id: int, dto: AuthorRequestTo) -> AuthorResponseTo: + author = Author( + id=author_id, + login=dto.login, + password=dto.password, + lastname=dto.lastname, + firstname=dto.firstname, + ) + try: + updated_author = self._repo.update(author) + except KeyError: + raise HttpNotFoundError(TopicErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) + return AuthorResponseTo.model_validate(updated_author) + + def delete(self, author_id: int) -> None: + try: + self._repo.delete(author_id) + except KeyError: + raise HttpNotFoundError(TopicErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) \ No newline at end of file diff --git a/351004/Romanovskiy/src/services/note.py b/351004/Romanovskiy/src/services/note.py new file mode 100644 index 000000000..cb83f0cc3 --- /dev/null +++ b/351004/Romanovskiy/src/services/note.py @@ -0,0 +1,49 @@ +from typing import List + +from src.core.constants import ErrorStatus +from src.core.errors import HttpNotFoundError, NoteErrorMessage +from src.domain.models import Note +from src.domain.repositories.interfaces import Repository +from src.schemas.note import NoteResponseTo, NoteRequestTo + + +class NoteService: + def __init__(self, repo: Repository[Note]): + self._repo = repo + + def get_one(self, note_id: int) -> NoteResponseTo: + try: + note = self._repo.get_one(note_id) + except KeyError: + raise HttpNotFoundError(NoteErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) + return NoteResponseTo.model_validate(note) + + def get_all(self) -> List[Note]: + return self._repo.get_all() + + def create(self, dto: NoteRequestTo) -> NoteResponseTo: + note = Note( + id=0, + content=dto.content, + topic_id=dto.topic_id + ) + created_note = self._repo.create(note) + return NoteResponseTo.model_validate(created_note) + + def update(self, note_id: int, dto: NoteRequestTo) -> NoteResponseTo: + old_note = Note( + id=note_id, + content=dto.content, + topic_id=dto.topic_id + ) + try: + updated_note = self._repo.update(old_note) + except KeyError: + raise HttpNotFoundError(NoteErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) + return NoteResponseTo.model_validate(updated_note) + + def delete(self, note_id: int) -> None: + try: + self._repo.delete(note_id) + except KeyError: + raise HttpNotFoundError(NoteErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) \ No newline at end of file diff --git a/351004/Romanovskiy/src/services/tag.py b/351004/Romanovskiy/src/services/tag.py new file mode 100644 index 000000000..f5a07ac63 --- /dev/null +++ b/351004/Romanovskiy/src/services/tag.py @@ -0,0 +1,49 @@ +from typing import List + +from src.core.constants import ErrorStatus +from src.core.errors import HttpNotFoundError +from src.core.errors.messages import TagErrorMessage +from src.domain.models import Tag +from src.domain.repositories.interfaces import Repository +from src.schemas.tag import TagResponseTo, TagRequestTo + + +class TagService: + def __init__(self, repo: Repository[Tag]) -> None: + self._repo = repo + + def get_one(self, tag_id: int) -> TagResponseTo: + try: + tag = self._repo.get_one(tag_id) + except KeyError: + raise HttpNotFoundError(TagErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) + return TagResponseTo.model_validate(tag) + + def get_all(self) -> List[TagResponseTo]: + tags = self._repo.get_all() + return [TagResponseTo.model_validate(t) for t in tags] + + def create(self, dto: TagRequestTo) -> TagResponseTo: + tag = Tag( + id=0, + name=dto.name, + ) + created_tag = self._repo.create(tag) + return TagResponseTo.model_validate(created_tag) + + def update(self, tag_id: int, dto: TagRequestTo) -> TagResponseTo: + tag = Tag( + id=tag_id, + name=dto.name, + ) + try: + updated_tag = self._repo.update(tag) + except KeyError: + raise HttpNotFoundError(TagErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) + return TagResponseTo.model_validate(updated_tag) + + def delete(self, tag_id: int) -> None: + try: + self._repo.delete(tag_id) + except KeyError: + raise HttpNotFoundError(TagErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) diff --git a/351004/Romanovskiy/src/services/topic.py b/351004/Romanovskiy/src/services/topic.py new file mode 100644 index 000000000..f6f966aea --- /dev/null +++ b/351004/Romanovskiy/src/services/topic.py @@ -0,0 +1,52 @@ +from typing import List + +from src.core.constants import ErrorStatus +from src.core.errors import HttpNotFoundError, TopicErrorMessage +from src.domain.models import Topic +from src.domain.repositories.interfaces import Repository +from src.schemas.topic import TopicResponseTo, TopicRequestTo + + +class TopicService: + def __init__(self, repo: Repository[Topic]): + self._repo = repo + + def get_one(self, topic_id: int) -> TopicResponseTo: + try: + topic = self._repo.get_one(topic_id) + except KeyError: + raise HttpNotFoundError(TopicErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) + return TopicResponseTo.model_validate(topic) + + def get_all(self) -> List[TopicResponseTo]: + topics = self._repo.get_all() + return [TopicResponseTo.model_validate(t) for t in topics] + + def create(self, dto: TopicRequestTo) -> TopicResponseTo: + topic = Topic( + id=0, + title=dto.title, + content=dto.content, + author_id=dto.author_id, + ) + created_topic = self._repo.create(topic) + return TopicResponseTo.model_validate(created_topic) + + def update(self, topic_id: int, dto: TopicRequestTo) -> TopicResponseTo: + topic = Topic( + id=topic_id, + title=dto.title, + content=dto.content, + author_id=dto.author_id, + ) + try: + updated_topic = self._repo.update(topic) + except KeyError: + raise HttpNotFoundError(TopicErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) + return TopicResponseTo.model_validate(updated_topic) + + def delete(self, topic_id: int) -> None: + try: + self._repo.delete(topic_id) + except KeyError: + raise HttpNotFoundError(TopicErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) \ No newline at end of file From d186417a8cbf0d3f8f72311f138d56288416599d Mon Sep 17 00:00:00 2001 From: matveq77 Date: Mon, 23 Feb 2026 06:05:02 +0300 Subject: [PATCH 2/2] done lab 1 --- 351004/Romanovskiy/main.py | 10 - 351004/Romanovskiy/src/__init__.py | 0 351004/Romanovskiy/src/api/__init__.py | 0 351004/Romanovskiy/src/api/v1/__init__.py | 1 - 351004/Romanovskiy/src/api/v1/dep.py | 38 --- .../src/api/v1/endpoints/__init__.py | 0 .../src/api/v1/endpoints/author.py | 31 -- .../Romanovskiy/src/api/v1/endpoints/note.py | 30 -- .../Romanovskiy/src/api/v1/endpoints/tag.py | 31 -- .../Romanovskiy/src/api/v1/endpoints/topic.py | 30 -- 351004/Romanovskiy/src/api/v1/router.py | 10 - 351004/Romanovskiy/src/core/__init__.py | 0 .../src/core/constants/__init__.py | 7 - .../Romanovskiy/src/core/errors/__init__.py | 9 - 351004/Romanovskiy/src/core/errors/errors.py | 10 - .../Romanovskiy/src/core/errors/handlers.py | 9 - .../Romanovskiy/src/core/errors/messages.py | 14 - 351004/Romanovskiy/src/domain/__init__.py | 0 .../Romanovskiy/src/domain/models/__init__.py | 4 - .../Romanovskiy/src/domain/models/author.py | 10 - 351004/Romanovskiy/src/domain/models/note.py | 8 - 351004/Romanovskiy/src/domain/models/tag.py | 7 - 351004/Romanovskiy/src/domain/models/topic.py | 11 - .../src/domain/repositories/__init__.py | 0 .../domain/repositories/in_memory/__init__.py | 13 - .../repositories/in_memory/in_memory_topic.py | 20 -- .../repositories/interfaces/__init__.py | 1 - .../domain/repositories/interfaces/base.py | 49 --- 351004/Romanovskiy/src/schemas/__init__.py | 0 351004/Romanovskiy/src/schemas/author.py | 15 - 351004/Romanovskiy/src/schemas/note.py | 15 - 351004/Romanovskiy/src/schemas/tag.py | 14 - 351004/Romanovskiy/src/schemas/topic.py | 16 - 351004/Romanovskiy/src/services/__init__.py | 4 - 351004/Romanovskiy/src/services/author.py | 54 ---- 351004/Romanovskiy/src/services/note.py | 49 --- 351004/Romanovskiy/src/services/tag.py | 49 --- 351004/Romanovskiy/src/services/topic.py | 52 --- 351004/Romanovskiy/task310/.gitattributes | 2 + 351004/Romanovskiy/task310/.gitignore | 33 ++ .../.mvn/wrapper/maven-wrapper.properties | 3 + 351004/Romanovskiy/task310/mvnw | 295 ++++++++++++++++++ 351004/Romanovskiy/task310/mvnw.cmd | 189 +++++++++++ 351004/Romanovskiy/task310/pom.xml | 102 ++++++ .../example/task310/Task310Application.java | 13 + .../task310/controller/AuthorController.java | 46 +++ .../task310/controller/MarkerController.java | 46 +++ .../controller/ReactionController.java | 46 +++ .../task310/controller/TweetController.java | 46 +++ .../domain/dto/request/AuthorRequestTo.java | 30 ++ .../domain/dto/request/MarkerRequestTo.java | 18 ++ .../domain/dto/request/ReactionRequestTo.java | 21 ++ .../domain/dto/request/TweetRequestTo.java | 25 ++ .../domain/dto/response/AuthorResponseTo.java | 15 + .../domain/dto/response/MarkerResponseTo.java | 13 + .../dto/response/ReactionResponseTo.java | 14 + .../domain/dto/response/TweetResponseTo.java | 18 ++ .../example/task310/domain/entity/Author.java | 19 ++ .../task310/domain/entity/BaseEntity.java | 14 + .../example/task310/domain/entity/Marker.java | 16 + .../task310/domain/entity/Reaction.java | 17 + .../example/task310/domain/entity/Tweet.java | 28 ++ .../exception/EntityNotFoundException.java | 7 + .../task310/exception/ErrorResponse.java | 13 + .../exception/GlobalExceptionHandler.java | 35 +++ .../example/task310/mapper/AuthorMapper.java | 13 + .../example/task310/mapper/MarkerMapper.java | 13 + .../task310/mapper/ReactionMapper.java | 13 + .../example/task310/mapper/TweetMapper.java | 13 + .../task310/repository/AuthorRepository.java | 8 + .../task310/repository/CrudRepository.java | 13 + .../repository/InMemoryRepository.java | 45 +++ .../task310/repository/MarkerRepository.java | 8 + .../repository/ReactionRepository.java | 8 + .../task310/repository/TweetRepository.java | 8 + .../task310/service/AuthorService.java | 13 + .../task310/service/MarkerService.java | 13 + .../task310/service/ReactionService.java | 13 + .../example/task310/service/TweetService.java | 13 + .../service/impl/AuthorServiceImpl.java | 60 ++++ .../service/impl/MarkerServiceImpl.java | 59 ++++ .../service/impl/ReactionServiceImpl.java | 59 ++++ .../service/impl/TweetServiceImpl.java | 66 ++++ .../src/main/resources/application.properties | 11 + .../task310/Task310ApplicationTests.java | 13 + 85 files changed, 1586 insertions(+), 621 deletions(-) delete mode 100644 351004/Romanovskiy/main.py delete mode 100644 351004/Romanovskiy/src/__init__.py delete mode 100644 351004/Romanovskiy/src/api/__init__.py delete mode 100644 351004/Romanovskiy/src/api/v1/__init__.py delete mode 100644 351004/Romanovskiy/src/api/v1/dep.py delete mode 100644 351004/Romanovskiy/src/api/v1/endpoints/__init__.py delete mode 100644 351004/Romanovskiy/src/api/v1/endpoints/author.py delete mode 100644 351004/Romanovskiy/src/api/v1/endpoints/note.py delete mode 100644 351004/Romanovskiy/src/api/v1/endpoints/tag.py delete mode 100644 351004/Romanovskiy/src/api/v1/endpoints/topic.py delete mode 100644 351004/Romanovskiy/src/api/v1/router.py delete mode 100644 351004/Romanovskiy/src/core/__init__.py delete mode 100644 351004/Romanovskiy/src/core/constants/__init__.py delete mode 100644 351004/Romanovskiy/src/core/errors/__init__.py delete mode 100644 351004/Romanovskiy/src/core/errors/errors.py delete mode 100644 351004/Romanovskiy/src/core/errors/handlers.py delete mode 100644 351004/Romanovskiy/src/core/errors/messages.py delete mode 100644 351004/Romanovskiy/src/domain/__init__.py delete mode 100644 351004/Romanovskiy/src/domain/models/__init__.py delete mode 100644 351004/Romanovskiy/src/domain/models/author.py delete mode 100644 351004/Romanovskiy/src/domain/models/note.py delete mode 100644 351004/Romanovskiy/src/domain/models/tag.py delete mode 100644 351004/Romanovskiy/src/domain/models/topic.py delete mode 100644 351004/Romanovskiy/src/domain/repositories/__init__.py delete mode 100644 351004/Romanovskiy/src/domain/repositories/in_memory/__init__.py delete mode 100644 351004/Romanovskiy/src/domain/repositories/in_memory/in_memory_topic.py delete mode 100644 351004/Romanovskiy/src/domain/repositories/interfaces/__init__.py delete mode 100644 351004/Romanovskiy/src/domain/repositories/interfaces/base.py delete mode 100644 351004/Romanovskiy/src/schemas/__init__.py delete mode 100644 351004/Romanovskiy/src/schemas/author.py delete mode 100644 351004/Romanovskiy/src/schemas/note.py delete mode 100644 351004/Romanovskiy/src/schemas/tag.py delete mode 100644 351004/Romanovskiy/src/schemas/topic.py delete mode 100644 351004/Romanovskiy/src/services/__init__.py delete mode 100644 351004/Romanovskiy/src/services/author.py delete mode 100644 351004/Romanovskiy/src/services/note.py delete mode 100644 351004/Romanovskiy/src/services/tag.py delete mode 100644 351004/Romanovskiy/src/services/topic.py create mode 100644 351004/Romanovskiy/task310/.gitattributes create mode 100644 351004/Romanovskiy/task310/.gitignore create mode 100644 351004/Romanovskiy/task310/.mvn/wrapper/maven-wrapper.properties create mode 100644 351004/Romanovskiy/task310/mvnw create mode 100644 351004/Romanovskiy/task310/mvnw.cmd create mode 100644 351004/Romanovskiy/task310/pom.xml create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/Task310Application.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/controller/AuthorController.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/controller/MarkerController.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/controller/ReactionController.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/controller/TweetController.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/request/AuthorRequestTo.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/request/MarkerRequestTo.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/request/ReactionRequestTo.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/request/TweetRequestTo.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/response/AuthorResponseTo.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/response/MarkerResponseTo.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/response/ReactionResponseTo.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/response/TweetResponseTo.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/Author.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/BaseEntity.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/Marker.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/Reaction.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/Tweet.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/exception/EntityNotFoundException.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/exception/ErrorResponse.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/exception/GlobalExceptionHandler.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/mapper/AuthorMapper.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/mapper/MarkerMapper.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/mapper/ReactionMapper.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/mapper/TweetMapper.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/AuthorRepository.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/CrudRepository.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/InMemoryRepository.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/MarkerRepository.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/ReactionRepository.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/TweetRepository.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/service/AuthorService.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/service/MarkerService.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/service/ReactionService.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/service/TweetService.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/service/impl/AuthorServiceImpl.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/service/impl/MarkerServiceImpl.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/service/impl/ReactionServiceImpl.java create mode 100644 351004/Romanovskiy/task310/src/main/java/com/example/task310/service/impl/TweetServiceImpl.java create mode 100644 351004/Romanovskiy/task310/src/main/resources/application.properties create mode 100644 351004/Romanovskiy/task310/src/test/java/com/example/task310/Task310ApplicationTests.java diff --git a/351004/Romanovskiy/main.py b/351004/Romanovskiy/main.py deleted file mode 100644 index 53780ba3d..000000000 --- a/351004/Romanovskiy/main.py +++ /dev/null @@ -1,10 +0,0 @@ -from fastapi import FastAPI - -from src.api.v1 import router_v1 -from src.core.errors import register_error_handlers - -app = FastAPI(title="DistComp", version="1.0") - -register_error_handlers(app) - -app.include_router(router_v1, prefix="/api") \ No newline at end of file diff --git a/351004/Romanovskiy/src/__init__.py b/351004/Romanovskiy/src/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/351004/Romanovskiy/src/api/__init__.py b/351004/Romanovskiy/src/api/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/351004/Romanovskiy/src/api/v1/__init__.py b/351004/Romanovskiy/src/api/v1/__init__.py deleted file mode 100644 index 07fdaef81..000000000 --- a/351004/Romanovskiy/src/api/v1/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from src.api.v1.router import router_v1 \ No newline at end of file diff --git a/351004/Romanovskiy/src/api/v1/dep.py b/351004/Romanovskiy/src/api/v1/dep.py deleted file mode 100644 index dbc04ba58..000000000 --- a/351004/Romanovskiy/src/api/v1/dep.py +++ /dev/null @@ -1,38 +0,0 @@ -from functools import lru_cache - -from src.domain.repositories.in_memory import InMemoryAuthorRepository, InMemoryNoteRepository, \ - InMemoryTopicRepository -from src.services import AuthorService, TopicService, NoteService, TagService - - -@lru_cache -def get_author_repo() -> InMemoryAuthorRepository: - return InMemoryAuthorRepository() - -def get_author_service() -> AuthorService: - repo = get_author_repo() - return AuthorService(repo) - -@lru_cache -def get_topic_repo() -> InMemoryTopicRepository: - return InMemoryTopicRepository() - -def get_topic_service() -> TopicService: - repo = get_topic_repo() - return TopicService(repo) - -@lru_cache -def get_note_repo() -> InMemoryNoteRepository: - return InMemoryNoteRepository() - -def get_note_service() -> NoteService: - repo = get_note_repo() - return NoteService(repo) - -@lru_cache -def get_tag_repo() -> InMemoryTopicRepository: - return InMemoryTopicRepository() - -def get_tag_service() -> TagService: - repo = get_tag_repo() - return TagService(repo) \ No newline at end of file diff --git a/351004/Romanovskiy/src/api/v1/endpoints/__init__.py b/351004/Romanovskiy/src/api/v1/endpoints/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/351004/Romanovskiy/src/api/v1/endpoints/author.py b/351004/Romanovskiy/src/api/v1/endpoints/author.py deleted file mode 100644 index 654fbfb72..000000000 --- a/351004/Romanovskiy/src/api/v1/endpoints/author.py +++ /dev/null @@ -1,31 +0,0 @@ -from http import HTTPStatus -from typing import List - -from fastapi import APIRouter, Depends - -from src.api.v1.dep import get_author_service -from src.schemas.author import AuthorResponseTo, AuthorRequestTo -from src.services.author import AuthorService - -router = APIRouter(prefix="/authors") - -@router.get("", response_model=List[AuthorResponseTo], status_code=HTTPStatus.OK) -def get_all(service: AuthorService = Depends(get_author_service)): - return service.get_all() - -@router.get("/{author_id}", response_model=AuthorResponseTo, status_code=HTTPStatus.OK) -def get_by_id(author_id: int, service: AuthorService = Depends(get_author_service)): - return service.get_one(author_id) - -@router.post("", response_model=AuthorResponseTo, status_code=HTTPStatus.CREATED) -def create(request: AuthorRequestTo, service: AuthorService = Depends(get_author_service)): - return service.create(request) - - -@router.put("/{author_id}", response_model=AuthorResponseTo, status_code=HTTPStatus.OK) -def update(author_id: int, dto: AuthorRequestTo, service: AuthorService = Depends(get_author_service)): - return service.update(author_id, dto) - -@router.delete("/{author_id}", status_code=HTTPStatus.NO_CONTENT) -def delete(author_id: int, service: AuthorService = Depends(get_author_service)): - service.delete(author_id) \ No newline at end of file diff --git a/351004/Romanovskiy/src/api/v1/endpoints/note.py b/351004/Romanovskiy/src/api/v1/endpoints/note.py deleted file mode 100644 index 3e10a2f85..000000000 --- a/351004/Romanovskiy/src/api/v1/endpoints/note.py +++ /dev/null @@ -1,30 +0,0 @@ -from http import HTTPStatus -from typing import List - -from fastapi import APIRouter, Depends - -from src.api.v1.dep import get_note_service -from src.schemas.note import NoteResponseTo, NoteRequestTo -from src.services import NoteService - -router = APIRouter(prefix="/notes") - -@router.get("", response_model=List[NoteResponseTo], status_code=HTTPStatus.OK) -def get_all(service: NoteService = Depends(get_note_service)): - return service.get_all() - -@router.get("/{note_id}", response_model=NoteResponseTo, status_code=HTTPStatus.OK) -def get_by_id(note_id: int, service: NoteService = Depends(get_note_service)): - return service.get_one(note_id) - -@router.post("", response_model=NoteResponseTo, status_code=HTTPStatus.CREATED) -def create(dto: NoteRequestTo, service: NoteService = Depends(get_note_service)): - return service.create(dto) - -@router.put("/{note_id}", response_model=NoteResponseTo, status_code=HTTPStatus.OK) -def put(note_id: int, dto: NoteRequestTo, service: NoteService = Depends(get_note_service)): - return service.update(note_id, dto) - -@router.delete("/{note_id}", status_code=HTTPStatus.NO_CONTENT) -def delete(note_id: int, service: NoteService = Depends(get_note_service)): - return service.delete(note_id) \ No newline at end of file diff --git a/351004/Romanovskiy/src/api/v1/endpoints/tag.py b/351004/Romanovskiy/src/api/v1/endpoints/tag.py deleted file mode 100644 index d3572ac04..000000000 --- a/351004/Romanovskiy/src/api/v1/endpoints/tag.py +++ /dev/null @@ -1,31 +0,0 @@ -from http import HTTPStatus -from typing import List - -from fastapi import APIRouter -from fastapi.params import Depends - -from src.api.v1.dep import get_tag_service -from src.schemas.tag import TagResponseTo, TagRequestTo -from src.services import TagService - -router = APIRouter(prefix="/tags") - -@router.get("", response_model=List[TagResponseTo], status_code=HTTPStatus.OK) -def get_all(service: TagService = Depends(get_tag_service)): - return service.get_all() - -@router.get("/{tag_id}", response_model=TagResponseTo, status_code=HTTPStatus.OK) -def get_by_id(tag_id: int, service: TagService = Depends(get_tag_service)): - return service.get_one(tag_id) - -@router.post("", response_model=TagResponseTo, status_code=HTTPStatus.CREATED) -def create(dto: TagRequestTo, service: TagService = Depends(get_tag_service)): - return service.create(dto) - -@router.put("/{tag_id}", response_model=TagResponseTo, status_code=HTTPStatus.OK) -def update(tag_id: int, dto: TagRequestTo, service: TagService = Depends(get_tag_service)): - return service.update(tag_id, dto) - -@router.delete("/{tag_id}", status_code=HTTPStatus.NO_CONTENT) -def delete(tag_id: int, service: TagService = Depends(get_tag_service)): - service.delete(tag_id) \ No newline at end of file diff --git a/351004/Romanovskiy/src/api/v1/endpoints/topic.py b/351004/Romanovskiy/src/api/v1/endpoints/topic.py deleted file mode 100644 index eff3bd4ea..000000000 --- a/351004/Romanovskiy/src/api/v1/endpoints/topic.py +++ /dev/null @@ -1,30 +0,0 @@ -from http import HTTPStatus -from typing import List - -from fastapi import APIRouter, Depends - -from src.api.v1.dep import get_topic_service -from src.schemas.topic import TopicRequestTo, TopicResponseTo -from src.services import TopicService - -router = APIRouter(prefix="/topics") - -@router.get("/{topic_id}", response_model=TopicResponseTo, status_code=HTTPStatus.OK) -def get_by_id(topic_id: int, service: TopicService = Depends(get_topic_service)): - return service.get_one(topic_id) - -@router.get("", response_model=List[TopicResponseTo], status_code=HTTPStatus.OK) -def get_all(service: TopicService = Depends(get_topic_service)): - return service.get_all() - -@router.post("", response_model=TopicResponseTo, status_code=HTTPStatus.CREATED) -def create(dto: TopicRequestTo, service: TopicService = Depends(get_topic_service)): - return service.create(dto) - -@router.put("/{topic_id}", response_model=TopicResponseTo, status_code=HTTPStatus.OK) -def update(topic_id: int, dto: TopicRequestTo, service: TopicService = Depends(get_topic_service)): - return service.update(topic_id, dto) - -@router.delete("/{topic_id}", status_code=HTTPStatus.NO_CONTENT) -def delete(topic_id: int, service: TopicService = Depends(get_topic_service)): - service.delete(topic_id) \ No newline at end of file diff --git a/351004/Romanovskiy/src/api/v1/router.py b/351004/Romanovskiy/src/api/v1/router.py deleted file mode 100644 index d1d0aa2c7..000000000 --- a/351004/Romanovskiy/src/api/v1/router.py +++ /dev/null @@ -1,10 +0,0 @@ -from fastapi import APIRouter - -from src.api.v1.endpoints import author, topic, note, tag - -router_v1 = APIRouter(prefix="/v1.0") - -router_v1.include_router(author.router, tags=["authors"]) -router_v1.include_router(topic.router, tags=["topics"]) -router_v1.include_router(note.router, tags=["notes"]) -router_v1.include_router(tag.router, tags=["tags"]) \ No newline at end of file diff --git a/351004/Romanovskiy/src/core/__init__.py b/351004/Romanovskiy/src/core/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/351004/Romanovskiy/src/core/constants/__init__.py b/351004/Romanovskiy/src/core/constants/__init__.py deleted file mode 100644 index 1cfdfca47..000000000 --- a/351004/Romanovskiy/src/core/constants/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from enum import IntEnum -from http import HTTPStatus - -__all__ = ["ErrorStatus"] - -class ErrorStatus(IntEnum): - NOT_FOUND = HTTPStatus.NOT_FOUND.value * 100 + 1 \ No newline at end of file diff --git a/351004/Romanovskiy/src/core/errors/__init__.py b/351004/Romanovskiy/src/core/errors/__init__.py deleted file mode 100644 index 614446c2b..000000000 --- a/351004/Romanovskiy/src/core/errors/__init__.py +++ /dev/null @@ -1,9 +0,0 @@ -from fastapi import FastAPI - -from src.core.errors.errors import HttpNotFoundError -from src.core.errors.handlers import not_found_handler -from src.core.errors.messages import NoteErrorMessage, AuthorErrorMessage, TopicErrorMessage - - -def register_error_handlers(app: FastAPI) -> None: - app.add_exception_handler(HttpNotFoundError, not_found_handler) \ No newline at end of file diff --git a/351004/Romanovskiy/src/core/errors/errors.py b/351004/Romanovskiy/src/core/errors/errors.py deleted file mode 100644 index 201710d2f..000000000 --- a/351004/Romanovskiy/src/core/errors/errors.py +++ /dev/null @@ -1,10 +0,0 @@ -from src.core.constants import ErrorStatus - - -class HttpError(Exception): - def __init__(self, message: str, error_code: ErrorStatus): - super().__init__(message) - self.error_code = error_code - -class HttpNotFoundError(HttpError): - pass \ No newline at end of file diff --git a/351004/Romanovskiy/src/core/errors/handlers.py b/351004/Romanovskiy/src/core/errors/handlers.py deleted file mode 100644 index c43d66872..000000000 --- a/351004/Romanovskiy/src/core/errors/handlers.py +++ /dev/null @@ -1,9 +0,0 @@ -from http import HTTPStatus - -from starlette.responses import JSONResponse - -from src.core.errors.errors import HttpNotFoundError - - -def not_found_handler(_, exc: HttpNotFoundError): - return JSONResponse(status_code=HTTPStatus.NOT_FOUND, content={"errorMessage": str(exc), "errorCode": exc.error_code}) \ No newline at end of file diff --git a/351004/Romanovskiy/src/core/errors/messages.py b/351004/Romanovskiy/src/core/errors/messages.py deleted file mode 100644 index 37b2bd9c7..000000000 --- a/351004/Romanovskiy/src/core/errors/messages.py +++ /dev/null @@ -1,14 +0,0 @@ -from enum import Enum - - -class TopicErrorMessage(str, Enum): - NOT_FOUND = "Topic not found" - -class AuthorErrorMessage(str, Enum): - NOT_FOUND = "Author not found" - -class NoteErrorMessage(str, Enum): - NOT_FOUND = "Note not found" - -class TagErrorMessage(str, Enum): - NOT_FOUND = "Tag not found" \ No newline at end of file diff --git a/351004/Romanovskiy/src/domain/__init__.py b/351004/Romanovskiy/src/domain/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/351004/Romanovskiy/src/domain/models/__init__.py b/351004/Romanovskiy/src/domain/models/__init__.py deleted file mode 100644 index cf61a0aa3..000000000 --- a/351004/Romanovskiy/src/domain/models/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -from src.domain.models.author import Author -from src.domain.models.note import Note -from src.domain.models.tag import Tag -from src.domain.models.topic import Topic diff --git a/351004/Romanovskiy/src/domain/models/author.py b/351004/Romanovskiy/src/domain/models/author.py deleted file mode 100644 index 806c20a52..000000000 --- a/351004/Romanovskiy/src/domain/models/author.py +++ /dev/null @@ -1,10 +0,0 @@ -from dataclasses import dataclass - - -@dataclass -class Author: - id: int - login: str - password: str - firstname: str - lastname: str \ No newline at end of file diff --git a/351004/Romanovskiy/src/domain/models/note.py b/351004/Romanovskiy/src/domain/models/note.py deleted file mode 100644 index fe7f7c94b..000000000 --- a/351004/Romanovskiy/src/domain/models/note.py +++ /dev/null @@ -1,8 +0,0 @@ -from dataclasses import dataclass - - -@dataclass -class Note: - id: int - content: str - topic_id: int diff --git a/351004/Romanovskiy/src/domain/models/tag.py b/351004/Romanovskiy/src/domain/models/tag.py deleted file mode 100644 index 591eb75db..000000000 --- a/351004/Romanovskiy/src/domain/models/tag.py +++ /dev/null @@ -1,7 +0,0 @@ -from dataclasses import dataclass - - -@dataclass -class Tag: - id: int - name: str \ No newline at end of file diff --git a/351004/Romanovskiy/src/domain/models/topic.py b/351004/Romanovskiy/src/domain/models/topic.py deleted file mode 100644 index 5d9cf7bb9..000000000 --- a/351004/Romanovskiy/src/domain/models/topic.py +++ /dev/null @@ -1,11 +0,0 @@ -from dataclasses import dataclass -from datetime import datetime - -@dataclass -class Topic: - id: int - title: str - content: str - author_id: int - created_at: datetime | None = None - updated_at: datetime | None = None diff --git a/351004/Romanovskiy/src/domain/repositories/__init__.py b/351004/Romanovskiy/src/domain/repositories/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/351004/Romanovskiy/src/domain/repositories/in_memory/__init__.py b/351004/Romanovskiy/src/domain/repositories/in_memory/__init__.py deleted file mode 100644 index e18db7276..000000000 --- a/351004/Romanovskiy/src/domain/repositories/in_memory/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -from src.domain.models import Author, Note, Tag -from src.domain.repositories.in_memory.in_memory_topic import InMemoryTopicRepository -from src.domain.repositories.interfaces import InMemoryRepository - - -class InMemoryAuthorRepository(InMemoryRepository[Author]): - pass - -class InMemoryNoteRepository(InMemoryRepository[Note]): - pass - -class InMemoryTagRepository(InMemoryRepository[Tag]): - pass \ No newline at end of file diff --git a/351004/Romanovskiy/src/domain/repositories/in_memory/in_memory_topic.py b/351004/Romanovskiy/src/domain/repositories/in_memory/in_memory_topic.py deleted file mode 100644 index 024b96477..000000000 --- a/351004/Romanovskiy/src/domain/repositories/in_memory/in_memory_topic.py +++ /dev/null @@ -1,20 +0,0 @@ -from datetime import datetime - -from src.domain.models import Topic -from src.domain.repositories.interfaces import InMemoryRepository - - -class InMemoryTopicRepository(InMemoryRepository[Topic]): - def create(self, topic: Topic) -> Topic: - new_id = self._next_id() - topic.id = new_id - topic.created_at = datetime.now() - topic.updated_at = datetime.now() - self._data[new_id] = topic - return topic - - def update(self, topic: Topic) -> Topic: - topic.created_at = self._data[topic.id].created_at - topic.updated_at = datetime.now() - self._data[topic.id] = topic - return topic \ No newline at end of file diff --git a/351004/Romanovskiy/src/domain/repositories/interfaces/__init__.py b/351004/Romanovskiy/src/domain/repositories/interfaces/__init__.py deleted file mode 100644 index 5d2b2f99f..000000000 --- a/351004/Romanovskiy/src/domain/repositories/interfaces/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from src.domain.repositories.interfaces.base import InMemoryRepository, Repository diff --git a/351004/Romanovskiy/src/domain/repositories/interfaces/base.py b/351004/Romanovskiy/src/domain/repositories/interfaces/base.py deleted file mode 100644 index 377b75870..000000000 --- a/351004/Romanovskiy/src/domain/repositories/interfaces/base.py +++ /dev/null @@ -1,49 +0,0 @@ -from abc import abstractmethod, ABC -from typing import Generic, TypeVar, List, Dict - -T = TypeVar("T") - -class Repository(ABC, Generic[T]): - @abstractmethod - def get_one(self, entity_id: int) -> T: - pass - @abstractmethod - def get_all(self) -> List[T]: - pass - @abstractmethod - def create(self, entity: T) -> T: - pass - @abstractmethod - def update(self, entity: T) -> T: - pass - @abstractmethod - def delete(self, entity_id: int) -> None: - pass - -class InMemoryRepository(Repository[T]): - def __init__(self) -> None: - self._data: Dict[int, T] = {} - self._id = 0 - - def _next_id(self) -> int: - self._id += 1 - return self._id - - def get_one(self, entity_id: int) -> T: - return self._data[entity_id] - - def get_all(self) -> List[T]: - return list(self._data.values()) - - def create(self, entity: T) -> T: - new_id = self._next_id() - entity.id = new_id - self._data[new_id] = entity - return entity - - def update(self, entity: T) -> T: - self._data[entity.id] = entity - return entity - - def delete(self, entity_id: int) -> None: - self._data.pop(entity_id) \ No newline at end of file diff --git a/351004/Romanovskiy/src/schemas/__init__.py b/351004/Romanovskiy/src/schemas/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/351004/Romanovskiy/src/schemas/author.py b/351004/Romanovskiy/src/schemas/author.py deleted file mode 100644 index 95afe5110..000000000 --- a/351004/Romanovskiy/src/schemas/author.py +++ /dev/null @@ -1,15 +0,0 @@ -from pydantic import BaseModel, ConfigDict - -class AuthroBase(BaseModel): - login: str - password: str - firstname: str - lastname: str - - model_config = ConfigDict(from_attributes=True) - -class AuthorRequestTo(AuthroBase): - pass - -class AuthorResponseTo(AuthroBase): - id: int \ No newline at end of file diff --git a/351004/Romanovskiy/src/schemas/note.py b/351004/Romanovskiy/src/schemas/note.py deleted file mode 100644 index 4900c5e2d..000000000 --- a/351004/Romanovskiy/src/schemas/note.py +++ /dev/null @@ -1,15 +0,0 @@ -from pydantic import BaseModel, ConfigDict -from pydantic.alias_generators import to_camel - - -class NoteBase(BaseModel): - content: str - topic_id: int - - model_config = ConfigDict(from_attributes=True, alias_generator=to_camel, validate_by_name=True) - -class NoteRequestTo(NoteBase): - pass - -class NoteResponseTo(NoteBase): - id: int \ No newline at end of file diff --git a/351004/Romanovskiy/src/schemas/tag.py b/351004/Romanovskiy/src/schemas/tag.py deleted file mode 100644 index f53382880..000000000 --- a/351004/Romanovskiy/src/schemas/tag.py +++ /dev/null @@ -1,14 +0,0 @@ -from pydantic import BaseModel, ConfigDict -from pydantic.alias_generators import to_camel - - -class TagBase(BaseModel): - name: str - - model_config = ConfigDict(from_attributes=True, alias_generator=to_camel, validate_by_alias=True) - -class TagRequestTo(TagBase): - pass - -class TagResponseTo(TagBase): - id: int \ No newline at end of file diff --git a/351004/Romanovskiy/src/schemas/topic.py b/351004/Romanovskiy/src/schemas/topic.py deleted file mode 100644 index a37ca10fe..000000000 --- a/351004/Romanovskiy/src/schemas/topic.py +++ /dev/null @@ -1,16 +0,0 @@ -from pydantic import BaseModel, ConfigDict -from pydantic.alias_generators import to_camel - - -class TopicBase(BaseModel): - title: str - content: str - author_id: int - - model_config = ConfigDict(from_attributes=True, alias_generator=to_camel, validate_by_name=True) - -class TopicRequestTo(TopicBase): - pass - -class TopicResponseTo(TopicBase): - id: int \ No newline at end of file diff --git a/351004/Romanovskiy/src/services/__init__.py b/351004/Romanovskiy/src/services/__init__.py deleted file mode 100644 index 051180e30..000000000 --- a/351004/Romanovskiy/src/services/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -from src.services.author import AuthorService -from src.services.note import NoteService -from src.services.tag import TagService -from src.services.topic import TopicService diff --git a/351004/Romanovskiy/src/services/author.py b/351004/Romanovskiy/src/services/author.py deleted file mode 100644 index b250aac0e..000000000 --- a/351004/Romanovskiy/src/services/author.py +++ /dev/null @@ -1,54 +0,0 @@ -from typing import List - -from src.core.constants import ErrorStatus -from src.core.errors import HttpNotFoundError, TopicErrorMessage -from src.domain.models.author import Author -from src.domain.repositories.interfaces.base import Repository -from src.schemas.author import AuthorResponseTo, AuthorRequestTo - - -class AuthorService: - def __init__(self, repo: Repository[Author]) -> None: - self._repo = repo - - def get_one(self, author_id: int) -> AuthorResponseTo: - try: - author = self._repo.get_one(author_id) - except KeyError: - raise HttpNotFoundError(TopicErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) - return AuthorResponseTo.model_validate(author) - - def get_all(self) -> List[AuthorResponseTo]: - authors = self._repo.get_all() - return [AuthorResponseTo.model_validate(a) for a in authors] - - def create(self, dto: AuthorRequestTo) -> AuthorResponseTo: - author = Author( - id=0, - login=dto.login, - password=dto.password, - lastname=dto.lastname, - firstname=dto.firstname, - ) - created_author = self._repo.create(author) - return AuthorResponseTo.model_validate(created_author) - - def update(self, author_id: int, dto: AuthorRequestTo) -> AuthorResponseTo: - author = Author( - id=author_id, - login=dto.login, - password=dto.password, - lastname=dto.lastname, - firstname=dto.firstname, - ) - try: - updated_author = self._repo.update(author) - except KeyError: - raise HttpNotFoundError(TopicErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) - return AuthorResponseTo.model_validate(updated_author) - - def delete(self, author_id: int) -> None: - try: - self._repo.delete(author_id) - except KeyError: - raise HttpNotFoundError(TopicErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) \ No newline at end of file diff --git a/351004/Romanovskiy/src/services/note.py b/351004/Romanovskiy/src/services/note.py deleted file mode 100644 index cb83f0cc3..000000000 --- a/351004/Romanovskiy/src/services/note.py +++ /dev/null @@ -1,49 +0,0 @@ -from typing import List - -from src.core.constants import ErrorStatus -from src.core.errors import HttpNotFoundError, NoteErrorMessage -from src.domain.models import Note -from src.domain.repositories.interfaces import Repository -from src.schemas.note import NoteResponseTo, NoteRequestTo - - -class NoteService: - def __init__(self, repo: Repository[Note]): - self._repo = repo - - def get_one(self, note_id: int) -> NoteResponseTo: - try: - note = self._repo.get_one(note_id) - except KeyError: - raise HttpNotFoundError(NoteErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) - return NoteResponseTo.model_validate(note) - - def get_all(self) -> List[Note]: - return self._repo.get_all() - - def create(self, dto: NoteRequestTo) -> NoteResponseTo: - note = Note( - id=0, - content=dto.content, - topic_id=dto.topic_id - ) - created_note = self._repo.create(note) - return NoteResponseTo.model_validate(created_note) - - def update(self, note_id: int, dto: NoteRequestTo) -> NoteResponseTo: - old_note = Note( - id=note_id, - content=dto.content, - topic_id=dto.topic_id - ) - try: - updated_note = self._repo.update(old_note) - except KeyError: - raise HttpNotFoundError(NoteErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) - return NoteResponseTo.model_validate(updated_note) - - def delete(self, note_id: int) -> None: - try: - self._repo.delete(note_id) - except KeyError: - raise HttpNotFoundError(NoteErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) \ No newline at end of file diff --git a/351004/Romanovskiy/src/services/tag.py b/351004/Romanovskiy/src/services/tag.py deleted file mode 100644 index f5a07ac63..000000000 --- a/351004/Romanovskiy/src/services/tag.py +++ /dev/null @@ -1,49 +0,0 @@ -from typing import List - -from src.core.constants import ErrorStatus -from src.core.errors import HttpNotFoundError -from src.core.errors.messages import TagErrorMessage -from src.domain.models import Tag -from src.domain.repositories.interfaces import Repository -from src.schemas.tag import TagResponseTo, TagRequestTo - - -class TagService: - def __init__(self, repo: Repository[Tag]) -> None: - self._repo = repo - - def get_one(self, tag_id: int) -> TagResponseTo: - try: - tag = self._repo.get_one(tag_id) - except KeyError: - raise HttpNotFoundError(TagErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) - return TagResponseTo.model_validate(tag) - - def get_all(self) -> List[TagResponseTo]: - tags = self._repo.get_all() - return [TagResponseTo.model_validate(t) for t in tags] - - def create(self, dto: TagRequestTo) -> TagResponseTo: - tag = Tag( - id=0, - name=dto.name, - ) - created_tag = self._repo.create(tag) - return TagResponseTo.model_validate(created_tag) - - def update(self, tag_id: int, dto: TagRequestTo) -> TagResponseTo: - tag = Tag( - id=tag_id, - name=dto.name, - ) - try: - updated_tag = self._repo.update(tag) - except KeyError: - raise HttpNotFoundError(TagErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) - return TagResponseTo.model_validate(updated_tag) - - def delete(self, tag_id: int) -> None: - try: - self._repo.delete(tag_id) - except KeyError: - raise HttpNotFoundError(TagErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) diff --git a/351004/Romanovskiy/src/services/topic.py b/351004/Romanovskiy/src/services/topic.py deleted file mode 100644 index f6f966aea..000000000 --- a/351004/Romanovskiy/src/services/topic.py +++ /dev/null @@ -1,52 +0,0 @@ -from typing import List - -from src.core.constants import ErrorStatus -from src.core.errors import HttpNotFoundError, TopicErrorMessage -from src.domain.models import Topic -from src.domain.repositories.interfaces import Repository -from src.schemas.topic import TopicResponseTo, TopicRequestTo - - -class TopicService: - def __init__(self, repo: Repository[Topic]): - self._repo = repo - - def get_one(self, topic_id: int) -> TopicResponseTo: - try: - topic = self._repo.get_one(topic_id) - except KeyError: - raise HttpNotFoundError(TopicErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) - return TopicResponseTo.model_validate(topic) - - def get_all(self) -> List[TopicResponseTo]: - topics = self._repo.get_all() - return [TopicResponseTo.model_validate(t) for t in topics] - - def create(self, dto: TopicRequestTo) -> TopicResponseTo: - topic = Topic( - id=0, - title=dto.title, - content=dto.content, - author_id=dto.author_id, - ) - created_topic = self._repo.create(topic) - return TopicResponseTo.model_validate(created_topic) - - def update(self, topic_id: int, dto: TopicRequestTo) -> TopicResponseTo: - topic = Topic( - id=topic_id, - title=dto.title, - content=dto.content, - author_id=dto.author_id, - ) - try: - updated_topic = self._repo.update(topic) - except KeyError: - raise HttpNotFoundError(TopicErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) - return TopicResponseTo.model_validate(updated_topic) - - def delete(self, topic_id: int) -> None: - try: - self._repo.delete(topic_id) - except KeyError: - raise HttpNotFoundError(TopicErrorMessage.NOT_FOUND, ErrorStatus.NOT_FOUND) \ No newline at end of file diff --git a/351004/Romanovskiy/task310/.gitattributes b/351004/Romanovskiy/task310/.gitattributes new file mode 100644 index 000000000..3b41682ac --- /dev/null +++ b/351004/Romanovskiy/task310/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/351004/Romanovskiy/task310/.gitignore b/351004/Romanovskiy/task310/.gitignore new file mode 100644 index 000000000..667aaef0c --- /dev/null +++ b/351004/Romanovskiy/task310/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/351004/Romanovskiy/task310/.mvn/wrapper/maven-wrapper.properties b/351004/Romanovskiy/task310/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..8dea6c227 --- /dev/null +++ b/351004/Romanovskiy/task310/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip diff --git a/351004/Romanovskiy/task310/mvnw b/351004/Romanovskiy/task310/mvnw new file mode 100644 index 000000000..bd8896bf2 --- /dev/null +++ b/351004/Romanovskiy/task310/mvnw @@ -0,0 +1,295 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.4 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/351004/Romanovskiy/task310/mvnw.cmd b/351004/Romanovskiy/task310/mvnw.cmd new file mode 100644 index 000000000..92450f932 --- /dev/null +++ b/351004/Romanovskiy/task310/mvnw.cmd @@ -0,0 +1,189 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.4 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/351004/Romanovskiy/task310/pom.xml b/351004/Romanovskiy/task310/pom.xml new file mode 100644 index 000000000..afe0b9925 --- /dev/null +++ b/351004/Romanovskiy/task310/pom.xml @@ -0,0 +1,102 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.5.11 + + + com.example + task310 + 0.0.1-SNAPSHOT + task310 + Demo project for Spring Boot + + + + + + + + + + + + + + + 21 + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-web + + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + org.mapstruct + mapstruct + 1.5.5.Final + + + org.mapstruct + mapstruct-processor + 1.5.5.Final + provided + + + io.rest-assured + rest-assured + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + 21 + 21 + + + + org.projectlombok + lombok + 1.18.30 + + + + org.mapstruct + mapstruct-processor + 1.5.5.Final + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/Task310Application.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/Task310Application.java new file mode 100644 index 000000000..fa0ecadc6 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/Task310Application.java @@ -0,0 +1,13 @@ +package com.example.task310; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Task310Application { + + public static void main(String[] args) { + SpringApplication.run(Task310Application.class, args); + } + +} diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/controller/AuthorController.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/controller/AuthorController.java new file mode 100644 index 000000000..802968508 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/controller/AuthorController.java @@ -0,0 +1,46 @@ +package com.example.task310.controller; + +import com.example.task310.domain.dto.request.AuthorRequestTo; +import com.example.task310.domain.dto.response.AuthorResponseTo; +import com.example.task310.service.AuthorService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/authors") +@RequiredArgsConstructor +public class AuthorController { + + private final AuthorService authorService; + + @PostMapping + @ResponseStatus(HttpStatus.CREATED) // 201 Created + public AuthorResponseTo create(@Valid @RequestBody AuthorRequestTo request) { + return authorService.create(request); + } + + @GetMapping + public List findAll() { + return authorService.findAll(); + } + + @GetMapping("/{id}") + public AuthorResponseTo findById(@PathVariable Long id) { + return authorService.findById(id); + } + + @PutMapping + public AuthorResponseTo update(@Valid @RequestBody AuthorRequestTo request) { + return authorService.update(request); + } + + @DeleteMapping("/{id}") + @ResponseStatus(HttpStatus.NO_CONTENT) // 204 No Content + public void deleteById(@PathVariable Long id) { + authorService.deleteById(id); + } +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/controller/MarkerController.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/controller/MarkerController.java new file mode 100644 index 000000000..8ff005d80 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/controller/MarkerController.java @@ -0,0 +1,46 @@ +package com.example.task310.controller; + +import com.example.task310.domain.dto.request.MarkerRequestTo; +import com.example.task310.domain.dto.response.MarkerResponseTo; +import com.example.task310.service.MarkerService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/markers") +@RequiredArgsConstructor +public class MarkerController { + + private final MarkerService markerService; + + @PostMapping + @ResponseStatus(HttpStatus.CREATED) + public MarkerResponseTo create(@Valid @RequestBody MarkerRequestTo request) { + return markerService.create(request); + } + + @GetMapping + public List findAll() { + return markerService.findAll(); + } + + @GetMapping("/{id}") + public MarkerResponseTo findById(@PathVariable Long id) { + return markerService.findById(id); + } + + @PutMapping + public MarkerResponseTo update(@Valid @RequestBody MarkerRequestTo request) { + return markerService.update(request); + } + + @DeleteMapping("/{id}") + @ResponseStatus(HttpStatus.NO_CONTENT) + public void deleteById(@PathVariable Long id) { + markerService.deleteById(id); + } +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/controller/ReactionController.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/controller/ReactionController.java new file mode 100644 index 000000000..4b3f62e46 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/controller/ReactionController.java @@ -0,0 +1,46 @@ +package com.example.task310.controller; + +import com.example.task310.domain.dto.request.ReactionRequestTo; +import com.example.task310.domain.dto.response.ReactionResponseTo; +import com.example.task310.service.ReactionService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/reactions") +@RequiredArgsConstructor +public class ReactionController { + + private final ReactionService reactionService; + + @PostMapping + @ResponseStatus(HttpStatus.CREATED) + public ReactionResponseTo create(@Valid @RequestBody ReactionRequestTo request) { + return reactionService.create(request); + } + + @GetMapping + public List findAll() { + return reactionService.findAll(); + } + + @GetMapping("/{id}") + public ReactionResponseTo findById(@PathVariable Long id) { + return reactionService.findById(id); + } + + @PutMapping + public ReactionResponseTo update(@Valid @RequestBody ReactionRequestTo request) { + return reactionService.update(request); + } + + @DeleteMapping("/{id}") + @ResponseStatus(HttpStatus.NO_CONTENT) + public void deleteById(@PathVariable Long id) { + reactionService.deleteById(id); + } +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/controller/TweetController.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/controller/TweetController.java new file mode 100644 index 000000000..f127da218 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/controller/TweetController.java @@ -0,0 +1,46 @@ +package com.example.task310.controller; + +import com.example.task310.domain.dto.request.TweetRequestTo; +import com.example.task310.domain.dto.response.TweetResponseTo; +import com.example.task310.service.TweetService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/tweets") +@RequiredArgsConstructor +public class TweetController { + + private final TweetService tweetService; + + @PostMapping + @ResponseStatus(HttpStatus.CREATED) + public TweetResponseTo create(@Valid @RequestBody TweetRequestTo request) { + return tweetService.create(request); + } + + @GetMapping + public List findAll() { + return tweetService.findAll(); + } + + @GetMapping("/{id}") + public TweetResponseTo findById(@PathVariable Long id) { + return tweetService.findById(id); + } + + @PutMapping + public TweetResponseTo update(@Valid @RequestBody TweetRequestTo request) { + return tweetService.update(request); + } + + @DeleteMapping("/{id}") + @ResponseStatus(HttpStatus.NO_CONTENT) + public void deleteById(@PathVariable Long id) { + tweetService.deleteById(id); + } +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/request/AuthorRequestTo.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/request/AuthorRequestTo.java new file mode 100644 index 000000000..7318ac1f2 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/request/AuthorRequestTo.java @@ -0,0 +1,30 @@ +package com.example.task310.domain.dto.request; + +import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class AuthorRequestTo { + private Long id; // Может быть null при создании + + @NotNull + @Size(min = 2, max = 64) + private String login; + + @NotNull + @Size(min = 8, max = 128) + private String password; + + @NotNull + @Size(min = 2, max = 64) + private String firstname; + + @NotNull + @Size(min = 2, max = 64) + private String lastname; +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/request/MarkerRequestTo.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/request/MarkerRequestTo.java new file mode 100644 index 000000000..77262508c --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/request/MarkerRequestTo.java @@ -0,0 +1,18 @@ +package com.example.task310.domain.dto.request; + +import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class MarkerRequestTo { + private Long id; + + @NotNull + @Size(min = 2, max = 32) + private String name; +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/request/ReactionRequestTo.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/request/ReactionRequestTo.java new file mode 100644 index 000000000..338e49a2b --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/request/ReactionRequestTo.java @@ -0,0 +1,21 @@ +package com.example.task310.domain.dto.request; + +import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ReactionRequestTo { + private Long id; + + @NotNull + private Long tweetId; + + @NotNull + @Size(min = 2, max = 2048) + private String content; +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/request/TweetRequestTo.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/request/TweetRequestTo.java new file mode 100644 index 000000000..818d493a1 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/request/TweetRequestTo.java @@ -0,0 +1,25 @@ +package com.example.task310.domain.dto.request; + +import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TweetRequestTo { + private Long id; + + @NotNull + private Long authorId; + + @NotNull + @Size(min = 2, max = 64) + private String title; + + @NotNull + @Size(min = 4, max = 2048) + private String content; +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/response/AuthorResponseTo.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/response/AuthorResponseTo.java new file mode 100644 index 000000000..f5ba58178 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/response/AuthorResponseTo.java @@ -0,0 +1,15 @@ +package com.example.task310.domain.dto.response; + +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class AuthorResponseTo { + private Long id; + private String login; + private String firstname; + private String lastname; +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/response/MarkerResponseTo.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/response/MarkerResponseTo.java new file mode 100644 index 000000000..df2a4bbd2 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/response/MarkerResponseTo.java @@ -0,0 +1,13 @@ +package com.example.task310.domain.dto.response; + +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class MarkerResponseTo { + private Long id; + private String name; +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/response/ReactionResponseTo.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/response/ReactionResponseTo.java new file mode 100644 index 000000000..af39bf6db --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/response/ReactionResponseTo.java @@ -0,0 +1,14 @@ +package com.example.task310.domain.dto.response; + +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ReactionResponseTo { + private Long id; + private Long tweetId; + private String content; +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/response/TweetResponseTo.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/response/TweetResponseTo.java new file mode 100644 index 000000000..9c18e0a84 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/dto/response/TweetResponseTo.java @@ -0,0 +1,18 @@ +package com.example.task310.domain.dto.response; + +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import java.time.LocalDateTime; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TweetResponseTo { + private Long id; + private Long authorId; + private String title; + private String content; + private LocalDateTime created; + private LocalDateTime modified; +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/Author.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/Author.java new file mode 100644 index 000000000..d60869b0e --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/Author.java @@ -0,0 +1,19 @@ +package com.example.task310.domain.entity; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public class Author extends BaseEntity { + private String login; + private String password; + private String firstname; + private String lastname; +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/BaseEntity.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/BaseEntity.java new file mode 100644 index 000000000..d0d00efec --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/BaseEntity.java @@ -0,0 +1,14 @@ +package com.example.task310.domain.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public abstract class BaseEntity { + private Long id; +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/Marker.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/Marker.java new file mode 100644 index 000000000..089b1bc5c --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/Marker.java @@ -0,0 +1,16 @@ +package com.example.task310.domain.entity; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public class Marker extends BaseEntity { + private String name; +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/Reaction.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/Reaction.java new file mode 100644 index 000000000..99460ce62 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/Reaction.java @@ -0,0 +1,17 @@ +package com.example.task310.domain.entity; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public class Reaction extends BaseEntity { + private Long tweetId; + private String content; +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/Tweet.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/Tweet.java new file mode 100644 index 000000000..7855a0066 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/domain/entity/Tweet.java @@ -0,0 +1,28 @@ +package com.example.task310.domain.entity; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.experimental.SuperBuilder; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder + +public class Tweet extends BaseEntity { + private Long authorId; + private String title; + private String content; + private LocalDateTime created; + private LocalDateTime modified; + + @Builder.Default + private List markers = new ArrayList<>(); +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/exception/EntityNotFoundException.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/exception/EntityNotFoundException.java new file mode 100644 index 000000000..0b40ee26c --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/exception/EntityNotFoundException.java @@ -0,0 +1,7 @@ +package com.example.task310.exception; + +public class EntityNotFoundException extends RuntimeException { + public EntityNotFoundException(String message) { + super(message); + } +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/exception/ErrorResponse.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/exception/ErrorResponse.java new file mode 100644 index 000000000..24f13a0b8 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/exception/ErrorResponse.java @@ -0,0 +1,13 @@ +package com.example.task310.exception; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ErrorResponse { + private String errorMessage; + private int errorCode; +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/exception/GlobalExceptionHandler.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/exception/GlobalExceptionHandler.java new file mode 100644 index 000000000..91f0bacb8 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/exception/GlobalExceptionHandler.java @@ -0,0 +1,35 @@ +package com.example.task310.exception; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@RestControllerAdvice +public class GlobalExceptionHandler { + + // 1. Обработка ошибок валидации (статус 400) + // Например: слишком короткий пароль или логин + @ExceptionHandler(MethodArgumentNotValidException.class) + @ResponseStatus(HttpStatus.BAD_REQUEST) + public ErrorResponse handleValidationException(MethodArgumentNotValidException ex) { + String message = ex.getBindingResult().getFieldErrors().get(0).getDefaultMessage(); + String field = ex.getBindingResult().getFieldErrors().get(0).getField(); + return new ErrorResponse("Validation failed: " + field + " " + message, 40001); + } + + // 2. Обработка ситуации "Не найдено" (статус 404) + @ExceptionHandler(EntityNotFoundException.class) + @ResponseStatus(HttpStatus.NOT_FOUND) + public ErrorResponse handleNotFoundException(EntityNotFoundException ex) { + return new ErrorResponse(ex.getMessage(), 40401); + } + + // 3. Обработка всех остальных непредвиденных ошибок (статус 500) + @ExceptionHandler(Exception.class) + @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) + public ErrorResponse handleAllExceptions(Exception ex) { + return new ErrorResponse("Internal server error: " + ex.getMessage(), 50000); + } +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/mapper/AuthorMapper.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/mapper/AuthorMapper.java new file mode 100644 index 000000000..6f7f34694 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/mapper/AuthorMapper.java @@ -0,0 +1,13 @@ +package com.example.task310.mapper; + +import com.example.task310.domain.dto.request.AuthorRequestTo; +import com.example.task310.domain.dto.response.AuthorResponseTo; +import com.example.task310.domain.entity.Author; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring") +public interface AuthorMapper { + Author toEntity(AuthorRequestTo request); + + AuthorResponseTo toResponse(Author author); +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/mapper/MarkerMapper.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/mapper/MarkerMapper.java new file mode 100644 index 000000000..295c2ebe6 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/mapper/MarkerMapper.java @@ -0,0 +1,13 @@ +package com.example.task310.mapper; + +import com.example.task310.domain.dto.request.MarkerRequestTo; +import com.example.task310.domain.dto.response.MarkerResponseTo; +import com.example.task310.domain.entity.Marker; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring") +public interface MarkerMapper { + Marker toEntity(MarkerRequestTo request); + + MarkerResponseTo toResponse(Marker marker); +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/mapper/ReactionMapper.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/mapper/ReactionMapper.java new file mode 100644 index 000000000..826eedf9d --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/mapper/ReactionMapper.java @@ -0,0 +1,13 @@ +package com.example.task310.mapper; + +import com.example.task310.domain.dto.request.ReactionRequestTo; +import com.example.task310.domain.dto.response.ReactionResponseTo; +import com.example.task310.domain.entity.Reaction; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring") +public interface ReactionMapper { + Reaction toEntity(ReactionRequestTo request); + + ReactionResponseTo toResponse(Reaction reaction); +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/mapper/TweetMapper.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/mapper/TweetMapper.java new file mode 100644 index 000000000..714dc1480 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/mapper/TweetMapper.java @@ -0,0 +1,13 @@ +package com.example.task310.mapper; + +import com.example.task310.domain.dto.request.TweetRequestTo; +import com.example.task310.domain.dto.response.TweetResponseTo; +import com.example.task310.domain.entity.Tweet; +import org.mapstruct.Mapper; + +@Mapper(componentModel = "spring") +public interface TweetMapper { + Tweet toEntity(TweetRequestTo request); + + TweetResponseTo toResponse(Tweet tweet); +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/AuthorRepository.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/AuthorRepository.java new file mode 100644 index 000000000..2b2d80b0c --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/AuthorRepository.java @@ -0,0 +1,8 @@ +package com.example.task310.repository; + +import com.example.task310.domain.entity.Author; +import org.springframework.stereotype.Repository; + +@Repository +public class AuthorRepository extends InMemoryRepository { +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/CrudRepository.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/CrudRepository.java new file mode 100644 index 000000000..2eaf34b70 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/CrudRepository.java @@ -0,0 +1,13 @@ +package com.example.task310.repository; + +import com.example.task310.domain.entity.BaseEntity; +import java.util.List; +import java.util.Optional; + +public interface CrudRepository { + T save(T entity); + Optional findById(Long id); + List findAll(); + void deleteById(Long id); + boolean existsById(Long id); +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/InMemoryRepository.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/InMemoryRepository.java new file mode 100644 index 000000000..f61242ac5 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/InMemoryRepository.java @@ -0,0 +1,45 @@ +package com.example.task310.repository; + +import com.example.task310.domain.entity.BaseEntity; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicLong; + +public abstract class InMemoryRepository implements CrudRepository { + // Хранилище данных в памяти + protected final Map storage = new ConcurrentHashMap<>(); + // Генератор ID (согласно схеме "generated") + private final AtomicLong idGenerator = new AtomicLong(1); + + @Override + public T save(T entity) { + if (entity.getId() == null) { + entity.setId(idGenerator.getAndIncrement()); + } + storage.put(entity.getId(), entity); + return entity; + } + + @Override + public Optional findById(Long id) { + return Optional.ofNullable(storage.get(id)); + } + + @Override + public List findAll() { + return new ArrayList<>(storage.values()); + } + + @Override + public void deleteById(Long id) { + storage.remove(id); + } + + @Override + public boolean existsById(Long id) { + return storage.containsKey(id); + } +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/MarkerRepository.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/MarkerRepository.java new file mode 100644 index 000000000..3f5c1c19f --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/MarkerRepository.java @@ -0,0 +1,8 @@ +package com.example.task310.repository; + +import com.example.task310.domain.entity.Marker; +import org.springframework.stereotype.Repository; + +@Repository +public class MarkerRepository extends InMemoryRepository { +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/ReactionRepository.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/ReactionRepository.java new file mode 100644 index 000000000..51aee3588 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/ReactionRepository.java @@ -0,0 +1,8 @@ +package com.example.task310.repository; + +import com.example.task310.domain.entity.Reaction; +import org.springframework.stereotype.Repository; + +@Repository +public class ReactionRepository extends InMemoryRepository { +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/TweetRepository.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/TweetRepository.java new file mode 100644 index 000000000..4e8dae156 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/repository/TweetRepository.java @@ -0,0 +1,8 @@ +package com.example.task310.repository; + +import com.example.task310.domain.entity.Tweet; +import org.springframework.stereotype.Repository; + +@Repository +public class TweetRepository extends InMemoryRepository { +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/AuthorService.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/AuthorService.java new file mode 100644 index 000000000..0b280a3ff --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/AuthorService.java @@ -0,0 +1,13 @@ +package com.example.task310.service; + +import com.example.task310.domain.dto.request.AuthorRequestTo; +import com.example.task310.domain.dto.response.AuthorResponseTo; +import java.util.List; + +public interface AuthorService { + AuthorResponseTo create(AuthorRequestTo request); + List findAll(); + AuthorResponseTo findById(Long id); + AuthorResponseTo update(AuthorRequestTo request); + void deleteById(Long id); +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/MarkerService.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/MarkerService.java new file mode 100644 index 000000000..b471cf712 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/MarkerService.java @@ -0,0 +1,13 @@ +package com.example.task310.service; + +import com.example.task310.domain.dto.request.MarkerRequestTo; +import com.example.task310.domain.dto.response.MarkerResponseTo; +import java.util.List; + +public interface MarkerService { + MarkerResponseTo create(MarkerRequestTo request); + List findAll(); + MarkerResponseTo findById(Long id); + MarkerResponseTo update(MarkerRequestTo request); + void deleteById(Long id); +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/ReactionService.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/ReactionService.java new file mode 100644 index 000000000..9f1201da2 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/ReactionService.java @@ -0,0 +1,13 @@ +package com.example.task310.service; + +import com.example.task310.domain.dto.request.ReactionRequestTo; +import com.example.task310.domain.dto.response.ReactionResponseTo; +import java.util.List; + +public interface ReactionService { + ReactionResponseTo create(ReactionRequestTo request); + List findAll(); + ReactionResponseTo findById(Long id); + ReactionResponseTo update(ReactionRequestTo request); + void deleteById(Long id); +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/TweetService.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/TweetService.java new file mode 100644 index 000000000..c7b8df4f1 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/TweetService.java @@ -0,0 +1,13 @@ +package com.example.task310.service; + +import com.example.task310.domain.dto.request.TweetRequestTo; +import com.example.task310.domain.dto.response.TweetResponseTo; +import java.util.List; + +public interface TweetService { + TweetResponseTo create(TweetRequestTo request); + List findAll(); + TweetResponseTo findById(Long id); + TweetResponseTo update(TweetRequestTo request); + void deleteById(Long id); +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/impl/AuthorServiceImpl.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/impl/AuthorServiceImpl.java new file mode 100644 index 000000000..998c1af37 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/impl/AuthorServiceImpl.java @@ -0,0 +1,60 @@ +package com.example.task310.service.impl; + +import com.example.task310.domain.dto.request.AuthorRequestTo; +import com.example.task310.domain.dto.response.AuthorResponseTo; +import com.example.task310.domain.entity.Author; +import com.example.task310.exception.EntityNotFoundException; +import com.example.task310.mapper.AuthorMapper; +import com.example.task310.repository.AuthorRepository; +import com.example.task310.service.AuthorService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class AuthorServiceImpl implements AuthorService { + + private final AuthorRepository authorRepository; + private final AuthorMapper authorMapper; + + @Override + public AuthorResponseTo create(AuthorRequestTo request) { + Author author = authorMapper.toEntity(request); + Author savedAuthor = authorRepository.save(author); + return authorMapper.toResponse(savedAuthor); + } + + @Override + public List findAll() { + return authorRepository.findAll().stream() + .map(authorMapper::toResponse) + .collect(Collectors.toList()); + } + + @Override + public AuthorResponseTo findById(Long id) { + Author author = authorRepository.findById(id) + .orElseThrow(() -> new EntityNotFoundException("Author not found with this id")); + return authorMapper.toResponse(author); + } + + @Override + public AuthorResponseTo update(AuthorRequestTo request) { + if (!authorRepository.existsById(request.getId())) { + throw new EntityNotFoundException("Cannot update: Author not found"); + } + Author author = authorMapper.toEntity(request); + return authorMapper.toResponse(authorRepository.save(author)); + } + + @Override + public void deleteById(Long id) { + if (!authorRepository.existsById(id)) { + throw new EntityNotFoundException("Author not found with id: " + id); + } + authorRepository.deleteById(id); + } +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/impl/MarkerServiceImpl.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/impl/MarkerServiceImpl.java new file mode 100644 index 000000000..fc5d8c5c5 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/impl/MarkerServiceImpl.java @@ -0,0 +1,59 @@ +package com.example.task310.service.impl; + +import com.example.task310.domain.dto.request.MarkerRequestTo; +import com.example.task310.domain.dto.response.MarkerResponseTo; +import com.example.task310.domain.entity.Marker; +import com.example.task310.exception.EntityNotFoundException; +import com.example.task310.mapper.MarkerMapper; +import com.example.task310.repository.MarkerRepository; +import com.example.task310.service.MarkerService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class MarkerServiceImpl implements MarkerService { + + private final MarkerRepository markerRepository; + private final MarkerMapper markerMapper; + + @Override + public MarkerResponseTo create(MarkerRequestTo request) { + Marker marker = markerMapper.toEntity(request); + return markerMapper.toResponse(markerRepository.save(marker)); + } + + @Override + public List findAll() { + return markerRepository.findAll().stream() + .map(markerMapper::toResponse) + .collect(Collectors.toList()); + } + + @Override + public MarkerResponseTo findById(Long id) { + Marker marker = markerRepository.findById(id) + .orElseThrow(() -> new EntityNotFoundException("Marker not found with this id")); + return markerMapper.toResponse(marker); + } + + @Override + public MarkerResponseTo update(MarkerRequestTo request) { + if (!markerRepository.existsById(request.getId())) { + throw new RuntimeException("Cannot update: Marker not found"); + } + Marker marker = markerMapper.toEntity(request); + return markerMapper.toResponse(markerRepository.save(marker)); + } + + @Override + public void deleteById(Long id) { + if (!markerRepository.existsById(id)) { + throw new EntityNotFoundException("Marker not found with id: " + id); + } + markerRepository.deleteById(id); + } +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/impl/ReactionServiceImpl.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/impl/ReactionServiceImpl.java new file mode 100644 index 000000000..62223069f --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/impl/ReactionServiceImpl.java @@ -0,0 +1,59 @@ +package com.example.task310.service.impl; + +import com.example.task310.domain.dto.request.ReactionRequestTo; +import com.example.task310.domain.dto.response.ReactionResponseTo; +import com.example.task310.domain.entity.Reaction; +import com.example.task310.exception.EntityNotFoundException; +import com.example.task310.mapper.ReactionMapper; +import com.example.task310.repository.ReactionRepository; +import com.example.task310.service.ReactionService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class ReactionServiceImpl implements ReactionService { + + private final ReactionRepository reactionRepository; + private final ReactionMapper reactionMapper; + + @Override + public ReactionResponseTo create(ReactionRequestTo request) { + Reaction reaction = reactionMapper.toEntity(request); + return reactionMapper.toResponse(reactionRepository.save(reaction)); + } + + @Override + public List findAll() { + return reactionRepository.findAll().stream() + .map(reactionMapper::toResponse) + .collect(Collectors.toList()); + } + + @Override + public ReactionResponseTo findById(Long id) { + Reaction reaction = reactionRepository.findById(id) + .orElseThrow(() -> new EntityNotFoundException("Reaction not found with this id")); + return reactionMapper.toResponse(reaction); + } + + @Override + public ReactionResponseTo update(ReactionRequestTo request) { + if (!reactionRepository.existsById(request.getId())) { + throw new RuntimeException("Cannot update: Reaction not found"); + } + Reaction reaction = reactionMapper.toEntity(request); + return reactionMapper.toResponse(reactionRepository.save(reaction)); + } + + @Override + public void deleteById(Long id) { + if (!reactionRepository.existsById(id)) { + throw new EntityNotFoundException("Reaction not found with id: " + id); + } + reactionRepository.deleteById(id); + } +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/impl/TweetServiceImpl.java b/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/impl/TweetServiceImpl.java new file mode 100644 index 000000000..aeed3974a --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/java/com/example/task310/service/impl/TweetServiceImpl.java @@ -0,0 +1,66 @@ +package com.example.task310.service.impl; + +import com.example.task310.domain.dto.request.TweetRequestTo; +import com.example.task310.domain.dto.response.TweetResponseTo; +import com.example.task310.domain.entity.Tweet; +import com.example.task310.exception.EntityNotFoundException; +import com.example.task310.mapper.TweetMapper; +import com.example.task310.repository.TweetRepository; +import com.example.task310.service.TweetService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class TweetServiceImpl implements TweetService { + + private final TweetRepository tweetRepository; + private final TweetMapper tweetMapper; + + @Override + public TweetResponseTo create(TweetRequestTo request) { + Tweet tweet = tweetMapper.toEntity(request); + // Бизнес-логика: установка меток времени + tweet.setCreated(LocalDateTime.now()); + tweet.setModified(LocalDateTime.now()); + return tweetMapper.toResponse(tweetRepository.save(tweet)); + } + + @Override + public List findAll() { + return tweetRepository.findAll().stream() + .map(tweetMapper::toResponse) + .collect(Collectors.toList()); + } + + @Override + public TweetResponseTo findById(Long id) { + Tweet tweet = tweetRepository.findById(id) + .orElseThrow(() -> new EntityNotFoundException("Tweet not found")); + return tweetMapper.toResponse(tweet); + } + + @Override + public TweetResponseTo update(TweetRequestTo request) { + Tweet existing = tweetRepository.findById(request.getId()) + .orElseThrow(() -> new EntityNotFoundException("Tweet not found")); + + Tweet tweet = tweetMapper.toEntity(request); + tweet.setCreated(existing.getCreated()); // Сохраняем дату создания + tweet.setModified(LocalDateTime.now()); // Обновляем дату модификации + + return tweetMapper.toResponse(tweetRepository.save(tweet)); + } + + @Override + public void deleteById(Long id) { + if (!tweetRepository.existsById(id)) { + throw new EntityNotFoundException("Tweet not found with id: " + id); + } + tweetRepository.deleteById(id); + } +} \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/main/resources/application.properties b/351004/Romanovskiy/task310/src/main/resources/application.properties new file mode 100644 index 000000000..4a3e9c0a0 --- /dev/null +++ b/351004/Romanovskiy/task310/src/main/resources/application.properties @@ -0,0 +1,11 @@ +spring.application.name=task310 + +server.port=24110 + +spring.mvc.servlet.path=/api/v1.0 + +spring.jackson.serialization.write-dates-as-timestamps=false + +server.servlet.encoding.charset=UTF-8 +server.servlet.encoding.enabled=true +server.servlet.encoding.force=true \ No newline at end of file diff --git a/351004/Romanovskiy/task310/src/test/java/com/example/task310/Task310ApplicationTests.java b/351004/Romanovskiy/task310/src/test/java/com/example/task310/Task310ApplicationTests.java new file mode 100644 index 000000000..bff42e318 --- /dev/null +++ b/351004/Romanovskiy/task310/src/test/java/com/example/task310/Task310ApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.task310; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class Task310ApplicationTests { + + @Test + void contextLoads() { + } + +}