chore(release): bump version to 1.0.5

fix(parser): fix lessons merging
refactor(parser): rewrite some parts of code
2025-12-06 17:57:47 +03:00 · 2025-05-26 05:30:44 +04:00 · 2025-05-26 05:24:13 +04:00 · 2025-05-26 05:24:08 +04:00 · 2025-05-25 17:39:23 +04:00 · 2025-05-25 15:57:18 +04:00
28 changed files with 1093 additions and 494 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -0,0 +1,169 @@
+name: release
+
+on:
+  push:
+    tags: [ "release/v*" ]
+
+permissions:
+  contents: write
+
+env:
+  CARGO_TERM_COLOR: always
+
+  BINARY_NAME: schedule-parser-rusted
+
+  TEST_DB: ${{ secrets.TEST_DATABASE_URL }}
+
+  SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+  SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+  SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+
+  DOCKER_IMAGE_NAME: ${{ github.repository }}
+
+  DOCKER_REGISTRY_HOST: registry.n08i40k.ru
+  DOCKER_REGISTRY_USERNAME: ${{ github.repository_owner }}
+  DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        with:
+          toolchain: stable
+
+      - name: Test
+        run: |
+          touch .env.test
+          cargo test --verbose
+        env:
+          DATABASE_URL: ${{ env.TEST_DB }}
+          JWT_SECRET: "test-secret-at-least-256-bits-used"
+          VKID_CLIENT_ID: 0
+          VKID_REDIRECT_URI: "vk0://vk.com/blank.html"
+          REQWEST_USER_AGENT: "Dalvik/2.1.0 (Linux; U; Android 6.0.1; OPPO R9s Build/MMB29M)"
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    needs: test
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        with:
+          toolchain: stable
+
+      - name: Build
+        run: cargo build --release --verbose
+
+      - name: Extract debug symbols
+        run: |
+          objcopy --only-keep-debug target/release/${{ env.BINARY_NAME }}{,.d}
+          objcopy --strip-debug --strip-unneeded target/release/${{ env.BINARY_NAME }}
+          objcopy --add-gnu-debuglink target/release/${{ env.BINARY_NAME }}{.d,}
+
+      - name: Setup sentry-cli
+        uses: matbour/setup-sentry-cli@v2.0.0
+        with:
+          version: latest
+          token: ${{ env.SENTRY_AUTH_TOKEN }}
+          organization: ${{ env.SENTRY_ORG }}
+          project: ${{ env.SENTRY_PROJECT }}
+
+      - name: Upload debug symbols to Sentry
+        run: |
+          sentry-cli debug-files upload --include-sources .
+
+      - name: Upload build binary artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-binary
+          path: target/release/${{ env.BINARY_NAME }}
+
+      - name: Upload build debug symbols artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-symbols
+          path: target/release/${{ env.BINARY_NAME }}.d
+
+  docker:
+    name: Build & Push Docker Image
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: release-binary
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v3.10.0
+
+      - name: Login to Registry
+        uses: docker/login-action@v3.4.0
+        with:
+          registry: ${{ env.DOCKER_REGISTRY_HOST }}
+          username: ${{ env.DOCKER_REGISTRY_USERNAME }}
+          password: ${{ env.DOCKER_REGISTRY_PASSWORD }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5.7.0
+        with:
+          images: ${{ env.DOCKER_REGISTRY_HOST }}/${{ env.DOCKER_IMAGE_NAME }}
+
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v6.15.0
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          build-args: |
+            "BINARY_NAME=${{ env.BINARY_NAME }}"
+  release:
+    name: Create GitHub Release
+    runs-on: ubuntu-latest
+    needs:
+      - build
+      - docker
+    # noinspection GrazieInspection,SpellCheckingInspection
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Generate changelog
+        run: |
+          LAST_TAG=$(git describe --tags --abbrev=0 HEAD^)
+          echo "## Коммиты с прошлого релиза $LAST_TAG" > CHANGELOG.md
+          git log $LAST_TAG..HEAD --oneline >> CHANGELOG.md
+
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: release-*
+          merge-multiple: true
+
+      - name: Create Release
+        id: create_release
+        uses: ncipollo/release-action@v1.16.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          artifacts: "${{ env.BINARY_NAME }},${{ env.BINARY_NAME }}.d"
+          bodyFile: CHANGELOG.md
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,10 +1,9 @@
-name: Tests
+name: cargo test

 on:
  push:
    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
+    tags-ignore: [ "release/v*" ]

 permissions:
  contents: read
@@ -29,4 +28,5 @@ jobs:
          DATABASE_URL: ${{ secrets.TEST_DATABASE_URL }}
          JWT_SECRET: "test-secret-at-least-256-bits-used"
          VKID_CLIENT_ID: 0
-          VKID_REDIRECT_URI: "vk0://vk.com/blank.html"
+          VKID_REDIRECT_URI: "vk0://vk.com/blank.html"
+          REQWEST_USER_AGENT: "Dalvik/2.1.0 (Linux; U; Android 6.0.1; OPPO R9s Build/MMB29M)"
--- a/.idea/schedule-parser-rusted.iml
+++ b/.idea/schedule-parser-rusted.iml
@@ -4,9 +4,10 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/lib/schedule_parser/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/benches" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/actix-macros/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/actix-test/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/schedule-parser/benches" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/schedule-parser/src" isTestSource="false" />
      <excludeFolder url="file://$MODULE_DIR$/actix-macros/target" />
      <excludeFolder url="file://$MODULE_DIR$/actix-test/target" />
      <excludeFolder url="file://$MODULE_DIR$/target" />
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="SqlDialectMappings">
-    <file url="file://$PROJECT_DIR$/migrations/2025-03-21-211822_create_user_role/down.sql" dialect="PostgreSQL" />
-    <file url="file://$PROJECT_DIR$/migrations/2025-03-21-212111_create_users/up.sql" dialect="PostgreSQL" />
-    <file url="file://$PROJECT_DIR$/migrations/2025-03-21-212723_create_fcm/down.sql" dialect="PostgreSQL" />
-    <file url="file://$PROJECT_DIR$/migrations/2025-03-21-212723_create_fcm/up.sql" dialect="PostgreSQL" />
-  </component>
-</project>
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -696,6 +696,15 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1cb3c4a0d3776f7535c32793be81d6d5fec0d48ac70955d9834e643aa249a52f"

+[[package]]
+name = "convert_case"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "cookie"
 version = "0.16.2"
@@ -753,25 +762,22 @@ dependencies = [

 [[package]]
 name = "criterion"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
+checksum = "3bf7af66b0989381bd0be551bd7cc91912a655a58c6918420c9527b1fd8b4679"
 dependencies = [
 "anes",
 "cast",
 "ciborium",
 "clap",
 "criterion-plot",
- "is-terminal",
- "itertools",
+ "itertools 0.13.0",
 "num-traits",
- "once_cell",
 "oorandom",
 "plotters",
 "rayon",
 "regex",
 "serde",
- "serde_derive",
 "serde_json",
 "tinytemplate",
 "walkdir",
@@ -784,7 +790,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
 dependencies = [
 "cast",
- "itertools",
+ "itertools 0.10.5",
 ]

 [[package]]
@@ -872,6 +878,16 @@ dependencies = [
 "syn 2.0.100",
 ]

+[[package]]
+name = "debugid"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
+dependencies = [
+ "serde",
+ "uuid",
+]
+
 [[package]]
 name = "deranged"
 version = "0.4.0"
@@ -908,6 +924,7 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
+ "convert_case",
 "proc-macro2",
 "quote",
 "syn 2.0.100",
@@ -1072,10 +1089,22 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"

+[[package]]
+name = "findshlibs"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64"
+dependencies = [
+ "cc",
+ "lazy_static 1.5.0",
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "firebase-messaging-rs"
 version = "0.8.10"
-source = "git+ssh://git@github.com/i10416/firebase-messaging-rs.git#f2cb78b0bda33a41962a1a2ed178fb9c5be59e6a"
+source = "git+https://github.com/i10416/firebase-messaging-rs.git#f2cb78b0bda33a41962a1a2ed178fb9c5be59e6a"
 dependencies = [
 "async-trait",
 "chrono",
@@ -1382,12 +1411,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"

-[[package]]
-name = "hermit-abi"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e"
-
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -1404,6 +1427,17 @@ dependencies = [
 "winutil",
 ]

+[[package]]
+name = "hostname"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "windows-link",
+]
+
 [[package]]
 name = "http"
 version = "0.2.12"
@@ -1815,17 +1849,6 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"

-[[package]]
-name = "is-terminal"
-version = "0.4.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -1841,6 +1864,15 @@ dependencies = [
 "either",
 ]

+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.15"
@@ -1917,6 +1949,12 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"

+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
 [[package]]
 name = "libc"
 version = "0.2.171"
@@ -2090,8 +2128,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22a605e0778d73324c897e7e4bd5903f64639884a99d1bad55bccfd986260063"
 dependencies = [
 "byteorder 0.3.13",
- "hostname",
- "lazy_static",
+ "hostname 0.1.5",
+ "lazy_static 0.2.11",
 "libc",
 "quick-error",
 "rand 0.3.23",
@@ -2113,9 +2151,9 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"

 [[package]]
 name = "openssl"
-version = "0.10.72"
+version = "0.10.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
+checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
 dependencies = [
 "bitflags",
 "cfg-if",
@@ -2145,9 +2183,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"

 [[package]]
 name = "openssl-sys"
-version = "0.9.107"
+version = "0.9.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07"
+checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
 dependencies = [
 "cc",
 "libc",
@@ -2155,6 +2193,17 @@ dependencies = [
 "vcpkg",
 ]

+[[package]]
+name = "os_info"
+version = "3.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a604e53c24761286860eba4e2c8b23a0161526476b1de520139d69cdb85a6b5"
+dependencies = [
+ "log",
+ "serde",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.12.3"
@@ -2346,7 +2395,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
 "anyhow",
- "itertools",
+ "itertools 0.10.5",
 "proc-macro2",
 "quote",
 "syn 2.0.100",
@@ -2428,7 +2477,7 @@ dependencies = [
 "once_cell",
 "socket2",
 "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -2627,6 +2676,7 @@ dependencies = [
 "base64",
 "bytes",
 "encoding_rs",
+ "futures-channel",
 "futures-core",
 "futures-util",
 "h2 0.4.8",
@@ -2715,6 +2765,15 @@ version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401"

+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
 [[package]]
 name = "rustix"
 version = "1.0.3"
@@ -2814,17 +2873,30 @@ dependencies = [
 "windows-sys 0.59.0",
 ]

+[[package]]
+name = "schedule-parser"
+version = "0.1.0"
+dependencies = [
+ "calamine",
+ "chrono",
+ "criterion",
+ "derive_more",
+ "fuzzy-matcher",
+ "regex",
+ "serde",
+ "serde_repr",
+ "utoipa",
+]
+
 [[package]]
 name = "schedule-parser-rusted"
-version = "0.8.0"
+version = "1.0.5"
 dependencies = [
 "actix-macros 0.1.0",
 "actix-test",
 "actix-web",
 "bcrypt",
- "calamine",
 "chrono",
- "criterion",
 "derive_more",
 "diesel",
 "diesel-derive-enum",
@@ -2832,17 +2904,17 @@ dependencies = [
 "env_logger",
 "firebase-messaging-rs",
 "futures-util",
- "fuzzy-matcher",
 "hex",
 "jsonwebtoken",
 "mime",
 "objectid",
 "rand 0.9.0",
- "regex",
 "reqwest",
+ "schedule-parser",
+ "sentry",
+ "sentry-actix",
 "serde",
 "serde_json",
- "serde_repr",
 "serde_with",
 "sha1 0.11.0-pre.5",
 "tokio",
@@ -2907,6 +2979,131 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "semver"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+
+[[package]]
+name = "sentry"
+version = "0.38.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a505499b38861edd82b5a688fa06ba4ba5875bb832adeeeba22b7b23fc4bc39a"
+dependencies = [
+ "httpdate",
+ "native-tls",
+ "reqwest",
+ "sentry-actix",
+ "sentry-backtrace",
+ "sentry-contexts",
+ "sentry-core",
+ "sentry-debug-images",
+ "sentry-panic",
+ "sentry-tracing",
+ "tokio",
+ "ureq",
+]
+
+[[package]]
+name = "sentry-actix"
+version = "0.38.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39ad8bfdcfbc6e0d0dacaa5728555085ef459fa9226cfc2fe64eefa4b8038b7f"
+dependencies = [
+ "actix-http",
+ "actix-web",
+ "bytes",
+ "futures-util",
+ "sentry-core",
+]
+
+[[package]]
+name = "sentry-backtrace"
+version = "0.38.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8dace796060e4ad10e3d1405b122ae184a8b2e71dce05ae450e4f81b7686b0d9"
+dependencies = [
+ "backtrace",
+ "regex",
+ "sentry-core",
+]
+
+[[package]]
+name = "sentry-contexts"
+version = "0.38.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87bd9e6b51ffe2bc7188ebe36cb67557cb95749c08a3f81f33e8c9b135e0d1bc"
+dependencies = [
+ "hostname 0.4.1",
+ "libc",
+ "os_info",
+ "rustc_version",
+ "sentry-core",
+ "uname",
+]
+
+[[package]]
+name = "sentry-core"
+version = "0.38.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7426d4beec270cfdbb50f85f0bb2ce176ea57eed0b11741182a163055a558187"
+dependencies = [
+ "rand 0.9.0",
+ "sentry-types",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "sentry-debug-images"
+version = "0.38.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9df15c066c04f34c4dfd496a8e76590106b93283f72ef1a47d8fb24d88493424"
+dependencies = [
+ "findshlibs",
+ "sentry-core",
+]
+
+[[package]]
+name = "sentry-panic"
+version = "0.38.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c92beed69b776a162b6d269bef1eaa3e614090b6df45a88d9b239c4fdbffdfba"
+dependencies = [
+ "sentry-backtrace",
+ "sentry-core",
+]
+
+[[package]]
+name = "sentry-tracing"
+version = "0.38.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55c323492795de90824f3198562e33dd74ae3bc852fbb13c0cabec54a1cf73cd"
+dependencies = [
+ "sentry-backtrace",
+ "sentry-core",
+ "tracing-core",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "sentry-types"
+version = "0.38.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04b6c9287202294685cb1f749b944dbbce8160b81a1061ecddc073025fed129f"
+dependencies = [
+ "debugid",
+ "hex",
+ "rand 0.9.0",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "time 0.3.40",
+ "url",
+ "uuid",
+]
+
 [[package]]
 name = "serde"
 version = "1.0.219"
@@ -3468,6 +3665,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
 "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+dependencies = [
+ "tracing-core",
 ]

 [[package]]
@@ -3482,6 +3689,15 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"

+[[package]]
+name = "uname"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "unicase"
 version = "2.8.1"
@@ -3494,6 +3710,12 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"

+[[package]]
+name = "unicode-segmentation"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+
 [[package]]
 name = "unicode-xid"
 version = "0.2.6"
@@ -3506,6 +3728,19 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"

+[[package]]
+name = "ureq"
+version = "2.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d"
+dependencies = [
+ "base64",
+ "log",
+ "native-tls",
+ "once_cell",
+ "url",
+]
+
 [[package]]
 name = "url"
 version = "2.5.4"
@@ -3515,6 +3750,7 @@ dependencies = [
 "form_urlencoded",
 "idna",
 "percent-encoding",
+ "serde",
 ]

 [[package]]
@@ -3589,8 +3825,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
 dependencies = [
 "getrandom 0.3.2",
+ "serde",
 ]

+[[package]]
+name = "valuable"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
+
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,36 +1,38 @@
 [workspace]
-members = ["actix-macros", "actix-test"]
+members = ["actix-macros", "actix-test", "schedule-parser"]

 [package]
 name = "schedule-parser-rusted"
-version = "0.8.0"
+version = "1.0.5"
 edition = "2024"
 publish = false

+[profile.release]
+debug = true
+
 [dependencies]
 actix-web = "4.10.2"
 actix-macros = { path = "actix-macros" }
+schedule-parser = { path = "schedule-parser", features = ["test-utils"] }
 bcrypt = "0.17.0"
-calamine = "0.26.1"
 chrono = { version = "0.4.40", features = ["serde"] }
-derive_more = "2.0.1"
+derive_more = { version = "2", features = ["full"] }
 diesel = { version = "2.2.8", features = ["postgres"] }
 diesel-derive-enum = { git = "https://github.com/Havunen/diesel-derive-enum.git", features = ["postgres"] }
 dotenvy = "0.15.7"
 env_logger = "0.11.7"
-firebase-messaging-rs = { git = "ssh://git@github.com/i10416/firebase-messaging-rs.git" }
+firebase-messaging-rs = { git = "https://github.com/i10416/firebase-messaging-rs.git" }
 futures-util = "0.3.31"
-fuzzy-matcher = "0.3.7"
 jsonwebtoken = { version = "9.3.1", features = ["use_pem"] }
 hex = "0.4.3"
 mime = "0.3.17"
 objectid = "0.2.0"
-regex = "1.11.1"
 reqwest = { version = "0.12.15", features = ["json"] }
+sentry = "0.38"
+sentry-actix = "0.38"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
 serde_with = "3.12.0"
-serde_repr = "0.1.20"
 sha1 = "0.11.0-pre.5"
 tokio = { version = "1.44.1", features = ["macros", "rt-multi-thread"] }
 rand = "0.9.0"
@@ -41,8 +43,3 @@ uuid = { version = "1.16.0", features = ["v4"] }

 [dev-dependencies]
 actix-test = { path = "actix-test" }
-criterion = "0.5.1"
-
-[[bench]]
-name = "parse"
-harness = false
--- a/14
+++ b/14
@@ -0,0 +1,14 @@
+FROM debian:stable-slim
+LABEL authors="n08i40k"
+
+ARG BINARY_NAME
+
+WORKDIR /app/
+
+RUN apt update && \
+    apt install -y libpq5 ca-certificates openssl
+
+COPY ./${BINARY_NAME} /bin/main
+RUN chmod +x /bin/main
+
+ENTRYPOINT ["main"]
--- a/schedule-parser/Cargo.toml
+++ b/schedule-parser/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "schedule-parser"
+version = "0.1.0"
+edition = "2024"
+
+[features]
+test-utils = []
+
+[dependencies]
+calamine = "0.26"
+chrono = { version = "0.4", features = ["serde"] }
+derive_more = { version = "2", features = ["full"] }
+serde = { version = "1.0.219", features = ["derive"] }
+serde_repr = "0.1.20"
+fuzzy-matcher = "0.3.7"
+regex = "1.11.1"
+utoipa = { version = "5", features = ["chrono"] }
+
+[dev-dependencies]
+criterion = "0.6"
+
+[[bench]]
+name = "parse"
+harness = false
--- a/schedule-parser/benches/parse.rs
+++ b/schedule-parser/benches/parse.rs
@@ -1,9 +1,9 @@
 use criterion::{Criterion, criterion_group, criterion_main};

-use schedule_parser_rusted::parser::parse_xls;
+use schedule_parser::parse_xls;

 pub fn bench_parse_xls(c: &mut Criterion) {
-    let buffer: Vec<u8> = include_bytes!("../schedule.xls").to_vec();
+    let buffer: Vec<u8> = include_bytes!("../../schedule.xls").to_vec();

    c.bench_function("parse_xls", |b| b.iter(|| parse_xls(&buffer).unwrap()));
 }
--- a/schedule-parser/src/lib.rs
+++ b/schedule-parser/src/lib.rs
@@ -1,24 +1,24 @@
-use crate::parser::schema::LessonType::Break;
-use crate::parser::schema::{
-    Day, Lesson, LessonSubGroup, LessonTime, LessonType, ParseError, ParseResult, ScheduleEntry,
+use crate::LessonParseResult::{Lessons, Street};
+use crate::schema::LessonType::Break;
+use crate::schema::{
+    Day, ErrorCell, ErrorCellPos, Lesson, LessonBoundaries, LessonSubGroup, LessonType, ParseError,
+    ParseResult, ScheduleEntry,
 };
-use crate::parser::LessonParseResult::{Lessons, Street};
-use calamine::{open_workbook_from_rs, Reader, Xls};
+use calamine::{Reader, Xls, open_workbook_from_rs};
 use chrono::{DateTime, Duration, NaiveDateTime, Utc};
-use fuzzy_matcher::skim::SkimMatcherV2;
 use fuzzy_matcher::FuzzyMatcher;
+use fuzzy_matcher::skim::SkimMatcherV2;
 use regex::Regex;
 use std::collections::HashMap;
 use std::io::Cursor;
+use std::ops::Deref;
 use std::sync::LazyLock;

+mod macros;
 pub mod schema;

-/// Data cell storing the line.
-struct InternalId {
-    /// Line index.
-    row: u32,
-
+/// Data cell storing the group name.
+struct GroupCellInfo {
    /// Column index.
    column: u32,

@@ -26,10 +26,25 @@ struct InternalId {
    name: String,
 }

+/// Data cell storing the line.
+struct DayCellInfo {
+    /// Line index.
+    row: u32,
+
+    /// Column index.
+    column: u32,
+
+    /// Day name.
+    name: String,
+
+    /// Date of the day.
+    date: DateTime<Utc>,
+}
+
 /// Data on the time of lessons from the second column of the schedule.
-struct InternalTime {
+struct BoundariesCellInfo {
    /// Temporary segment of the lesson.
-    time_range: LessonTime,
+    time_range: LessonBoundaries,

    /// Type of lesson.
    lesson_type: LessonType,
@@ -41,8 +56,18 @@ struct InternalTime {
    xls_range: ((u32, u32), (u32, u32)),
 }

-/// Working sheet type alias.
-type WorkSheet = calamine::Range<calamine::Data>;
+struct WorkSheet {
+    pub data: calamine::Range<calamine::Data>,
+    pub merges: Vec<calamine::Dimensions>,
+}
+
+impl Deref for WorkSheet {
+    type Target = calamine::Range<calamine::Data>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.data
+    }
+}

 /// Getting a line from the required cell.
 fn get_string_from_cell(worksheet: &WorkSheet, row: u32, col: u32) -> Option<String> {
@@ -56,9 +81,8 @@ fn get_string_from_cell(worksheet: &WorkSheet, row: u32, col: u32) -> Option<Str
        return None;
    }

-    static NL_RE: LazyLock<Regex, fn() -> Regex> =
-        LazyLock::new(|| Regex::new(r"[\n\r]+").unwrap());
-    static SP_RE: LazyLock<Regex, fn() -> Regex> = LazyLock::new(|| Regex::new(r"\s+").unwrap());
+    static NL_RE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"[\n\r]+").unwrap());
+    static SP_RE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\s+").unwrap());

    let trimmed_data = SP_RE
        .replace_all(&NL_RE.replace_all(&cell_data, " "), " ")
@@ -74,92 +98,69 @@ fn get_string_from_cell(worksheet: &WorkSheet, row: u32, col: u32) -> Option<Str

 /// Obtaining the boundaries of the cell along its upper left coordinate.
 fn get_merge_from_start(worksheet: &WorkSheet, row: u32, column: u32) -> ((u32, u32), (u32, u32)) {
-    let worksheet_end = worksheet.end().unwrap();
-
-    let row_end: u32 = {
-        let mut r: u32 = 0;
-
-        for _r in (row + 1)..worksheet_end.0 {
-            r = _r;
-
-            if let Some(_) = worksheet.get((_r as usize, column as usize)) {
-                break;
-            }
-        }
-
-        r
+    return match worksheet
+        .merges
+        .iter()
+        .find(|merge| merge.start.0 == row && merge.start.1 == column)
+    {
+        Some(merge) => (merge.start, (merge.end.0 + 1, merge.end.1 + 1)),
+        None => ((row, column), (row + 1, column + 1))
    };
-
-    let column_end: u32 = {
-        let mut c: u32 = 0;
-
-        for _c in (column + 1)..worksheet_end.1 {
-            c = _c;
-
-            if let Some(_) = worksheet.get((row as usize, _c as usize)) {
-                break;
-            }
-        }
-
-        c
-    };
-
-    ((row, column), (row_end, column_end))
 }

 /// Obtaining a "skeleton" schedule from the working sheet.
-fn parse_skeleton(worksheet: &WorkSheet) -> Result<(Vec<InternalId>, Vec<InternalId>), ParseError> {
-    let range = &worksheet;
+fn parse_skeleton(
+    worksheet: &WorkSheet,
+) -> Result<(Vec<DayCellInfo>, Vec<GroupCellInfo>), ParseError> {
+    let mut groups: Vec<GroupCellInfo> = Vec::new();
+    let mut days: Vec<DayCellInfo> = Vec::new();

-    let mut is_parsed = false;
+    let worksheet_start = worksheet.start().ok_or(ParseError::UnknownWorkSheetRange)?;
+    let worksheet_end = worksheet.end().ok_or(ParseError::UnknownWorkSheetRange)?;

-    let mut groups: Vec<InternalId> = Vec::new();
-    let mut days: Vec<InternalId> = Vec::new();
+    let mut row = worksheet_start.0;

-    let start = range.start().ok_or(ParseError::UnknownWorkSheetRange)?;
-    let end = range.end().ok_or(ParseError::UnknownWorkSheetRange)?;
-
-    let mut row = start.0;
-    while row < end.0 {
+    while row < worksheet_end.0 {
        row += 1;

-        let day_name_opt = get_string_from_cell(&worksheet, row, 0);
-        if day_name_opt.is_none() {
-            continue;
-        }
-
-        let day_name = day_name_opt.unwrap();
-
-        if !is_parsed {
-            is_parsed = true;
+        let day_full_name = or_continue!(get_string_from_cell(&worksheet, row, 0));

+        // parse groups row when days column will found
+        if groups.is_empty() {
+            // переход на предыдущую строку
            row -= 1;

-            for column in (start.1 + 2)..=end.1 {
-                let group_name = get_string_from_cell(&worksheet, row, column);
-                if group_name.is_none() {
-                    continue;
-                }
-
-                groups.push(InternalId {
-                    row,
+            for column in (worksheet_start.1 + 2)..=worksheet_end.1 {
+                groups.push(GroupCellInfo {
                    column,
-                    name: group_name.unwrap(),
+                    name: or_continue!(get_string_from_cell(&worksheet, row, column)),
                });
            }

+            // возврат на текущую строку
            row += 1;
        }

-        days.push(InternalId {
+        let (day_name, day_date) = {
+            let space_index = day_full_name.find(' ').unwrap();
+
+            let name = day_full_name[..space_index].to_string();
+
+            let date_raw = day_full_name[space_index + 1..].to_string();
+            let date_add = format!("{} 00:00:00", date_raw);
+
+            let date =
+                or_break!(NaiveDateTime::parse_from_str(&*date_add, "%d.%m.%Y %H:%M:%S").ok());
+
+            (name, date.and_utc())
+        };
+
+        days.push(DayCellInfo {
            row,
            column: 0,
-            name: day_name.clone(),
+            name: day_name,
+            date: day_date,
        });
-
-        if days.len() > 2 && day_name.starts_with("Суббота") {
-            break;
-        }
    }

    Ok((days, groups))
@@ -238,104 +239,104 @@ fn guess_lesson_type(name: &String) -> Option<(String, LessonType)> {
 fn parse_lesson(
    worksheet: &WorkSheet,
    day: &mut Day,
-    day_times: &Vec<InternalTime>,
-    time: &InternalTime,
+    day_boundaries: &Vec<BoundariesCellInfo>,
+    lesson_boundaries: &BoundariesCellInfo,
    column: u32,
 ) -> Result<LessonParseResult, ParseError> {
-    let row = time.xls_range.0.0;
+    let row = lesson_boundaries.xls_range.0.0;

    let (name, lesson_type) = {
-        let raw_name_opt = get_string_from_cell(&worksheet, row, column);
-        if raw_name_opt.is_none() {
-            return Ok(Lessons(Vec::new()));
-        }
+        let full_name = match get_string_from_cell(&worksheet, row, column) {
+            Some(x) => x,
+            None => return Ok(Lessons(Vec::new())),
+        };

-        let raw_name = raw_name_opt.unwrap();
-
-        static OTHER_STREET_RE: LazyLock<Regex, fn() -> Regex> =
+        static OTHER_STREET_RE: LazyLock<Regex> =
            LazyLock::new(|| Regex::new(r"^[А-Я][а-я]+,?\s?[0-9]+$").unwrap());

-        if OTHER_STREET_RE.is_match(&raw_name) {
-            return Ok(Street(raw_name));
+        if OTHER_STREET_RE.is_match(&full_name) {
+            return Ok(Street(full_name));
        }

-        if let Some(guess) = guess_lesson_type(&raw_name) {
-            guess
-        } else {
-            (raw_name, time.lesson_type.clone())
+        match guess_lesson_type(&full_name) {
+            Some(x) => x,
+            None => (full_name, lesson_boundaries.lesson_type.clone()),
        }
    };

-    let (default_range, lesson_time) = || -> Result<(Option<[u8; 2]>, LessonTime), ParseError> {
-        // check if multi-lesson
+    let (default_range, lesson_time) = {
        let cell_range = get_merge_from_start(worksheet, row, column);
-
-        let end_time_arr = day_times
+        
+        let end_time_arr = day_boundaries
            .iter()
            .filter(|time| time.xls_range.1.0 == cell_range.1.0)
-            .collect::<Vec<&InternalTime>>();
+            .collect::<Vec<&BoundariesCellInfo>>();

-        let end_time = end_time_arr.first().ok_or(ParseError::LessonTimeNotFound)?;
+        let end_time = end_time_arr
+            .first()
+            .ok_or(ParseError::LessonTimeNotFound(ErrorCellPos { row, column }))?;

-        let range: Option<[u8; 2]> = if time.default_index != None {
-            let default = time.default_index.unwrap() as u8;
+        let range: Option<[u8; 2]> = if lesson_boundaries.default_index != None {
+            let default = lesson_boundaries.default_index.unwrap() as u8;
            Some([default, end_time.default_index.unwrap() as u8])
        } else {
            None
        };

-        let time = LessonTime {
-            start: time.time_range.start,
+        let time = LessonBoundaries {
+            start: lesson_boundaries.time_range.start,
            end: end_time.time_range.end,
        };

        Ok((range, time))
-    }()?;
+    }?;

    let (name, mut subgroups) = parse_name_and_subgroups(&name)?;

    {
        let cabinets: Vec<String> = parse_cabinets(worksheet, row, column + 1);

-        // Если количество кабинетов равно 1, назначаем этот кабинет всем подгруппам
-        if cabinets.len() == 1 {
-            for subgroup in &mut subgroups {
-                subgroup.cabinet = Some(cabinets.get(0).or(Some(&String::new())).unwrap().clone())
+        match cabinets.len() {
+            // Если кабинетов нет, но есть подгруппы, назначаем им кабинет "??"
+            0 => {
+                for subgroup in &mut subgroups {
+                    subgroup.cabinet = Some("??".to_string());
+                }
            }
-        }
-        // Если количество кабинетов совпадает с количеством подгрупп, назначаем кабинеты по порядку
-        else if cabinets.len() == subgroups.len() {
-            for subgroup in &mut subgroups {
-                subgroup.cabinet = Some(
-                    cabinets
-                        .get((subgroup.number - 1) as usize)
-                        .unwrap()
-                        .clone(),
-                );
-            }
-        }
-        // Если количество кабинетов больше количества подгрупп, делаем ещё одну подгруппу.
-        else if cabinets.len() > subgroups.len() {
-            for index in 0..subgroups.len() {
-                subgroups[index].cabinet = Some(cabinets[index].clone());
+            // Назначаем этот кабинет всем подгруппам
+            1 => {
+                for subgroup in &mut subgroups {
+                    subgroup.cabinet =
+                        Some(cabinets.get(0).or(Some(&String::new())).unwrap().clone())
+                }
            }
+            len => {
+                // Если количество кабинетов совпадает с количеством подгрупп, назначаем кабинеты по порядку
+                if len == subgroups.len() {
+                    for subgroup in &mut subgroups {
+                        subgroup.cabinet = Some(
+                            cabinets
+                                .get((subgroup.number - 1) as usize)
+                                .unwrap()
+                                .clone(),
+                        );
+                    }
+                // Если количество кабинетов больше количества подгрупп, делаем ещё одну подгруппу.
+                } else if len > subgroups.len() {
+                    for index in 0..subgroups.len() {
+                        subgroups[index].cabinet = Some(cabinets[index].clone());
+                    }

-            while cabinets.len() > subgroups.len() {
-                subgroups.push(LessonSubGroup {
-                    number: (subgroups.len() + 1) as u8,
-                    cabinet: Some(cabinets[subgroups.len()].clone()),
-                    teacher: "Ошибка в расписании".to_string(),
-                });
+                    while cabinets.len() > subgroups.len() {
+                        subgroups.push(LessonSubGroup {
+                            number: (subgroups.len() + 1) as u8,
+                            cabinet: Some(cabinets[subgroups.len()].clone()),
+                            teacher: "Ошибка в расписании".to_string(),
+                        });
+                    }
+                }
            }
-        }
-        // Если кабинетов нет, но есть подгруппы, назначаем им значение "??"
-        else {
-            for subgroup in &mut subgroups {
-                subgroup.cabinet = Some("??".to_string());
-            }
-        }
-
-        cabinets
+        };
    };

    let lesson = Lesson {
@@ -347,7 +348,7 @@ fn parse_lesson(
        group: None,
    };

-    let prev_lesson = if day.lessons.len() == 0 {
+    let prev_lesson = if day.lessons.is_empty() {
        return Ok(Lessons(Vec::from([lesson])));
    } else {
        &day.lessons[day.lessons.len() - 1]
@@ -358,7 +359,7 @@ fn parse_lesson(
            lesson_type: Break,
            default_range: None,
            name: None,
-            time: LessonTime {
+            time: LessonBoundaries {
                start: prev_lesson.time.end,
                end: lesson.time.start,
            },
@@ -389,14 +390,12 @@ fn parse_cabinets(worksheet: &WorkSheet, row: u32, column: u32) -> Vec<String> {

 /// Getting the "pure" name of the lesson and list of teachers from the text of the lesson cell.
 fn parse_name_and_subgroups(name: &String) -> Result<(String, Vec<LessonSubGroup>), ParseError> {
-    static LESSON_RE: LazyLock<Regex, fn() -> Regex> =
+    static LESSON_RE: LazyLock<Regex> =
        LazyLock::new(|| Regex::new(r"(?:[А-Я][а-я]+[А-Я]{2}(?:\([0-9][а-я]+\))?)+$").unwrap());
-    static TEACHER_RE: LazyLock<Regex, fn() -> Regex> =
+    static TEACHER_RE: LazyLock<Regex> =
        LazyLock::new(|| Regex::new(r"([А-Я][а-я]+)([А-Я])([А-Я])(?:\(([0-9])[а-я]+\))?").unwrap());
-    static CLEAN_RE: LazyLock<Regex, fn() -> Regex> =
-        LazyLock::new(|| Regex::new(r"[\s.,]+").unwrap());
-    static END_CLEAN_RE: LazyLock<Regex, fn() -> Regex> =
-        LazyLock::new(|| Regex::new(r"[.\s]+$").unwrap());
+    static CLEAN_RE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"[\s.,]+").unwrap());
+    static END_CLEAN_RE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"[.\s]+$").unwrap());

    let (teachers, lesson_name) = {
        let clean_name = CLEAN_RE.replace_all(&name, "").to_string();
@@ -423,14 +422,9 @@ fn parse_name_and_subgroups(name: &String) -> Result<(String, Vec<LessonSubGroup

    for captures in teacher_it {
        subgroups.push(LessonSubGroup {
-            number: if let Some(capture) = captures.get(4) {
-                capture
-                    .as_str()
-                    .to_string()
-                    .parse::<u8>()
-                    .map_err(|_| ParseError::SubgroupIndexParsingFailed)?
-            } else {
-                0
+            number: match captures.get(4) {
+                Some(capture) => capture.as_str().to_string().parse::<u8>().unwrap(),
+                None => 0,
            },
            cabinet: None,
            teacher: format!(
@@ -479,6 +473,122 @@ fn parse_name_and_subgroups(name: &String) -> Result<(String, Vec<LessonSubGroup
    Ok((lesson_name, subgroups))
 }

+fn parse_lesson_boundaries_cell(
+    cell_data: &String,
+    date: DateTime<Utc>,
+) -> Option<LessonBoundaries> {
+    static TIME_RE: LazyLock<Regex> =
+        LazyLock::new(|| Regex::new(r"(\d+\.\d+)-(\d+\.\d+)").unwrap());
+
+    let parse_res = if let Some(captures) = TIME_RE.captures(cell_data) {
+        captures
+    } else {
+        return None;
+    };
+
+    let start_match = parse_res.get(1).unwrap().as_str();
+    let start_parts: Vec<&str> = start_match.split(".").collect();
+
+    let end_match = parse_res.get(2).unwrap().as_str();
+    let end_parts: Vec<&str> = end_match.split(".").collect();
+
+    static GET_TIME: fn(DateTime<Utc>, &Vec<&str>) -> DateTime<Utc> = |date, parts| {
+        date + Duration::hours(parts[0].parse::<i64>().unwrap() - 4)
+            + Duration::minutes(parts[1].parse::<i64>().unwrap())
+    };
+
+    Some(LessonBoundaries {
+        start: GET_TIME(date.clone(), &start_parts),
+        end: GET_TIME(date, &end_parts),
+    })
+}
+
+fn parse_day_boundaries_column(
+    worksheet: &WorkSheet,
+    day_markup: &DayCellInfo,
+    lesson_time_column: u32,
+    row_distance: u32,
+) -> Result<Vec<BoundariesCellInfo>, ParseError> {
+    let mut day_times: Vec<BoundariesCellInfo> = Vec::new();
+
+    for row in day_markup.row..(day_markup.row + row_distance) {
+        let time_cell = if let Some(str) = get_string_from_cell(&worksheet, row, lesson_time_column)
+        {
+            str
+        } else {
+            continue;
+        };
+
+        let lesson_time = parse_lesson_boundaries_cell(&time_cell, day_markup.date.clone()).ok_or(
+            ParseError::LessonBoundaries(ErrorCell::new(
+                row,
+                lesson_time_column,
+                time_cell.clone(),
+            )),
+        )?;
+
+        // type
+        let lesson_type = if time_cell.contains("пара") {
+            LessonType::Default
+        } else {
+            LessonType::Additional
+        };
+
+        // lesson index
+        let default_index = if lesson_type == LessonType::Default {
+            Some(
+                time_cell
+                    .chars()
+                    .next()
+                    .unwrap()
+                    .to_string()
+                    .parse::<u32>()
+                    .unwrap(),
+            )
+        } else {
+            None
+        };
+
+        day_times.push(BoundariesCellInfo {
+            time_range: lesson_time,
+            lesson_type,
+            default_index,
+            xls_range: get_merge_from_start(&worksheet, row, lesson_time_column),
+        });
+    }
+
+    return Ok(day_times);
+}
+
+fn parse_week_boundaries_column(
+    worksheet: &WorkSheet,
+    week_markup: &Vec<DayCellInfo>,
+) -> Result<Vec<Vec<BoundariesCellInfo>>, ParseError> {
+    let mut result: Vec<Vec<BoundariesCellInfo>> = Vec::new();
+
+    let worksheet_end_row = worksheet.end().unwrap().0;
+    let lesson_time_column = week_markup[0].column + 1;
+
+    for day_index in 0..week_markup.len() {
+        let day_markup = &week_markup[day_index];
+
+        // Если текущий день не последнему, то индекс строки следующего дня минус индекс строки текущего дня.
+        // Если текущий день - последний, то индекс последней строки документа минус индекс строки текущего дня.
+        let row_distance = if day_index != week_markup.len() - 1 {
+            week_markup[day_index + 1].row
+        } else {
+            worksheet_end_row
+        } - day_markup.row;
+
+        let day_boundaries =
+            parse_day_boundaries_column(&worksheet, day_markup, lesson_time_column, row_distance)?;
+
+        result.push(day_boundaries);
+    }
+
+    Ok(result)
+}
+
 /// Conversion of the list of couples of groups in the list of lessons of teachers.
 fn convert_groups_to_teachers(
    groups: &HashMap<String, ScheduleEntry>,
@@ -567,11 +677,11 @@ fn convert_groups_to_teachers(
 /// # Examples
 ///
 /// ```
-/// use schedule_parser_rusted::parser::parse_xls;
+/// use schedule_parser::parse_xls;
 ///
 /// let result = parse_xls(&include_bytes!("../../schedule.xls").to_vec());
 ///
-/// assert!(result.is_ok());
+/// assert!(result.is_ok(), "{}", result.err().unwrap());
 ///
 /// assert_ne!(result.as_ref().unwrap().groups.len(), 0);
 /// assert_ne!(result.as_ref().unwrap().teachers.len(), 0);
@@ -581,19 +691,27 @@ pub fn parse_xls(buffer: &Vec<u8>) -> Result<ParseResult, ParseError> {
    let mut workbook: Xls<_> =
        open_workbook_from_rs(cursor).map_err(|e| ParseError::BadXLS(std::sync::Arc::new(e)))?;

-    let worksheet: WorkSheet = workbook
-        .worksheets()
-        .first()
-        .ok_or(ParseError::NoWorkSheets)?
-        .1
-        .to_owned();
+    let worksheet = {
+        let (worksheet_name, worksheet) = workbook
+            .worksheets()
+            .first()
+            .ok_or(ParseError::NoWorkSheets)?
+            .clone();

-    let (days_markup, groups_markup) = parse_skeleton(&worksheet)?;
+        let worksheet_merges = workbook
+            .worksheet_merge_cells(&*worksheet_name)
+            .ok_or(ParseError::NoWorkSheets)?;
+
+        WorkSheet {
+            data: worksheet,
+            merges: worksheet_merges,
+        }
+    };
+
+    let (week_markup, groups_markup) = parse_skeleton(&worksheet)?;
+    let week_boundaries = parse_week_boundaries_column(&worksheet, &week_markup)?;

    let mut groups: HashMap<String, ScheduleEntry> = HashMap::new();
-    let mut days_times: Vec<Vec<InternalTime>> = Vec::new();
-
-    let saturday_end_row = worksheet.end().unwrap().0;

    for group_markup in groups_markup {
        let mut group = ScheduleEntry {
@@ -601,116 +719,28 @@ pub fn parse_xls(buffer: &Vec<u8>) -> Result<ParseResult, ParseError> {
            days: Vec::new(),
        };

-        for day_index in 0..(&days_markup).len() {
-            let day_markup = &days_markup[day_index];
+        for day_index in 0..(&week_markup).len() {
+            let day_markup = &week_markup[day_index];

-            let mut day = {
-                let space_index = day_markup.name.find(' ').unwrap();
-
-                let name = day_markup.name[..space_index].to_string();
-
-                let date_raw = day_markup.name[space_index + 1..].to_string();
-                let date_add = format!("{} 00:00:00", date_raw);
-
-                let date = NaiveDateTime::parse_from_str(&*date_add, "%d.%m.%Y %H:%M:%S");
-
-                Day {
-                    name,
-                    street: None,
-                    date: date.unwrap().and_utc(),
-                    lessons: Vec::new(),
-                }
+            let mut day = Day {
+                name: day_markup.name.clone(),
+                street: None,
+                date: day_markup.date,
+                lessons: Vec::new(),
            };

-            let lesson_time_column = days_markup[0].column + 1;
+            let day_boundaries = &week_boundaries[day_index];

-            let row_distance = if day_index != days_markup.len() - 1 {
-                days_markup[day_index + 1].row
-            } else {
-                saturday_end_row
-            } - day_markup.row;
-
-            if days_times.len() != 6 {
-                let mut day_times: Vec<InternalTime> = Vec::new();
-
-                for row in day_markup.row..(day_markup.row + row_distance) {
-                    // time
-                    let time_opt = get_string_from_cell(&worksheet, row, lesson_time_column);
-                    if time_opt.is_none() {
-                        continue;
-                    }
-
-                    let time = time_opt.unwrap();
-
-                    // type
-                    let lesson_type = if time.contains("пара") {
-                        LessonType::Default
-                    } else {
-                        LessonType::Additional
-                    };
-
-                    // lesson index
-                    let default_index = if lesson_type == LessonType::Default {
-                        Some(
-                            time.chars()
-                                .next()
-                                .unwrap()
-                                .to_string()
-                                .parse::<u32>()
-                                .unwrap(),
-                        )
-                    } else {
-                        None
-                    };
-
-                    // time
-                    let time_range = {
-                        static TIME_RE: LazyLock<Regex, fn() -> Regex> =
-                            LazyLock::new(|| Regex::new(r"(\d+\.\d+)-(\d+\.\d+)").unwrap());
-
-                        let parse_res = TIME_RE.captures(&time).ok_or(ParseError::GlobalTime)?;
-
-                        let start_match = parse_res.get(1).unwrap().as_str();
-                        let start_parts: Vec<&str> = start_match.split(".").collect();
-
-                        let end_match = parse_res.get(2).unwrap().as_str();
-                        let end_parts: Vec<&str> = end_match.split(".").collect();
-
-                        static GET_TIME: fn(DateTime<Utc>, &Vec<&str>) -> DateTime<Utc> =
-                            |date, parts| {
-                                date + Duration::hours(parts[0].parse::<i64>().unwrap() - 4)
-                                    + Duration::minutes(parts[1].parse::<i64>().unwrap())
-                            };
-
-                        LessonTime {
-                            start: GET_TIME(day.date.clone(), &start_parts),
-                            end: GET_TIME(day.date.clone(), &end_parts),
-                        }
-                    };
-
-                    day_times.push(InternalTime {
-                        time_range,
-                        lesson_type,
-                        default_index,
-                        xls_range: get_merge_from_start(&worksheet, row, lesson_time_column),
-                    });
-                }
-
-                days_times.push(day_times);
-            }
-
-            let day_times = &days_times[day_index];
-
-            for time in day_times {
+            for lesson_boundaries in day_boundaries {
                match &mut parse_lesson(
                    &worksheet,
                    &mut day,
-                    &day_times,
-                    &time,
+                    &day_boundaries,
+                    &lesson_boundaries,
                    group_markup.column,
                )? {
-                    Lessons(l) => day.lessons.append(l),
-                    Street(s) => day.street = Some(s.to_owned()),
+                    Lessons(lesson) => day.lessons.append(lesson),
+                    Street(street) => day.street = Some(street.to_owned()),
                }
            }

@@ -726,21 +756,39 @@ pub fn parse_xls(buffer: &Vec<u8>) -> Result<ParseResult, ParseError> {
    })
 }

-#[cfg(test)]
-pub mod tests {
+#[cfg(any(test, feature = "test-utils"))]
+pub mod test_utils {
    use super::*;

    pub fn test_result() -> Result<ParseResult, ParseError> {
        parse_xls(&include_bytes!("../../schedule.xls").to_vec())
    }
+}

+#[cfg(test)]
+pub mod tests {
    #[test]
    fn read() {
-        let result = test_result();
+        let result = super::test_utils::test_result();

-        assert!(result.is_ok());
+        assert!(result.is_ok(), "{}", result.err().unwrap());

        assert_ne!(result.as_ref().unwrap().groups.len(), 0);
        assert_ne!(result.as_ref().unwrap().teachers.len(), 0);
    }
+
+    #[test]
+    fn test_split_lesson() {
+        let result = super::test_utils::test_result();
+        assert!(result.is_ok(), "{}", result.err().unwrap());
+
+        let result = result.unwrap();
+        assert!(result.groups.contains_key("ИС-214/23"));
+
+        let group = result.groups.get("ИС-214/23").unwrap();
+        let thursday = group.days.get(3).unwrap();
+
+        assert_eq!(thursday.lessons.len(), 1);
+        assert_eq!(thursday.lessons[0].default_range.unwrap()[1], 3);
+    }
 }
--- a/schedule-parser/src/macros.rs
+++ b/schedule-parser/src/macros.rs
@@ -0,0 +1,25 @@
+#[macro_export]
+macro_rules! or_continue {
+    ( $e:expr ) => {
+        {
+            if let Some(x) = $e {
+                x
+            } else {
+                continue;
+            }
+        }
+    }
+}
+
+#[macro_export]
+macro_rules! or_break {
+    ( $e:expr ) => {
+        {
+            if let Some(x) = $e {
+                x
+            } else {
+                break;
+            }
+        }
+    }
+}
--- a/schedule-parser/src/schema.rs
+++ b/schedule-parser/src/schema.rs
@@ -1,5 +1,5 @@
 use chrono::{DateTime, Utc};
-use derive_more::Display;
+use derive_more::{Display, Error};
 use serde::{Deserialize, Serialize, Serializer};
 use serde_repr::{Deserialize_repr, Serialize_repr};
 use std::collections::HashMap;
@@ -8,7 +8,7 @@ use utoipa::ToSchema;

 /// The beginning and end of the lesson.
 #[derive(Clone, Hash, Debug, Serialize, Deserialize, ToSchema)]
-pub struct LessonTime {
+pub struct LessonBoundaries {
    /// The beginning of a lesson.
    pub start: DateTime<Utc>,

@@ -72,7 +72,7 @@ pub struct Lesson {
    pub name: Option<String>,

    /// The beginning and end.
-    pub time: LessonTime,
+    pub time: LessonBoundaries,

    /// List of subgroups.
    #[serde(rename = "subGroups")]
@@ -115,10 +115,33 @@ pub struct ParseResult {
    pub teachers: HashMap<String, ScheduleEntry>,
 }

-#[derive(Debug, Display, Clone, ToSchema)]
+#[derive(Clone, Debug, Display, Error, ToSchema)]
+#[display("row {row}, column {column}")]
+pub struct ErrorCellPos {
+    pub row: u32,
+    pub column: u32,
+}
+
+#[derive(Clone, Debug, Display, Error, ToSchema)]
+#[display("'{data}' at {pos}")]
+pub struct ErrorCell {
+    pub pos: ErrorCellPos,
+    pub data: String,
+}
+
+impl ErrorCell {
+    pub fn new(row: u32, column: u32, data: String) -> Self {
+        Self {
+            pos: ErrorCellPos { row, column },
+            data,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Display, Error, ToSchema)]
 pub enum ParseError {
    /// Errors related to reading XLS file.
-    #[display("{}: Failed to read XLS file.", "_0")]
+    #[display("{_0:?}: Failed to read XLS file.")]
    #[schema(value_type = String)]
    BadXLS(Arc<calamine::XlsError>),

@@ -130,17 +153,13 @@ pub enum ParseError {
    #[display("There is no data on work sheet boundaries.")]
    UnknownWorkSheetRange,

-    /// Failed to read the beginning and end of the lesson from the line
-    #[display("Failed to read lesson start and end times from string.")]
-    GlobalTime,
+    /// Failed to read the beginning and end of the lesson from the cell
+    #[display("Failed to read lesson start and end from {_0}.")]
+    LessonBoundaries(ErrorCell),

    /// Not found the beginning and the end corresponding to the lesson.
-    #[display("No start and end times matching the lesson was found.")]
-    LessonTimeNotFound,
-
-    /// Failed to read the subgroup index.
-    #[display("Failed to read subgroup index.")]
-    SubgroupIndexParsingFailed,
+    #[display("No start and end times matching the lesson (at {_0}) was found.")]
+    LessonTimeNotFound(ErrorCellPos),
 }

 impl Serialize for ParseError {
@@ -154,11 +173,8 @@ impl Serialize for ParseError {
            ParseError::UnknownWorkSheetRange => {
                serializer.serialize_str("UNKNOWN_WORK_SHEET_RANGE")
            }
-            ParseError::GlobalTime => serializer.serialize_str("GLOBAL_TIME"),
-            ParseError::LessonTimeNotFound => serializer.serialize_str("LESSON_TIME_NOT_FOUND"),
-            ParseError::SubgroupIndexParsingFailed => {
-                serializer.serialize_str("SUBGROUP_INDEX_PARSING_FAILED")
-            }
+            ParseError::LessonBoundaries(_) => serializer.serialize_str("GLOBAL_TIME"),
+            ParseError::LessonTimeNotFound(_) => serializer.serialize_str("LESSON_TIME_NOT_FOUND"),
        }
    }
 }
--- a/schedule.xls
+++ b/schedule.xls
--- a/src/app_state.rs
+++ b/src/app_state.rs
@@ -1,4 +1,4 @@
-use crate::parser::schema::ParseResult;
+use schedule_parser::schema::ParseResult;
 use crate::utility::hasher::DigestHasher;
 use crate::xls_downloader::basic_impl::BasicXlsDownloader;
 use actix_web::web;
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1 +0,0 @@
-pub mod parser;
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,6 +4,7 @@ use crate::middlewares::content_type::ContentTypeBootstrap;
 use actix_web::dev::{ServiceFactory, ServiceRequest};
 use actix_web::{App, Error, HttpServer};
 use dotenvy::dotenv;
+use std::io;
 use utoipa_actix_web::AppExt;
 use utoipa_actix_web::scope::Scope;
 use utoipa_rapidoc::RapiDoc;
@@ -12,7 +13,6 @@ mod app_state;

 mod database;

-mod parser;
 mod xls_downloader;

 mod extractors;
@@ -69,12 +69,8 @@ pub fn get_api_scope<
        .service(vk_id_scope)
 }

-#[actix_web::main]
-async fn main() {
-    dotenv().ok();
-
-    unsafe { std::env::set_var("RUST_LOG", "debug") };
-    env_logger::init();
+async fn async_main() -> io::Result<()> {
+    println!("Starting server...");

    let app_state = app_state().await;

@@ -82,7 +78,11 @@ async fn main() {
        let (app, api) = App::new()
            .into_utoipa_app()
            .app_data(app_state.clone())
-            .service(get_api_scope("/api/v1").wrap(ContentTypeBootstrap))
+            .service(
+                get_api_scope("/api/v1")
+                    .wrap(sentry_actix::Sentry::new())
+                    .wrap(ContentTypeBootstrap),
+            )
            .split_for_parts();

        let rapidoc_service = RapiDoc::with_openapi("/api-docs-json", api).path("/api-docs");
@@ -96,9 +96,26 @@ async fn main() {
        app.service(rapidoc_service.custom_html(patched_rapidoc_html))
    })
    .workers(4)
-    .bind(("0.0.0.0", 5050))
-    .unwrap()
+    .bind(("0.0.0.0", 5050))?
    .run()
    .await
-    .unwrap();
+}
+
+fn main() -> io::Result<()> {
+    let _guard = sentry::init((
+        "https://9c33db76e89984b3f009b28a9f4b5954@sentry.n08i40k.ru/8",
+        sentry::ClientOptions {
+            release: sentry::release_name!(),
+            send_default_pii: true,
+            ..Default::default()
+        },
+    ));
+
+    dotenv().unwrap();
+
+    env_logger::init();
+
+    actix_web::rt::System::new().block_on(async { async_main().await })?;
+
+    Ok(())
 }
--- a/src/routes/auth/shared.rs
+++ b/src/routes/auth/shared.rs
@@ -1,9 +1,6 @@
-use crate::utility::jwt::DEFAULT_ALGORITHM;
 use jsonwebtoken::errors::ErrorKind;
-use jsonwebtoken::{decode, DecodingKey, Validation};
+use jsonwebtoken::{decode, Algorithm, DecodingKey, Validation};
 use serde::{Deserialize, Serialize};
-use std::env;
-use std::sync::LazyLock;

 #[derive(Deserialize, Serialize)]
 struct TokenData {
@@ -17,7 +14,7 @@ struct TokenData {

 #[derive(Debug, Serialize, Deserialize)]
 struct Claims {
-    sub: String,
+    sub: i32,
    iis: String,
    jti: i32,
    app: i32,
@@ -52,17 +49,10 @@ const VK_PUBLIC_KEY: &str = concat!(
    "-----END PUBLIC KEY-----"
 );

-static VK_ID_CLIENT_ID: LazyLock<i32> = LazyLock::new(|| {
-    env::var("VK_ID_CLIENT_ID")
-        .expect("VK_ID_CLIENT_ID must be set")
-        .parse::<i32>()
-        .expect("VK_ID_CLIENT_ID must be i32")
-});
-
-pub fn parse_vk_id(token_str: &String) -> Result<i32, Error> {
+pub fn parse_vk_id(token_str: &String, client_id: i32) -> Result<i32, Error> {
    let dkey = DecodingKey::from_rsa_pem(VK_PUBLIC_KEY.as_bytes()).unwrap();

-    match decode::<Claims>(&token_str, &dkey, &Validation::new(DEFAULT_ALGORITHM)) {
+    match decode::<Claims>(&token_str, &dkey, &Validation::new(Algorithm::RS256)) {
        Ok(token_data) => {
            let claims = token_data.claims;

@@ -70,13 +60,10 @@ pub fn parse_vk_id(token_str: &String) -> Result<i32, Error> {
                Err(Error::UnknownIssuer(claims.iis))
            } else if claims.jti != 21 {
                Err(Error::UnknownType(claims.jti))
-            } else if claims.app != *VK_ID_CLIENT_ID {
+            } else if claims.app != client_id {
                Err(Error::UnknownClientId(claims.app))
            } else {
-                match claims.sub.parse::<i32>() {
-                    Ok(sub) => Ok(sub),
-                    Err(_) => Err(Error::InvalidToken),
-                }
+                Ok(claims.sub)
            }
        }
        Err(err) => Err(match err.into_kind() {
--- a/src/routes/auth/sign_in.rs
+++ b/src/routes/auth/sign_in.rs
@@ -71,7 +71,7 @@ pub async fn sign_in_vk(
 ) -> ServiceResponse {
    let data = data_json.into_inner();

-    match parse_vk_id(&data.access_token) {
+    match parse_vk_id(&data.access_token, app_state.vk_id.client_id) {
        Ok(id) => sign_in_combined(Vk(id), &app_state).await.into(),
        Err(_) => ErrorCode::InvalidVkAccessToken.into_response(),
    }
@@ -150,7 +150,7 @@ mod tests {
    use std::fmt::Write;

    async fn sign_in_client(data: Request) -> ServiceResponse {
-        let app = test_app(test_app_state().await, sign_in).await;
+        let app = test_app(test_app_state(Default::default()).await, sign_in).await;

        let req = test::TestRequest::with_uri("/sign-in")
            .method(Method::POST)
--- a/src/routes/auth/sign_up.rs
+++ b/src/routes/auth/sign_up.rs
@@ -79,7 +79,7 @@ pub async fn sign_up_vk(
 ) -> ServiceResponse {
    let data = data_json.into_inner();

-    match parse_vk_id(&data.access_token) {
+    match parse_vk_id(&data.access_token, app_state.vk_id.client_id) {
        Ok(id) => sign_up_combined(
            SignUpData {
                username: data.username,
@@ -241,7 +241,9 @@ mod tests {
    use crate::database::models::UserRole;
    use crate::routes::auth::sign_up::schema::Request;
    use crate::routes::auth::sign_up::sign_up;
-    use crate::test_env::tests::{static_app_state, test_app_state, test_env};
+    use crate::test_env::tests::{
+        TestAppStateParams, TestScheduleType, static_app_state, test_app_state, test_env,
+    };
    use actix_test::test_app;
    use actix_web::dev::ServiceResponse;
    use actix_web::http::Method;
@@ -252,10 +254,22 @@ mod tests {
        username: String,
        group: String,
        role: UserRole,
+        load_schedule: bool,
    }

    async fn sign_up_client(data: SignUpPartial) -> ServiceResponse {
-        let app = test_app(test_app_state().await, sign_up).await;
+        let app = test_app(
+            test_app_state(TestAppStateParams {
+                schedule: if data.load_schedule {
+                    TestScheduleType::Local
+                } else {
+                    TestScheduleType::None
+                },
+            })
+            .await,
+            sign_up,
+        )
+        .await;

        let req = test::TestRequest::with_uri("/sign-up")
            .method(Method::POST)
@@ -286,6 +300,7 @@ mod tests {
            username: "test::sign_up_valid".to_string(),
            group: "ИС-214/23".to_string(),
            role: UserRole::Student,
+            load_schedule: false,
        })
        .await;

@@ -305,6 +320,7 @@ mod tests {
            username: "test::sign_up_multiple".to_string(),
            group: "ИС-214/23".to_string(),
            role: UserRole::Student,
+            load_schedule: false,
        })
        .await;

@@ -314,6 +330,7 @@ mod tests {
            username: "test::sign_up_multiple".to_string(),
            group: "ИС-214/23".to_string(),
            role: UserRole::Student,
+            load_schedule: false,
        })
        .await;

@@ -329,6 +346,7 @@ mod tests {
            username: "test::sign_up_invalid_role".to_string(),
            group: "ИС-214/23".to_string(),
            role: UserRole::Admin,
+            load_schedule: false,
        })
        .await;

@@ -344,6 +362,7 @@ mod tests {
            username: "test::sign_up_invalid_group".to_string(),
            group: "invalid_group".to_string(),
            role: UserRole::Student,
+            load_schedule: true,
        })
        .await;

--- a/src/routes/schedule/group.rs
+++ b/src/routes/schedule/group.rs
@@ -39,7 +39,7 @@ pub async fn group(user: SyncExtractor<User>, app_state: web::Data<AppState>) ->
 }

 mod schema {
-    use crate::parser::schema::ScheduleEntry;
+    use schedule_parser::schema::ScheduleEntry;
    use actix_macros::{IntoResponseErrorNamed, StatusCode};
    use chrono::{DateTime, NaiveDateTime, Utc};
    use derive_more::Display;
--- a/src/routes/schedule/mod.rs
+++ b/src/routes/schedule/mod.rs
@@ -2,9 +2,9 @@ mod cache_status;
 mod group;
 mod group_names;
 mod schedule;
+mod schema;
 mod teacher;
 mod teacher_names;
-mod schema;
 mod update_download_url;

 pub use cache_status::*;
--- a/src/routes/schedule/schema.rs
+++ b/src/routes/schedule/schema.rs
@@ -1,5 +1,5 @@
 use crate::app_state::{AppState, Schedule};
-use crate::parser::schema::ScheduleEntry;
+use schedule_parser::schema::ScheduleEntry;
 use actix_macros::{IntoResponseErrorNamed, ResponderJson, StatusCode};
 use actix_web::web;
 use chrono::{DateTime, Duration, Utc};
@@ -99,7 +99,7 @@ impl From<&Schedule> for CacheStatus {
    fn from(value: &Schedule) -> Self {
        Self {
            cache_hash: value.hash(),
-            cache_update_required: (value.fetched_at - Utc::now()) > Duration::minutes(5),
+            cache_update_required: (Utc::now() - value.fetched_at) > Duration::minutes(5),
            last_cache_update: value.fetched_at.timestamp(),
            last_schedule_update: value.updated_at.timestamp(),
        }
--- a/src/routes/schedule/teacher.rs
+++ b/src/routes/schedule/teacher.rs
@@ -40,7 +40,7 @@ pub async fn teacher(
 }

 mod schema {
-    use crate::parser::schema::ScheduleEntry;
+    use schedule_parser::schema::ScheduleEntry;
    use actix_macros::{IntoResponseErrorNamed, StatusCode};
    use chrono::{DateTime, NaiveDateTime, Utc};
    use derive_more::Display;
--- a/src/routes/schedule/update_download_url.rs
+++ b/src/routes/schedule/update_download_url.rs
@@ -1,10 +1,10 @@
 use self::schema::*;
 use crate::AppState;
 use crate::app_state::Schedule;
-use crate::parser::parse_xls;
+use schedule_parser::parse_xls;
 use crate::routes::schedule::schema::CacheStatus;
 use crate::routes::schema::{IntoResponseAsError, ResponseError};
-use crate::xls_downloader::interface::XLSDownloader;
+use crate::xls_downloader::interface::{FetchError, XLSDownloader};
 use actix_web::web::Json;
 use actix_web::{patch, web};
 use chrono::Utc;
@@ -41,7 +41,7 @@ pub async fn update_download_url(
            }

            match downloader.fetch(false).await {
-                Ok(download_result) => match parse_xls(download_result.data.as_ref().unwrap()) {
+                Ok(download_result) => match parse_xls(&download_result.data.unwrap()) {
                    Ok(data) => {
                        *schedule = Some(Schedule {
                            etag: download_result.etag,
@@ -53,32 +53,39 @@ pub async fn update_download_url(

                        Ok(CacheStatus::from(schedule.as_ref().unwrap())).into()
                    }
-                    Err(error) => ErrorCode::InvalidSchedule(error).into_response(),
+                    Err(error) => {
+                        sentry::capture_error(&error);
+
+                        ErrorCode::InvalidSchedule(error).into_response()
+                    }
                },
                Err(error) => {
-                    eprintln!("Unknown url provided {}", data.url);
-                    eprintln!("{:?}", error);
+                    if let FetchError::Unknown(error) = &error {
+                        sentry::capture_error(&error);
+                    }

-                    ErrorCode::DownloadFailed.into_response()
+                    ErrorCode::DownloadFailed(error).into_response()
                }
            }
        }
        Err(error) => {
-            eprintln!("Unknown url provided {}", data.url);
-            eprintln!("{:?}", error);
+            if let FetchError::Unknown(error) = &error {
+                sentry::capture_error(&error);
+            }

-            ErrorCode::FetchFailed.into_response()
+            ErrorCode::FetchFailed(error).into_response()
        }
    }
 }

 mod schema {
-    use crate::parser::schema::ParseError;
+    use schedule_parser::schema::ParseError;
    use crate::routes::schedule::schema::CacheStatus;
    use actix_macros::{IntoResponseErrorNamed, StatusCode};
    use derive_more::Display;
    use serde::{Deserialize, Serialize, Serializer};
    use utoipa::ToSchema;
+    use crate::xls_downloader::interface::FetchError;

    pub type ServiceResponse = crate::routes::schema::Response<CacheStatus, ErrorCode>;

@@ -93,16 +100,16 @@ mod schema {
    #[schema(as = SetDownloadUrl::ErrorCode)]
    pub enum ErrorCode {
        /// Transferred link with host different from politehnikum-eng.ru.
-        #[display("URL with unknown host provided. Provide url with politehnikum-eng.ru host.")]
+        #[display("URL with unknown host provided. Provide url with 'politehnikum-eng.ru' host.")]
        NonWhitelistedHost,

        /// Failed to retrieve file metadata.
-        #[display("Unable to retrieve metadata from the specified URL.")]
-        FetchFailed,
+        #[display("Unable to retrieve metadata from the specified URL: {_0}")]
+        FetchFailed(FetchError),

        /// Failed to download the file.
-        #[display("Unable to retrieve data from the specified URL.")]
-        DownloadFailed,
+        #[display("Unable to retrieve data from the specified URL: {_0}")]
+        DownloadFailed(FetchError),

        /// The link leads to an outdated schedule.
        ///
@@ -112,7 +119,7 @@ mod schema {
        OutdatedSchedule,

        /// Failed to parse the schedule.
-        #[display("{}", "_0.display()")]
+        #[display("{_0}")]
        InvalidSchedule(ParseError),
    }

@@ -123,8 +130,8 @@ mod schema {
        {
            match self {
                ErrorCode::NonWhitelistedHost => serializer.serialize_str("NON_WHITELISTED_HOST"),
-                ErrorCode::FetchFailed => serializer.serialize_str("FETCH_FAILED"),
-                ErrorCode::DownloadFailed => serializer.serialize_str("DOWNLOAD_FAILED"),
+                ErrorCode::FetchFailed(_) => serializer.serialize_str("FETCH_FAILED"),
+                ErrorCode::DownloadFailed(_) => serializer.serialize_str("DOWNLOAD_FAILED"),
                ErrorCode::OutdatedSchedule => serializer.serialize_str("OUTDATED_SCHEDULE"),
                ErrorCode::InvalidSchedule(_) => serializer.serialize_str("INVALID_SCHEDULE"),
            }
--- a/src/routes/vk_id/oauth.rs
+++ b/src/routes/vk_id/oauth.rs
@@ -59,13 +59,16 @@ async fn oauth(data: web::Json<Request>, app_state: web::Data<AppState>) -> Serv
                return ErrorCode::VkIdError.into_response();
            }

-            if let Ok(auth_data) = res.json::<VkIdAuthResponse>().await {
-                Ok(Response {
-                    access_token: auth_data.id_token,
-                })
-                .into()
-            } else {
-                ErrorCode::VkIdError.into_response()
+            match res.json::<VkIdAuthResponse>().await {
+                Ok(auth_data) =>
+                    Ok(Response {
+                        access_token: auth_data.id_token,
+                    }).into(),
+                Err(error) => {
+                    sentry::capture_error(&error);
+                    
+                    ErrorCode::VkIdError.into_response()
+                }
            }
        }
        Err(_) => ErrorCode::VkIdError.into_response(),
--- a/src/test_env.rs
+++ b/src/test_env.rs
@@ -1,24 +1,47 @@
 #[cfg(test)]
 pub(crate) mod tests {
    use crate::app_state::{AppState, Schedule, app_state};
-    use crate::parser::tests::test_result;
+    use schedule_parser::test_utils::test_result;
+    use crate::utility::mutex::MutexScope;
    use actix_web::web;
+    use std::default::Default;
    use tokio::sync::OnceCell;

    pub fn test_env() {
        dotenvy::from_path(".env.test").expect("Failed to load test environment file");
    }

-    pub async fn test_app_state() -> web::Data<AppState> {
-        let state = app_state().await;
-        let mut schedule_lock = state.schedule.lock().unwrap();
+    pub enum TestScheduleType {
+        None,
+        Local,
+    }

-        *schedule_lock = Some(Schedule {
-            etag: "".to_string(),
-            fetched_at: Default::default(),
-            updated_at: Default::default(),
-            parsed_at: Default::default(),
-            data: test_result().unwrap(),
+    pub struct TestAppStateParams {
+        pub schedule: TestScheduleType,
+    }
+
+    impl Default for TestAppStateParams {
+        fn default() -> Self {
+            Self {
+                schedule: TestScheduleType::None,
+            }
+        }
+    }
+
+    pub async fn test_app_state(params: TestAppStateParams) -> web::Data<AppState> {
+        let state = app_state().await;
+
+        state.schedule.scope(|schedule| {
+            *schedule = match params.schedule {
+                TestScheduleType::None => None,
+                TestScheduleType::Local => Some(Schedule {
+                    etag: "".to_string(),
+                    fetched_at: Default::default(),
+                    updated_at: Default::default(),
+                    parsed_at: Default::default(),
+                    data: test_result().unwrap(),
+                }),
+            }
        });

        state.clone()
@@ -27,6 +50,9 @@ pub(crate) mod tests {
    pub async fn static_app_state() -> web::Data<AppState> {
        static STATE: OnceCell<web::Data<AppState>> = OnceCell::const_new();

-        STATE.get_or_init(|| test_app_state()).await.clone()
+        STATE
+            .get_or_init(|| test_app_state(Default::default()))
+            .await
+            .clone()
    }
 }
--- a/src/xls_downloader/basic_impl.rs
+++ b/src/xls_downloader/basic_impl.rs
@@ -1,11 +1,14 @@
 use crate::xls_downloader::interface::{FetchError, FetchOk, FetchResult, XLSDownloader};
 use chrono::{DateTime, Utc};
+use std::env;
+use std::sync::Arc;

 pub struct BasicXlsDownloader {
    pub url: Option<String>,
+    user_agent: String,
 }

-async fn fetch_specified(url: &String, user_agent: String, head: bool) -> FetchResult {
+async fn fetch_specified(url: &String, user_agent: &String, head: bool) -> FetchResult {
    let client = reqwest::Client::new();

    let response = if head {
@@ -13,14 +16,14 @@ async fn fetch_specified(url: &String, user_agent: String, head: bool) -> FetchR
    } else {
        client.get(url)
    }
-    .header("User-Agent", user_agent)
+    .header("User-Agent", user_agent.clone())
    .send()
    .await;

    match response {
        Ok(r) => {
            if r.status().as_u16() != 200 {
-                return Err(FetchError::BadStatusCode);
+                return Err(FetchError::BadStatusCode(r.status().as_u16()));
            }

            let headers = r.headers();
@@ -30,11 +33,18 @@ async fn fetch_specified(url: &String, user_agent: String, head: bool) -> FetchR
            let last_modified = headers.get("last-modified");
            let date = headers.get("date");

-            if content_type.is_none() || etag.is_none() || last_modified.is_none() || date.is_none()
-            {
-                Err(FetchError::BadHeaders)
+            if content_type.is_none() {
+                Err(FetchError::BadHeaders("Content-Type".to_string()))
+            } else if etag.is_none() {
+                Err(FetchError::BadHeaders("ETag".to_string()))
+            } else if last_modified.is_none() {
+                Err(FetchError::BadHeaders("Last-Modified".to_string()))
+            } else if date.is_none() {
+                Err(FetchError::BadHeaders("Date".to_string()))
            } else if content_type.unwrap() != "application/vnd.ms-excel" {
-                Err(FetchError::BadContentType)
+                Err(FetchError::BadContentType(
+                    content_type.unwrap().to_str().unwrap().to_string(),
+                ))
            } else {
                let etag = etag.unwrap().to_str().unwrap().to_string();
                let last_modified =
@@ -49,13 +59,16 @@ async fn fetch_specified(url: &String, user_agent: String, head: bool) -> FetchR
                })
            }
        }
-        Err(_) => Err(FetchError::Unknown),
+        Err(error) => Err(FetchError::Unknown(Arc::new(error))),
    }
 }

 impl BasicXlsDownloader {
    pub fn new() -> Self {
-        BasicXlsDownloader { url: None }
+        BasicXlsDownloader {
+            url: None,
+            user_agent: env::var("REQWEST_USER_AGENT").expect("USER_AGENT must be set"),
+        }
    }
 }

@@ -64,17 +77,12 @@ impl XLSDownloader for BasicXlsDownloader {
        if self.url.is_none() {
            Err(FetchError::NoUrlProvided)
        } else {
-            fetch_specified(
-                self.url.as_ref().unwrap(),
-                "t.me/polytechnic_next".to_string(),
-                head,
-            )
-            .await
+            fetch_specified(self.url.as_ref().unwrap(), &self.user_agent, head).await
        }
    }

    async fn set_url(&mut self, url: String) -> FetchResult {
-        let result = fetch_specified(&url, "t.me/polytechnic_next".to_string(), true).await;
+        let result = fetch_specified(&url, &self.user_agent, true).await;

        if let Ok(_) = result {
            self.url = Some(url);
@@ -86,7 +94,7 @@ impl XLSDownloader for BasicXlsDownloader {

 #[cfg(test)]
 mod tests {
-    use crate::xls_downloader::basic_impl::{BasicXlsDownloader, fetch_specified};
+    use crate::xls_downloader::basic_impl::{fetch_specified, BasicXlsDownloader};
    use crate::xls_downloader::interface::{FetchError, XLSDownloader};

    #[tokio::test]
@@ -95,8 +103,8 @@ mod tests {
        let user_agent = String::new();

        let results = [
-            fetch_specified(&url, user_agent.clone(), true).await,
-            fetch_specified(&url, user_agent.clone(), false).await,
+            fetch_specified(&url, &user_agent, true).await,
+            fetch_specified(&url, &user_agent, false).await,
        ];

        assert!(results[0].is_err());
@@ -109,21 +117,17 @@ mod tests {
        let user_agent = String::new();

        let results = [
-            fetch_specified(&url, user_agent.clone(), true).await,
-            fetch_specified(&url, user_agent.clone(), false).await,
+            fetch_specified(&url, &user_agent, true).await,
+            fetch_specified(&url, &user_agent, false).await,
        ];

        assert!(results[0].is_err());
        assert!(results[1].is_err());

-        assert_eq!(
-            *results[0].as_ref().err().unwrap(),
-            FetchError::BadStatusCode
-        );
-        assert_eq!(
-            *results[1].as_ref().err().unwrap(),
-            FetchError::BadStatusCode
-        );
+        let expected_error = FetchError::BadStatusCode(404);
+
+        assert_eq!(*results[0].as_ref().err().unwrap(), expected_error);
+        assert_eq!(*results[1].as_ref().err().unwrap(), expected_error);
    }

    #[tokio::test]
@@ -132,15 +136,17 @@ mod tests {
        let user_agent = String::new();

        let results = [
-            fetch_specified(&url, user_agent.clone(), true).await,
-            fetch_specified(&url, user_agent.clone(), false).await,
+            fetch_specified(&url, &user_agent, true).await,
+            fetch_specified(&url, &user_agent, false).await,
        ];

        assert!(results[0].is_err());
        assert!(results[1].is_err());

-        assert_eq!(*results[0].as_ref().err().unwrap(), FetchError::BadHeaders);
-        assert_eq!(*results[1].as_ref().err().unwrap(), FetchError::BadHeaders);
+        let expected_error = FetchError::BadHeaders("ETag".to_string());
+
+        assert_eq!(*results[0].as_ref().err().unwrap(), expected_error);
+        assert_eq!(*results[1].as_ref().err().unwrap(), expected_error);
    }

    #[tokio::test]
@@ -149,21 +155,12 @@ mod tests {
        let user_agent = String::new();

        let results = [
-            fetch_specified(&url, user_agent.clone(), true).await,
-            fetch_specified(&url, user_agent.clone(), false).await,
+            fetch_specified(&url, &user_agent, true).await,
+            fetch_specified(&url, &user_agent, false).await,
        ];

        assert!(results[0].is_err());
        assert!(results[1].is_err());
-
-        assert_eq!(
-            *results[0].as_ref().err().unwrap(),
-            FetchError::BadContentType
-        );
-        assert_eq!(
-            *results[1].as_ref().err().unwrap(),
-            FetchError::BadContentType
-        );
    }

    #[tokio::test]
@@ -172,8 +169,8 @@ mod tests {
        let user_agent = String::new();

        let results = [
-            fetch_specified(&url, user_agent.clone(), true).await,
-            fetch_specified(&url, user_agent.clone(), false).await,
+            fetch_specified(&url, &user_agent, true).await,
+            fetch_specified(&url, &user_agent, false).await,
        ];

        assert!(results[0].is_ok());
--- a/src/xls_downloader/interface.rs
+++ b/src/xls_downloader/interface.rs
@@ -1,22 +1,38 @@
 use chrono::{DateTime, Utc};
+use derive_more::Display;
+use std::mem::discriminant;
+use std::sync::Arc;
+use utoipa::ToSchema;

 /// XLS data retrieval errors.
-#[derive(PartialEq, Debug)]
+#[derive(Clone, Debug, ToSchema, Display)]
 pub enum FetchError {
    /// File url is not set.
+    #[display("The link to the timetable was not provided earlier.")]
    NoUrlProvided,

    /// Unknown error.
-    Unknown,
+    #[display("An unknown error occurred while downloading the file.")]
+    #[schema(value_type = String)]
+    Unknown(Arc<reqwest::Error>),

    /// Server returned a status code different from 200.
-    BadStatusCode,
+    #[display("Server returned a status code {_0}.")]
+    BadStatusCode(u16),

    /// The url leads to a file of a different type.
-    BadContentType,
+    #[display("The link leads to a file of type '{_0}'.")]
+    BadContentType(String),

    /// Server doesn't return expected headers.
-    BadHeaders,
+    #[display("Server doesn't return expected header(s) '{_0}'.")]
+    BadHeaders(String),
+}
+
+impl PartialEq for FetchError {
+    fn eq(&self, other: &Self) -> bool {
+        discriminant(self) == discriminant(other)
+    }
 }

 /// Result of XLS data retrieval.
Author	SHA1	Message	Date
n08i40k	8de1891724	chore(release): bump version to 1.0.5	2025-05-26 05:30:44 +04:00
n08i40k	4cf6df379e	fix(parser): fix lessons merging	2025-05-26 05:24:13 +04:00
n08i40k	ba8b164b6a	refactor(parser): rewrite some parts of code	2025-05-26 05:24:08 +04:00
n08i40k	ff9d7d6c3a	fix(cache): fix setting cache_update_required flag in cache status	2025-05-25 17:39:23 +04:00
n08i40k	9090716f87	fix(test): fix test sign_up_invalid_group	2025-05-25 15:57:18 +04:00
n08i40k	ee992f1b55	chore(xls): update schedule xls	2025-05-25 15:49:52 +04:00
n08i40k	7f71fb1616	refactor(env): remove unsave env::set_var call	2025-05-25 15:48:43 +04:00
n08i40k	234055eaeb	feat(test): add ability to use test env without schedule	2025-05-25 15:48:10 +04:00
N08I40K	fceffb900d	release/v1.0.3	2025-04-18 00:29:04 +04:00
N08I40K	49ce0005dc	Исправление работы подключения к сайтам из-за отсутствия сертификатов.	2025-04-18 00:28:55 +04:00
N08I40K	4c738085f2	release/v1.0.2	2025-04-18 00:11:55 +04:00
N08I40K	20602eb863	Улучшенное отображение ошибок при обновлении ссылки расписания.	2025-04-18 00:11:05 +04:00
N08I40K	e04d462223	1.0.1	2025-04-17 23:08:58 +04:00
N08I40K	22af02464d	Исправление работы авторизации с помощью VK ID.	2025-04-17 23:07:19 +04:00
N08I40K	9a517519db	User-Agent для reqwest теперь устанавливается с помощью переменной окружения.	2025-04-17 22:41:42 +04:00
N08I40K	65376e75f7	Workflow для публикации релизов. - Запускает тесты. - Собирает приложение. - Отправляет отладочную информацию в Sentry. - Собирает и отправляет в реестр Docker image с приложением. - Создаёт релиз со списком изменений и артефактами сборки.	2025-04-17 21:34:46 +04:00
N08I40K	bef6163c1b	Отключение тестов при pull request.	2025-04-17 16:39:39 +04:00
N08I40K	283858fea3	Возможный фикс тестов.	2025-04-17 01:10:19 +04:00
N08I40K	66ad4ef938	Подключение sentry.	2025-04-17 01:07:03 +04:00