Добавление количества страниц книгам

.env

@@ -1,5 +1,5 @@
 # Postgres
-POSTGRES_HOST="db"
+POSTGRES_HOST="localhost"
 POSTGRES_PORT="5432"
 POSTGRES_USER="postgres"
 POSTGRES_PASSWORD="postgres"

library_service/models/dto/book.py

@@ -1,43 +1,55 @@
 """Модуль DTO-моделей книг"""
+
 from typing import List
 
 from pydantic import ConfigDict
-from sqlmodel import SQLModel
+from sqlmodel import SQLModel, Field
 
 from library_service.models.enums import BookStatus
 
 
 class BookBase(SQLModel):
     """Базовая модель книги"""
+
     title: str
     description: str
+    page_count: int = Field(gt=0)
 
     model_config = ConfigDict(  # pyright: ignore
         json_schema_extra={
-            "example": {"title": "book_title", "description": "book_description"}
+            "example": {
+                "title": "book_title",
+                "description": "book_description",
+                "page_count": 1,
+            }
         }
     )
 
 
 class BookCreate(BookBase):
     """Модель книги для создания"""
+
     pass
 
 
 class BookUpdate(SQLModel):
     """Модель книги для обновления"""
+
     title: str | None = None
     description: str | None = None
+    page_count: int | None = None
     status: BookStatus | None = None
 
 
 class BookRead(BookBase):
     """Модель книги для чтения"""
+
     id: int
     status: BookStatus
 
 
 class BookList(SQLModel):
     """Список книг"""
+
     books: List[BookRead]
     total: int

library_service/models/dto/misc.py

@@ -37,6 +37,7 @@ class BookWithAuthors(SQLModel):
     id: int
     title: str
     description: str
+    page_count: int
     authors: List[AuthorRead] = Field(default_factory=list)
 
 
@@ -46,6 +47,7 @@ class BookWithGenres(SQLModel):
     id: int
     title: str
     description: str
+    page_count: int
     status: BookStatus | None = None
     genres: List[GenreRead] = Field(default_factory=list)
 
@@ -56,6 +58,7 @@ class BookWithAuthorsAndGenres(SQLModel):
     id: int
     title: str
     description: str
+    page_count: int
     status: BookStatus | None = None
     authors: List[AuthorRead] = Field(default_factory=list)
     genres: List[GenreRead] = Field(default_factory=list)

library_service/static/page/book.js

@@ -234,6 +234,12 @@ $(document).ready(() => {
   function renderBook(book) {
     $("#book-title").text(book.title);
     $("#book-id").text(`ID: ${book.id}`);
+    if (book.page_count && book.page_count > 0) {
+      $("#book-page-count-value").text(book.page_count);
+      $("#book-page-count-text").removeClass("hidden");
+    } else {
+      $("#book-page-count-text").addClass("hidden");
+    }
     $("#book-authors-text").text(
       book.authors.map((a) => a.name).join(", ") || "Автор неизвестен",
     );

library_service/static/page/books.js

@@ -180,6 +180,11 @@ $(document).ready(() => {
       clone.querySelector(".book-title").textContent = book.title;
       clone.querySelector(".book-authors").textContent =
         book.authors.map((a) => a.name).join(", ") || "Автор неизвестен";
+      if (book.page_count && book.page_count > 0) {
+        const pageEl = clone.querySelector(".book-page-count");
+        pageEl.querySelector(".page-count-value").textContent = book.page_count;
+        pageEl.classList.remove("hidden");
+      }
       clone.querySelector(".book-desc").textContent = book.description || "";
 
       const statusConfig = getStatusConfig(book.status);

library_service/static/page/create_book.js

@@ -235,18 +235,25 @@ $(document).ready(() => {
 
     const title = $("#book-title").val().trim();
     const description = $("#book-description").val().trim();
+    const pageCount = parseInt($("#book-page-count").val()) || null;
 
     if (!title) {
       Utils.showToast("Введите название книги", "error");
       return;
     }
 
+    if (!parseInt(pageCount)) {
+      Utils.showToast("Введите количество страниц", "error");
+      return;
+    }
+
     setLoading(true);
 
     try {
       const bookPayload = {
         title: title,
         description: description || null,
+        page_count: pageCount ? parseInt(pageCount) : null,
       };
 
       const createdBook = await Api.post("/api/books/", bookPayload);

library_service/static/page/edit_book.js

@@ -23,6 +23,7 @@ $(document).ready(() => {
   const $titleInput = $("#book-title");
   const $descInput = $("#book-description");
   const $statusSelect = $("#book-status");
+  const $pagesInput = $("#book-page-count");
   const $submitBtn = $("#submit-btn");
   const $submitText = $("#submit-text");
   const $loadingSpinner = $("#loading-spinner");
@@ -69,6 +70,7 @@ $(document).ready(() => {
   function populateForm(book) {
     $titleInput.val(book.title);
     $descInput.val(book.description || "");
+    $pagesInput.val(book.page_count);
     $statusSelect.val(book.status);
     updateCounters();
   }
@@ -329,6 +331,7 @@ $(document).ready(() => {
 
     const title = $titleInput.val().trim();
     const description = $descInput.val().trim();
+    const pages = $pagesInput.val();
     const status = $statusSelect.val();
 
     if (!title) {
@@ -340,6 +343,7 @@ $(document).ready(() => {
     if (title !== originalBook.title) payload.title = title;
     if (description !== (originalBook.description || ""))
       payload.description = description || null;
+    if (pageCount !== originalBook.page_count) payload.page_count = pages;
     if (status !== originalBook.status) payload.status = status;
 
     if (Object.keys(payload).length === 0) {

library_service/static/utils.js

@@ -19,8 +19,8 @@ const StorageHelper = {
 
 const Utils = {
   escapeHtml: (text) => {
-    if (!text) return "";
+    if (text === null || text === undefined) return "";
-    return text.replace(
+    return String(text).replace(
       /[&<>"']/g,
       (m) =>
         ({

library_service/templates/book.html

@@ -107,6 +107,10 @@
                     id="book-authors-text"
                     class="text-lg text-gray-600 font-medium mb-6"
                 ></p>
+                <p id="book-page-count-text" class="text-sm text-gray-500 mb-6 hidden">
+                    <span class="font-medium">Количество страниц:</span>
+                    <span id="book-page-count-value"></span>
+                </p>
                 <div class="prose prose-gray max-w-none mb-8">
                     <h3
                         class="text-sm font-bold text-gray-400 uppercase tracking-wider mb-2"

library_service/templates/books.html

@@ -152,6 +152,10 @@
                     <span class="font-medium">Авторы:</span>
                     <span class="book-authors"></span>
                 </p>
+                <p class="book-page-count text-sm text-gray-600 mb-2 hidden">
+                    <span class="font-medium">Страниц:</span>
+                    <span class="page-count-value"></span>
+                </p>
                 <p
                     class="book-desc text-gray-700 text-sm mb-2 line-clamp-3"
                 ></p>

library_service/templates/create_book.html

@@ -69,6 +69,22 @@
                     >
                 </div>
             </div>
+            <div>
+                <label
+                    for="book-page-count"
+                    class="block text-sm font-semibold text-gray-700 mb-2"
+                >
+                    Количество страниц
+                </label>
+                <input
+                    type="number"
+                    id="book-page-count"
+                    name="page_count"
+                    min="1"
+                    class="w-full border border-gray-300 rounded-lg px-4 py-3 focus:outline-none focus:ring-2 focus:ring-gray-400 transition"
+                    placeholder="Укажите количество страниц"
+                />
+            </div>
             <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
                 <div class="bg-white p-4 rounded-lg border border-gray-200">
                     <h2 class="text-sm font-semibold text-gray-700 mb-3">

library_service/templates/edit_book.html

@@ -78,6 +78,23 @@
                 </div>
             </div>
 
+            <div>
+                <label
+                    for="book-page-count"
+                    class="block text-sm font-semibold text-gray-700 mb-2"
+                >
+                    Количество страниц
+                </label>
+                <input
+                    type="number"
+                    id="book-page-count"
+                    name="page_count"
+                    min="1"
+                    class="w-full border border-gray-300 rounded-lg px-4 py-3 focus:outline-none focus:ring-2 focus:ring-gray-400 transition"
+                    placeholder="Укажите количество страниц"
+                />
+            </div>
+
             <div>
                 <label
                     for="book-status"

migrations/versions/a585fd97b88c_recovery_codes_and_totp.py

@@ -1,4 +1,4 @@
-"""recovery codes and totp
+"""Recovery codes and totp
 
 Revision ID: a585fd97b88c
 Revises: a8e40ab24138

migrations/versions/a8e40ab24138_role_payroll.py

@@ -1,10 +1,11 @@
-"""role payroll
+"""Role payroll
 
 Revision ID: a8e40ab24138
 Revises: 02ed6e775351
 Create Date: 2025-12-20 13:44:13.807704
 
 """
+
 from typing import Sequence, Union
 
 from alembic import op
@@ -13,29 +14,49 @@ import sqlmodel
 from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
-revision: str = 'a8e40ab24138'
+revision: str = "a8e40ab24138"
-down_revision: Union[str, None] = '02ed6e775351'
+down_revision: Union[str, None] = "02ed6e775351"
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
 
 
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    op.alter_column('book', 'status',
+    op.alter_column(
-               existing_type=postgresql.ENUM('active', 'borrowed', 'reserved', 'restoration', 'written_off', name='bookstatus'),
+        "book",
+        "status",
+        existing_type=postgresql.ENUM(
+            "active",
+            "borrowed",
+            "reserved",
+            "restoration",
+            "written_off",
+            name="bookstatus",
+        ),
         type_=sa.String(),
         existing_nullable=False,
-               existing_server_default=sa.text("'active'::bookstatus"))
+        existing_server_default=sa.text("'active'::bookstatus"),
-    op.add_column('roles', sa.Column('payroll', sa.Integer(), nullable=False))
+    )
+    op.add_column("roles", sa.Column("payroll", sa.Integer(), nullable=False))
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('roles', 'payroll')
+    op.drop_column("roles", "payroll")
-    op.alter_column('book', 'status',
+    op.alter_column(
+        "book",
+        "status",
         existing_type=sa.String(),
-               type_=postgresql.ENUM('active', 'borrowed', 'reserved', 'restoration', 'written_off', name='bookstatus'),
+        type_=postgresql.ENUM(
+            "active",
+            "borrowed",
+            "reserved",
+            "restoration",
+            "written_off",
+            name="bookstatus",
+        ),
         existing_nullable=False,
-               existing_server_default=sa.text("'active'::bookstatus"))
+        existing_server_default=sa.text("'active'::bookstatus"),
+    )
     # ### end Alembic commands ###

migrations/versions/c5dfc16bdc66_book_page_count.py

@@ -0,0 +1,32 @@
+"""Book page_count
+
+Revision ID: c5dfc16bdc66
+Revises: a585fd97b88c
+Create Date: 2026-01-23 00:09:14.192263
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel
+
+
+# revision identifiers, used by Alembic.
+revision: str = "c5dfc16bdc66"
+down_revision: Union[str, None] = "a585fd97b88c"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("book", sa.Column("page_count", sa.Integer(), nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("book", "page_count")
+    # ### end Alembic commands ###