mirror of
https://github.com/n08i40k/schedule-parser-rusted.git
synced 2025-12-06 17:57:47 +03:00
Compare commits
62 Commits
844c89a365
...
release/v1
| Author | SHA1 | Date | |
|---|---|---|---|
|
edea6c5424
|
|||
|
fdbb872fc3
|
|||
|
dbc800fef1
|
|||
|
e729d84c93
|
|||
|
cc7adf10ed
|
|||
|
57c1699c9a
|
|||
|
298c4f4dd3
|
|||
|
e3904a255b
|
|||
|
829c1cf68d
|
|||
|
6a535f8d73
|
|||
|
5e5cd53f46
|
|||
|
8d59e37976
|
|||
|
5e39fc9acc
|
|||
|
7c973bfda0
|
|||
|
8fba0fc709
|
|||
|
983ff4fa5e
|
|||
|
fb6f3fc05f
|
|||
|
e64011ba16
|
|||
|
6a106a366c
|
|||
|
4fca22662c
|
|||
|
d23092a32a
|
|||
|
01bfa38969
|
|||
|
851ec9225f
|
|||
|
8de1891724
|
|||
|
4cf6df379e
|
|||
|
ba8b164b6a
|
|||
|
ff9d7d6c3a
|
|||
|
9090716f87
|
|||
|
ee992f1b55
|
|||
|
7f71fb1616
|
|||
|
234055eaeb
|
|||
|
fceffb900d
|
|||
|
49ce0005dc
|
|||
|
4c738085f2
|
|||
|
20602eb863
|
|||
|
e04d462223
|
|||
|
22af02464d
|
|||
|
9a517519db
|
|||
|
65376e75f7
|
|||
|
bef6163c1b
|
|||
|
283858fea3
|
|||
|
66ad4ef938
|
|||
|
28f59389ed
|
|||
|
e71ab0526d
|
|||
|
ff05614404
|
|||
|
9cc03c4ffe
|
|||
|
5068fe3069
|
|||
|
2fd6d787a0
|
|||
|
7a1b32d843
|
|||
|
542258df01
|
|||
|
ccaabfe909
|
|||
|
4c5e0761eb
|
|||
|
057dac5b09
|
|||
|
5b6f5c830f
|
|||
|
680419ea78
|
|||
|
30c985a3d7
|
|||
|
70a7480ea3
|
|||
|
1add903f36
|
|||
|
f703cc8326
|
|||
|
ab1cbd795e
|
|||
|
0316f58592
|
|||
|
a95494d3be
|
26
.env.test
Normal file
26
.env.test
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
# Schedule
|
||||||
|
# SCHEDULE_INIT_URL=
|
||||||
|
SCHEDULE_DISABLE_AUTO_UPDATE=1
|
||||||
|
|
||||||
|
# Basic authorization
|
||||||
|
JWT_SECRET="test-secret-at-least-256-bits-used"
|
||||||
|
|
||||||
|
# VKID
|
||||||
|
VK_ID_CLIENT_ID=0
|
||||||
|
VK_ID_REDIRECT_URI="vk0://vk.com/blank.html"
|
||||||
|
|
||||||
|
# Telegram Mini-App
|
||||||
|
TELEGRAM_BOT_ID=0
|
||||||
|
TELEGRAM_MINI_APP_HOST=example.com
|
||||||
|
TELEGRAM_TEST_DC=false
|
||||||
|
|
||||||
|
# Yandex Cloud
|
||||||
|
YANDEX_CLOUD_API_KEY=""
|
||||||
|
YANDEX_CLOUD_FUNC_ID=""
|
||||||
|
|
||||||
|
# Firebase
|
||||||
|
# GOOGLE_APPLICATION_CREDENTIALS=
|
||||||
|
|
||||||
|
# LOGGING
|
||||||
|
RUST_BACKTRACE=1
|
||||||
|
# RUST_LOG=debug
|
||||||
173
.github/workflows/release.yml
vendored
Normal file
173
.github/workflows/release.yml
vendored
Normal file
@@ -0,0 +1,173 @@
|
|||||||
|
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: |
|
||||||
|
cargo test --verbose
|
||||||
|
env:
|
||||||
|
DATABASE_URL: ${{ env.TEST_DB }}
|
||||||
|
SCHEDULE_DISABLE_AUTO_UPDATE: 1
|
||||||
|
JWT_SECRET: "test-secret-at-least-256-bits-used"
|
||||||
|
VK_ID_CLIENT_ID: 0
|
||||||
|
VK_ID_REDIRECT_URI: "vk0://vk.com/blank.html"
|
||||||
|
TELEGRAM_BOT_ID: 0
|
||||||
|
TELEGRAM_MINI_APP_HOST: example.com
|
||||||
|
TELEGRAM_TEST_DC: false
|
||||||
|
YANDEX_CLOUD_API_KEY: ""
|
||||||
|
YANDEX_CLOUD_FUNC_ID: ""
|
||||||
|
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
|
||||||
22
.github/workflows/test.yml
vendored
22
.github/workflows/test.yml
vendored
@@ -1,10 +1,9 @@
|
|||||||
name: Tests
|
name: cargo test
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ "master" ]
|
branches: [ "master" ]
|
||||||
pull_request:
|
tags-ignore: [ "release/v*" ]
|
||||||
branches: [ "master" ]
|
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
@@ -19,7 +18,20 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: cargo build --verbose
|
run: cargo build
|
||||||
|
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: cargo test --verbose -p schedule-parser-rusted -p schedule_parser
|
run: cargo test
|
||||||
|
env:
|
||||||
|
DATABASE_URL: ${{ secrets.TEST_DATABASE_URL }}
|
||||||
|
SCHEDULE_DISABLE_AUTO_UPDATE: 1
|
||||||
|
JWT_SECRET: "test-secret-at-least-256-bits-used"
|
||||||
|
VK_ID_CLIENT_ID: 0
|
||||||
|
VK_ID_REDIRECT_URI: "vk0://vk.com/blank.html"
|
||||||
|
TELEGRAM_BOT_ID: 0
|
||||||
|
TELEGRAM_MINI_APP_HOST: example.com
|
||||||
|
TELEGRAM_TEST_DC: false
|
||||||
|
YANDEX_CLOUD_API_KEY: ""
|
||||||
|
YANDEX_CLOUD_FUNC_ID: ""
|
||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -4,3 +4,4 @@ schedule.json
|
|||||||
teachers.json
|
teachers.json
|
||||||
|
|
||||||
.env*
|
.env*
|
||||||
|
/*-firebase-adminsdk-*.json
|
||||||
|
|||||||
14
.idea/discord.xml
generated
Normal file
14
.idea/discord.xml
generated
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="DiscordProjectSettings">
|
||||||
|
<option name="show" value="PROJECT_FILES" />
|
||||||
|
<option name="description" value="" />
|
||||||
|
<option name="applicationTheme" value="default" />
|
||||||
|
<option name="iconsTheme" value="default" />
|
||||||
|
<option name="button1Title" value="" />
|
||||||
|
<option name="button1Url" value="" />
|
||||||
|
<option name="button2Title" value="" />
|
||||||
|
<option name="button2Url" value="" />
|
||||||
|
<option name="customApplicationId" value="" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
11
.idea/schedule-parser-rusted.iml
generated
11
.idea/schedule-parser-rusted.iml
generated
@@ -2,10 +2,19 @@
|
|||||||
<module type="EMPTY_MODULE" version="4">
|
<module type="EMPTY_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager">
|
<component name="NewModuleRootManager">
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/lib/schedule_parser/benches" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/lib/schedule_parser/src" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/lib/schedule_parser/src" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||||
|
<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" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/providers/base/src" isTestSource="false" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/providers/provider-engels-polytechnic/src" isTestSource="false" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/providers/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" />
|
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/.idea/dataSources" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
|||||||
9
.idea/sqldialects.xml
generated
9
.idea/sqldialects.xml
generated
@@ -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>
|
|
||||||
3970
Cargo.lock
generated
3970
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
84
Cargo.toml
84
Cargo.toml
@@ -1,23 +1,81 @@
|
|||||||
[workspace]
|
[workspace]
|
||||||
members = ["lib/schedule_parser"]
|
members = ["actix-macros", "actix-test", "providers"]
|
||||||
|
|
||||||
[package]
|
[package]
|
||||||
name = "schedule-parser-rusted"
|
name = "schedule-parser-rusted"
|
||||||
version = "0.3.0"
|
version = "1.2.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
publish = false
|
publish = false
|
||||||
|
|
||||||
|
[profile.release]
|
||||||
|
debug = true
|
||||||
|
|
||||||
|
[features]
|
||||||
|
trace = ["tracing", "console-subscriber"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bcrypt = "0.17.0"
|
providers = { path = "providers" }
|
||||||
jwt = "0.16.0"
|
actix-macros = { path = "actix-macros" }
|
||||||
hmac = "0.12.1"
|
|
||||||
sha2 = "0.10.8"
|
# serve api
|
||||||
diesel = { version = "2.2.8", features = ["postgres"] }
|
actix-web = "4.11.0"
|
||||||
diesel-derive-enum = { git = "https://github.com/Havunen/diesel-derive-enum.git", features = ["postgres"] }
|
|
||||||
|
# basic
|
||||||
|
chrono = { version = "0.4.41", features = ["serde"] }
|
||||||
|
derive_more = { version = "2.0.1", features = ["full"] }
|
||||||
dotenvy = "0.15.7"
|
dotenvy = "0.15.7"
|
||||||
|
|
||||||
|
# sql
|
||||||
|
database = { path = "database" }
|
||||||
|
|
||||||
|
# logging
|
||||||
|
env_logger = "0.11.8"
|
||||||
|
|
||||||
|
# async
|
||||||
|
tokio = { version = "1.47.1", features = ["macros", "rt-multi-thread"] }
|
||||||
|
tokio-util = "0.7.16"
|
||||||
|
futures-util = "0.3.31"
|
||||||
|
|
||||||
|
# authorization
|
||||||
|
bcrypt = "0.17.1"
|
||||||
|
jsonwebtoken = { version = "9.3.1", features = ["use_pem"] }
|
||||||
|
|
||||||
|
# creating users
|
||||||
|
objectid = "0.2.0"
|
||||||
|
|
||||||
|
# schedule downloader
|
||||||
|
reqwest = { version = "0.12.23", features = ["json"] }
|
||||||
|
mime = "0.3.17"
|
||||||
|
|
||||||
|
# error handling
|
||||||
|
sentry = "0.42.0"
|
||||||
|
sentry-actix = "0.42.0"
|
||||||
|
|
||||||
|
# [de]serializing
|
||||||
serde = { version = "1.0.219", features = ["derive"] }
|
serde = { version = "1.0.219", features = ["derive"] }
|
||||||
schedule_parser = { path = "./lib/schedule_parser" }
|
serde_json = "1.0.143"
|
||||||
chrono = "0.4.40"
|
serde_with = "3.14.0"
|
||||||
reqwest = "0.12.15"
|
|
||||||
tokio = { version = "1.44.1", features = ["macros", "rt-multi-thread"] }
|
sha1 = "0.11.0-rc.2"
|
||||||
actix-web = "4.10.2"
|
|
||||||
|
# documentation
|
||||||
|
utoipa = { version = "5.4.0", features = ["actix_extras", "chrono"] }
|
||||||
|
utoipa-rapidoc = { version = "6.0.0", features = ["actix-web"] }
|
||||||
|
utoipa-actix-web = "0.1.2"
|
||||||
|
|
||||||
|
uuid = { version = "1.18.1", features = ["v4"] }
|
||||||
|
hex-literal = "1"
|
||||||
|
log = "0.4.27"
|
||||||
|
|
||||||
|
# telegram webdata deciding and verify
|
||||||
|
base64 = "0.22.1"
|
||||||
|
percent-encoding = "2.3.2"
|
||||||
|
ed25519-dalek = "3.0.0-pre.0"
|
||||||
|
|
||||||
|
# development tracing
|
||||||
|
console-subscriber = { version = "0.4.1", optional = true }
|
||||||
|
tracing = { version = "0.1.41", optional = true }
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
providers = { path = "providers", features = ["test"] }
|
||||||
|
actix-test = { path = "actix-test" }
|
||||||
14
Dockerfile
Normal file
14
Dockerfile
Normal file
@@ -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"]
|
||||||
1
actix-macros/.gitignore
vendored
Normal file
1
actix-macros/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
/target
|
||||||
12
actix-macros/Cargo.toml
Normal file
12
actix-macros/Cargo.toml
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
[package]
|
||||||
|
name = "actix-macros"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2024"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
syn = "2.0.106"
|
||||||
|
quote = "1.0.40"
|
||||||
|
proc-macro2 = "1.0.101"
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
proc-macro = true
|
||||||
172
actix-macros/src/lib.rs
Normal file
172
actix-macros/src/lib.rs
Normal file
@@ -0,0 +1,172 @@
|
|||||||
|
extern crate proc_macro;
|
||||||
|
|
||||||
|
use proc_macro::TokenStream;
|
||||||
|
|
||||||
|
mod shared {
|
||||||
|
use quote::{ToTokens, quote};
|
||||||
|
use syn::{Attribute, DeriveInput};
|
||||||
|
|
||||||
|
pub fn find_status_code(attrs: &Vec<Attribute>) -> Option<proc_macro2::TokenStream> {
|
||||||
|
attrs
|
||||||
|
.iter()
|
||||||
|
.find_map(|attr| -> Option<proc_macro2::TokenStream> {
|
||||||
|
if !attr.path().is_ident("status_code") {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
let meta = attr.meta.require_name_value().ok()?;
|
||||||
|
|
||||||
|
let code = meta.value.to_token_stream().to_string();
|
||||||
|
let trimmed_code = code.trim_matches('"');
|
||||||
|
|
||||||
|
if let Ok(numeric_code) = trimmed_code.parse::<u16>() {
|
||||||
|
Some(quote! { actix_web::http::StatusCode::from_u16(#numeric_code).unwrap() })
|
||||||
|
} else {
|
||||||
|
let string_code: proc_macro2::TokenStream =
|
||||||
|
trimmed_code.to_string().parse().unwrap();
|
||||||
|
|
||||||
|
Some(quote! { #string_code })
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_arms(ast: &DeriveInput) -> Vec<proc_macro2::TokenStream> {
|
||||||
|
let name = &ast.ident;
|
||||||
|
|
||||||
|
let variants = if let syn::Data::Enum(data) = &ast.data {
|
||||||
|
&data.variants
|
||||||
|
} else {
|
||||||
|
panic!("Only enums are supported");
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut status_code_arms: Vec<proc_macro2::TokenStream> = variants
|
||||||
|
.iter()
|
||||||
|
.map(|v| -> Option<proc_macro2::TokenStream> {
|
||||||
|
let status_code = find_status_code(&v.attrs)?;
|
||||||
|
let variant_name = &v.ident;
|
||||||
|
|
||||||
|
Some(quote! { #name::#variant_name => #status_code, })
|
||||||
|
})
|
||||||
|
.filter(|v| v.is_some())
|
||||||
|
.map(|v| v.unwrap())
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
if status_code_arms.len() < variants.len() {
|
||||||
|
let status_code = find_status_code(&ast.attrs)
|
||||||
|
.unwrap_or_else(|| quote! { ::actix_web::http::StatusCode::INTERNAL_SERVER_ERROR });
|
||||||
|
|
||||||
|
status_code_arms.push(quote! { _ => #status_code });
|
||||||
|
}
|
||||||
|
|
||||||
|
status_code_arms
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mod middleware_error {
|
||||||
|
use proc_macro::TokenStream;
|
||||||
|
use quote::quote;
|
||||||
|
|
||||||
|
pub fn fmt(ast: &syn::DeriveInput) -> TokenStream {
|
||||||
|
let name = &ast.ident;
|
||||||
|
|
||||||
|
let status_code_arms = super::shared::get_arms(ast);
|
||||||
|
|
||||||
|
TokenStream::from(quote! {
|
||||||
|
impl ::actix_web::ResponseError for #name {
|
||||||
|
fn status_code(&self) -> ::actix_web::http::StatusCode {
|
||||||
|
match self {
|
||||||
|
#(#status_code_arms)*
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn error_response(&self) -> ::actix_web::HttpResponse<BoxBody> {
|
||||||
|
::actix_web::HttpResponse::build(self.status_code())
|
||||||
|
.json(crate::middlewares::error::MiddlewareError::new(self.clone()))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mod responder_json {
|
||||||
|
use proc_macro::TokenStream;
|
||||||
|
use quote::quote;
|
||||||
|
|
||||||
|
pub fn fmt(ast: &syn::DeriveInput) -> TokenStream {
|
||||||
|
let name = &ast.ident;
|
||||||
|
|
||||||
|
TokenStream::from(quote! {
|
||||||
|
impl ::actix_web::Responder for #name {
|
||||||
|
type Body = ::actix_web::body::EitherBody<::actix_web::body::BoxBody>;
|
||||||
|
|
||||||
|
fn respond_to(self, _: &::actix_web::HttpRequest) -> ::actix_web::HttpResponse<Self::Body> {
|
||||||
|
::actix_web::HttpResponse::Ok()
|
||||||
|
.json(self)
|
||||||
|
.map_into_left_body()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mod ok_response {
|
||||||
|
use proc_macro::TokenStream;
|
||||||
|
use quote::quote;
|
||||||
|
|
||||||
|
pub fn fmt(ast: &syn::DeriveInput) -> TokenStream {
|
||||||
|
let name = &ast.ident;
|
||||||
|
|
||||||
|
TokenStream::from(quote! {
|
||||||
|
impl crate::routes::schema::PartialOkResponse for #name {}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mod err_response {
|
||||||
|
use proc_macro::TokenStream;
|
||||||
|
use quote::quote;
|
||||||
|
|
||||||
|
pub fn fmt(ast: &syn::DeriveInput) -> TokenStream {
|
||||||
|
let name = &ast.ident;
|
||||||
|
|
||||||
|
let status_code_arms = super::shared::get_arms(ast);
|
||||||
|
|
||||||
|
TokenStream::from(quote! {
|
||||||
|
impl crate::routes::schema::PartialErrResponse for #name {
|
||||||
|
fn status_code(&self) -> ::actix_web::http::StatusCode {
|
||||||
|
match self {
|
||||||
|
#(#status_code_arms)*
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[proc_macro_derive(MiddlewareError, attributes(status_code))]
|
||||||
|
pub fn moddleware_error_derive(input: TokenStream) -> TokenStream {
|
||||||
|
let ast = syn::parse(input).unwrap();
|
||||||
|
|
||||||
|
middleware_error::fmt(&ast)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[proc_macro_derive(ResponderJson)]
|
||||||
|
pub fn responser_json_derive(input: TokenStream) -> TokenStream {
|
||||||
|
let ast = syn::parse(input).unwrap();
|
||||||
|
|
||||||
|
responder_json::fmt(&ast)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[proc_macro_derive(OkResponse)]
|
||||||
|
pub fn ok_response_derive(input: TokenStream) -> TokenStream {
|
||||||
|
let ast = syn::parse(input).unwrap();
|
||||||
|
|
||||||
|
ok_response::fmt(&ast)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[proc_macro_derive(ErrResponse, attributes(status_code))]
|
||||||
|
pub fn err_response_derive(input: TokenStream) -> TokenStream {
|
||||||
|
let ast = syn::parse(input).unwrap();
|
||||||
|
|
||||||
|
err_response::fmt(&ast)
|
||||||
|
}
|
||||||
1
actix-test/.gitignore
vendored
Normal file
1
actix-test/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
/target
|
||||||
8
actix-test/Cargo.toml
Normal file
8
actix-test/Cargo.toml
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
[package]
|
||||||
|
name = "actix-test"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2024"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
actix-http = "3.11.1"
|
||||||
|
actix-web = "4.11.0"
|
||||||
12
actix-test/src/lib.rs
Normal file
12
actix-test/src/lib.rs
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
use actix_web::dev::{HttpServiceFactory, Service, ServiceResponse};
|
||||||
|
use actix_web::{App, test, web};
|
||||||
|
|
||||||
|
pub async fn test_app<F, A: 'static>(
|
||||||
|
app_state: web::Data<A>,
|
||||||
|
factory: F,
|
||||||
|
) -> impl Service<actix_http::Request, Response = ServiceResponse, Error = actix_web::Error>
|
||||||
|
where
|
||||||
|
F: HttpServiceFactory + 'static,
|
||||||
|
{
|
||||||
|
test::init_service(App::new().app_data(app_state).service(factory)).await
|
||||||
|
}
|
||||||
11
database/Cargo.toml
Normal file
11
database/Cargo.toml
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
[package]
|
||||||
|
name = "database"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2024"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
migration = { path = "migration" }
|
||||||
|
entity = { path = "entity" }
|
||||||
|
sea-orm = { version = "2.0.0-rc.6", features = ["sqlx-postgres", "runtime-tokio"] }
|
||||||
|
|
||||||
|
paste = "1.0.15"
|
||||||
1
database/entity/.gitignore
vendored
Normal file
1
database/entity/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
/target
|
||||||
9
database/entity/Cargo.toml
Normal file
9
database/entity/Cargo.toml
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
[package]
|
||||||
|
name = "entity"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2024"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
sea-orm = "2.0.0-rc.6"
|
||||||
|
serde = { version = "1.0.219", features = ["derive"] }
|
||||||
|
utoipa = "5.4.0"
|
||||||
6
database/entity/src/lib.rs
Normal file
6
database/entity/src/lib.rs
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
|
||||||
|
|
||||||
|
pub mod prelude;
|
||||||
|
|
||||||
|
pub mod sea_orm_active_enums;
|
||||||
|
pub mod user;
|
||||||
3
database/entity/src/prelude.rs
Normal file
3
database/entity/src/prelude.rs
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
|
||||||
|
|
||||||
|
pub use super::user::Entity as User;
|
||||||
25
database/entity/src/sea_orm_active_enums.rs
Normal file
25
database/entity/src/sea_orm_active_enums.rs
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
|
||||||
|
|
||||||
|
use sea_orm::entity::prelude::*;
|
||||||
|
|
||||||
|
#[derive(
|
||||||
|
Debug,
|
||||||
|
Clone,
|
||||||
|
PartialEq,
|
||||||
|
Eq,
|
||||||
|
EnumIter,
|
||||||
|
DeriveActiveEnum,
|
||||||
|
:: serde :: Serialize,
|
||||||
|
:: serde :: Deserialize,
|
||||||
|
:: utoipa :: ToSchema,
|
||||||
|
)]
|
||||||
|
#[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "user_role")]
|
||||||
|
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
|
||||||
|
pub enum UserRole {
|
||||||
|
#[sea_orm(string_value = "student")]
|
||||||
|
Student,
|
||||||
|
#[sea_orm(string_value = "teacher")]
|
||||||
|
Teacher,
|
||||||
|
#[sea_orm(string_value = "admin")]
|
||||||
|
Admin,
|
||||||
|
}
|
||||||
25
database/entity/src/user.rs
Normal file
25
database/entity/src/user.rs
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
|
||||||
|
|
||||||
|
use super::sea_orm_active_enums::UserRole;
|
||||||
|
use sea_orm::entity::prelude::*;
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
|
||||||
|
#[sea_orm(table_name = "user")]
|
||||||
|
pub struct Model {
|
||||||
|
#[sea_orm(primary_key, auto_increment = false)]
|
||||||
|
pub id: String,
|
||||||
|
#[sea_orm(unique)]
|
||||||
|
pub username: String,
|
||||||
|
pub password: Option<String>,
|
||||||
|
pub vk_id: Option<i32>,
|
||||||
|
pub group: Option<String>,
|
||||||
|
pub role: UserRole,
|
||||||
|
pub android_version: Option<String>,
|
||||||
|
#[sea_orm(unique)]
|
||||||
|
pub telegram_id: Option<i64>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
|
||||||
|
pub enum Relation {}
|
||||||
|
|
||||||
|
impl ActiveModelBehavior for ActiveModel {}
|
||||||
1
database/migration/.gitignore
vendored
Normal file
1
database/migration/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
/target
|
||||||
22
database/migration/Cargo.toml
Normal file
22
database/migration/Cargo.toml
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
[package]
|
||||||
|
name = "migration"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2021"
|
||||||
|
publish = false
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
name = "migration"
|
||||||
|
path = "src/lib.rs"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
async-std = { version = "1", features = ["attributes", "tokio1"] }
|
||||||
|
|
||||||
|
[dependencies.sea-orm-migration]
|
||||||
|
version = "2.0.0-rc.6"
|
||||||
|
features = [
|
||||||
|
# Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI.
|
||||||
|
# View the list of supported features at https://www.sea-ql.org/SeaORM/docs/install-and-config/database-and-async-runtime.
|
||||||
|
# e.g.
|
||||||
|
"runtime-tokio", # `ASYNC_RUNTIME` feature
|
||||||
|
"sqlx-postgres", # `DATABASE_DRIVER` feature
|
||||||
|
]
|
||||||
16
database/migration/src/lib.rs
Normal file
16
database/migration/src/lib.rs
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
pub use sea_orm_migration::prelude::MigratorTrait;
|
||||||
|
|
||||||
|
use sea_orm_migration::prelude::*;
|
||||||
|
|
||||||
|
mod m20250904_024854_init;
|
||||||
|
|
||||||
|
pub struct Migrator;
|
||||||
|
|
||||||
|
#[async_trait::async_trait]
|
||||||
|
impl MigratorTrait for Migrator {
|
||||||
|
fn migrations() -> Vec<Box<dyn MigrationTrait>> {
|
||||||
|
vec![
|
||||||
|
Box::new(m20250904_024854_init::Migration),
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
70
database/migration/src/m20250904_024854_init.rs
Normal file
70
database/migration/src/m20250904_024854_init.rs
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
use sea_orm_migration::prelude::extension::postgres::Type;
|
||||||
|
use sea_orm_migration::sea_orm::{EnumIter, Iterable};
|
||||||
|
use sea_orm_migration::{prelude::*, schema::*};
|
||||||
|
|
||||||
|
#[derive(DeriveMigrationName)]
|
||||||
|
pub struct Migration;
|
||||||
|
|
||||||
|
#[async_trait::async_trait]
|
||||||
|
impl MigrationTrait for Migration {
|
||||||
|
async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
||||||
|
manager
|
||||||
|
.create_type(
|
||||||
|
Type::create()
|
||||||
|
.as_enum(UserRole)
|
||||||
|
.values(UserRoleVariants::iter())
|
||||||
|
.to_owned(),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
manager
|
||||||
|
.create_table(
|
||||||
|
Table::create()
|
||||||
|
.table(User::Table)
|
||||||
|
.if_not_exists()
|
||||||
|
.col(string_uniq(User::Id).primary_key().not_null())
|
||||||
|
.col(string_uniq(User::Username).not_null())
|
||||||
|
.col(string_null(User::Password))
|
||||||
|
.col(integer_null(User::VkId))
|
||||||
|
.col(string_null(User::Group))
|
||||||
|
.col(enumeration(User::Role, UserRole, UserRoleVariants::iter()))
|
||||||
|
.col(string_null(User::AndroidVersion))
|
||||||
|
.col(big_integer_null(User::TelegramId).unique_key())
|
||||||
|
.to_owned(),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
||||||
|
manager
|
||||||
|
.drop_table(Table::drop().table(User::Table).to_owned())
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
manager
|
||||||
|
.drop_type(Type::drop().name(UserRole).to_owned())
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(DeriveIden)]
|
||||||
|
struct UserRole;
|
||||||
|
|
||||||
|
#[derive(DeriveIden, EnumIter)]
|
||||||
|
enum UserRoleVariants {
|
||||||
|
Student,
|
||||||
|
Teacher,
|
||||||
|
Admin,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(DeriveIden)]
|
||||||
|
enum User {
|
||||||
|
Table,
|
||||||
|
Id,
|
||||||
|
Username,
|
||||||
|
Password,
|
||||||
|
VkId,
|
||||||
|
Group,
|
||||||
|
Role,
|
||||||
|
AndroidVersion,
|
||||||
|
TelegramId,
|
||||||
|
}
|
||||||
6
database/migration/src/main.rs
Normal file
6
database/migration/src/main.rs
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
use sea_orm_migration::prelude::*;
|
||||||
|
|
||||||
|
#[async_std::main]
|
||||||
|
async fn main() {
|
||||||
|
cli::run_cli(migration::Migrator).await;
|
||||||
|
}
|
||||||
10
database/src/lib.rs
Normal file
10
database/src/lib.rs
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
pub mod query;
|
||||||
|
|
||||||
|
pub use migration;
|
||||||
|
pub use sea_orm;
|
||||||
|
|
||||||
|
pub mod entity {
|
||||||
|
pub use entity::*;
|
||||||
|
|
||||||
|
pub use entity::user::{ActiveModel as ActiveUser, Model as User, Entity as UserEntity, Column as UserColumn};
|
||||||
|
}
|
||||||
62
database/src/query.rs
Normal file
62
database/src/query.rs
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
use paste::paste;
|
||||||
|
use sea_orm::ColumnTrait;
|
||||||
|
use sea_orm::EntityTrait;
|
||||||
|
use sea_orm::QueryFilter;
|
||||||
|
|
||||||
|
pub struct Query;
|
||||||
|
|
||||||
|
macro_rules! ref_type {
|
||||||
|
(String) => {
|
||||||
|
&String
|
||||||
|
};
|
||||||
|
(str) => {
|
||||||
|
&str
|
||||||
|
};
|
||||||
|
($other:ty) => {
|
||||||
|
$other
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
macro_rules! define_is_exists {
|
||||||
|
($entity: ident, $by: ident, $by_type: ident, $by_column: ident) => {
|
||||||
|
paste! {
|
||||||
|
pub async fn [<is_ $entity _exists_by_ $by>](
|
||||||
|
db: &::sea_orm::DbConn,
|
||||||
|
$by: ref_type!($by_type)
|
||||||
|
) -> Result<bool, ::sea_orm::DbErr> {
|
||||||
|
::entity::$entity::Entity::find()
|
||||||
|
.filter(::entity::$entity::Column::$by_column.eq($by))
|
||||||
|
.one(db)
|
||||||
|
.await
|
||||||
|
.map(|x| x.is_some())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
macro_rules! define_find_by {
|
||||||
|
($entity: ident, $by: ident, $by_type: ident, $by_column: ident) => {
|
||||||
|
paste! {
|
||||||
|
pub async fn [<find_ $entity _by_ $by>](
|
||||||
|
db: &::sea_orm::DbConn,
|
||||||
|
$by: ref_type!($by_type)
|
||||||
|
) -> Result<Option<::entity::$entity::Model>, ::sea_orm::DbErr> {
|
||||||
|
::entity::$entity::Entity::find()
|
||||||
|
.filter(::entity::$entity::Column::$by_column.eq($by))
|
||||||
|
.one(db)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Query {
|
||||||
|
define_find_by!(user, id, str, Id);
|
||||||
|
define_find_by!(user, telegram_id, i64, TelegramId);
|
||||||
|
define_find_by!(user, vk_id, i32, VkId);
|
||||||
|
define_find_by!(user, username, str, Username);
|
||||||
|
|
||||||
|
define_is_exists!(user, id, str, Id);
|
||||||
|
define_is_exists!(user, username, str, Username);
|
||||||
|
define_is_exists!(user, telegram_id, i64, TelegramId);
|
||||||
|
}
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
# For documentation on how to configure this file,
|
|
||||||
# see https://diesel.rs/guides/configuring-diesel-cli
|
|
||||||
|
|
||||||
[print_schema]
|
|
||||||
file = "src/database/schema.rs"
|
|
||||||
custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
|
|
||||||
|
|
||||||
[migrations_directory]
|
|
||||||
dir = "./migrations"
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "schedule_parser"
|
|
||||||
version = "0.2.0"
|
|
||||||
edition = "2024"
|
|
||||||
|
|
||||||
[lib]
|
|
||||||
name = "schedule_parser"
|
|
||||||
path = "src/lib/lib.rs"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
serde = { version = "1.0.219", features = ["derive"] }
|
|
||||||
serde_repr = "0.1.20"
|
|
||||||
chrono = { version = "0.4.40", features = ["serde"] }
|
|
||||||
calamine = "0.26.1"
|
|
||||||
regex = "1.11.1"
|
|
||||||
fuzzy-matcher = "0.3.7"
|
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
criterion = "0.5.1"
|
|
||||||
|
|
||||||
[[bench]]
|
|
||||||
name = "parse"
|
|
||||||
harness = false
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
use criterion::{Criterion, criterion_group, criterion_main};
|
|
||||||
use schedule_parser::parse_xls;
|
|
||||||
|
|
||||||
pub fn bench_parse_xls(c: &mut Criterion) {
|
|
||||||
let buffer: Vec<u8> = include_bytes!("../../../schedule.xls").to_vec();
|
|
||||||
|
|
||||||
c.bench_function("parse_xls", |b| b.iter(|| parse_xls(&buffer)));
|
|
||||||
}
|
|
||||||
|
|
||||||
criterion_group!(benches, bench_parse_xls);
|
|
||||||
criterion_main!(benches);
|
|
||||||
@@ -1,704 +0,0 @@
|
|||||||
use crate::schema::LessonType::Break;
|
|
||||||
use crate::schema::{Day, Lesson, LessonSubGroup, LessonTime, LessonType, ScheduleEntity};
|
|
||||||
use crate::LessonParseResult::{Lessons, Street};
|
|
||||||
use calamine::{open_workbook_from_rs, Reader, Xls};
|
|
||||||
use chrono::{Duration, NaiveDateTime};
|
|
||||||
use fuzzy_matcher::skim::SkimMatcherV2;
|
|
||||||
use fuzzy_matcher::FuzzyMatcher;
|
|
||||||
use regex::Regex;
|
|
||||||
use std::collections::HashMap;
|
|
||||||
use std::io::Cursor;
|
|
||||||
use std::sync::LazyLock;
|
|
||||||
|
|
||||||
pub mod schema;
|
|
||||||
|
|
||||||
struct InternalId {
|
|
||||||
/**
|
|
||||||
* Индекс строки
|
|
||||||
*/
|
|
||||||
row: u32,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Индекс столбца
|
|
||||||
*/
|
|
||||||
column: u32,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Текст в ячейке
|
|
||||||
*/
|
|
||||||
name: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
struct InternalTime {
|
|
||||||
/**
|
|
||||||
* Временной отрезок проведения пары
|
|
||||||
*/
|
|
||||||
time_range: LessonTime,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Тип пары
|
|
||||||
*/
|
|
||||||
lesson_type: LessonType,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Индекс пары
|
|
||||||
*/
|
|
||||||
default_index: Option<u32>,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Рамка ячейки
|
|
||||||
*/
|
|
||||||
xls_range: ((u32, u32), (u32, u32)),
|
|
||||||
}
|
|
||||||
|
|
||||||
type WorkSheet = calamine::Range<calamine::Data>;
|
|
||||||
|
|
||||||
fn get_string_from_cell(worksheet: &WorkSheet, row: u32, col: u32) -> Option<String> {
|
|
||||||
let cell_data = if let Some(data) = worksheet.get((row as usize, col as usize)) {
|
|
||||||
data.to_string()
|
|
||||||
} else {
|
|
||||||
return None;
|
|
||||||
};
|
|
||||||
|
|
||||||
if cell_data.trim().is_empty() {
|
|
||||||
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());
|
|
||||||
|
|
||||||
let trimmed_data = SP_RE
|
|
||||||
.replace_all(&NL_RE.replace_all(&cell_data, " "), " ")
|
|
||||||
.trim()
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
if trimmed_data.is_empty() {
|
|
||||||
None
|
|
||||||
} else {
|
|
||||||
Some(trimmed_data)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
};
|
|
||||||
|
|
||||||
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))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_skeleton(worksheet: &WorkSheet) -> (Vec<InternalId>, Vec<InternalId>) {
|
|
||||||
let range = &worksheet;
|
|
||||||
|
|
||||||
let mut is_parsed = false;
|
|
||||||
|
|
||||||
let mut groups: Vec<InternalId> = Vec::new();
|
|
||||||
let mut days: Vec<InternalId> = Vec::new();
|
|
||||||
|
|
||||||
let start = range.start().expect("Could not find start");
|
|
||||||
let end = range.end().expect("Could not find end");
|
|
||||||
|
|
||||||
let mut row = start.0;
|
|
||||||
while row < 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;
|
|
||||||
|
|
||||||
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,
|
|
||||||
column,
|
|
||||||
name: group_name.unwrap(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
row += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
days.push(InternalId {
|
|
||||||
row,
|
|
||||||
column: 0,
|
|
||||||
name: day_name.clone(),
|
|
||||||
});
|
|
||||||
|
|
||||||
if days.len() > 2 && day_name.starts_with("Суббота") {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
(days, groups)
|
|
||||||
}
|
|
||||||
|
|
||||||
enum LessonParseResult {
|
|
||||||
Lessons(Vec<Lesson>),
|
|
||||||
Street(String),
|
|
||||||
}
|
|
||||||
|
|
||||||
trait StringInnerSlice {
|
|
||||||
fn inner_slice(&self, from: usize, to: usize) -> Self;
|
|
||||||
}
|
|
||||||
|
|
||||||
impl StringInnerSlice for String {
|
|
||||||
fn inner_slice(&self, from: usize, to: usize) -> Self {
|
|
||||||
self.chars()
|
|
||||||
.take(from)
|
|
||||||
.chain(self.chars().skip(to))
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn guess_lesson_type(name: &String) -> Option<(String, LessonType)> {
|
|
||||||
let map: HashMap<String, LessonType> = HashMap::from([
|
|
||||||
("(консультация)".to_string(), LessonType::Consultation),
|
|
||||||
(
|
|
||||||
"самостоятельная работа".to_string(),
|
|
||||||
LessonType::IndependentWork,
|
|
||||||
),
|
|
||||||
("зачет".to_string(), LessonType::Exam),
|
|
||||||
("зачет с оценкой".to_string(), LessonType::ExamWithGrade),
|
|
||||||
("экзамен".to_string(), LessonType::ExamDefault),
|
|
||||||
]);
|
|
||||||
|
|
||||||
let matcher = SkimMatcherV2::default();
|
|
||||||
let name_lower = name.to_lowercase();
|
|
||||||
|
|
||||||
type SearchResult<'a> = (&'a LessonType, i64, Vec<usize>);
|
|
||||||
|
|
||||||
let mut search_results: Vec<SearchResult> = map
|
|
||||||
.iter()
|
|
||||||
.map(|entry| -> SearchResult {
|
|
||||||
if let Some((score, indices)) = matcher.fuzzy_indices(&*name_lower, entry.0) {
|
|
||||||
return (entry.1, score, indices);
|
|
||||||
}
|
|
||||||
|
|
||||||
(entry.1, 0, Vec::new())
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
search_results.sort_by(|a, b| b.1.cmp(&a.1));
|
|
||||||
|
|
||||||
let guessed_type = search_results.first().unwrap();
|
|
||||||
|
|
||||||
if guessed_type.1 > 80 {
|
|
||||||
Some((
|
|
||||||
name.inner_slice(guessed_type.2[0], guessed_type.2[guessed_type.2.len() - 1]),
|
|
||||||
guessed_type.0.clone(),
|
|
||||||
))
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_lesson(
|
|
||||||
worksheet: &WorkSheet,
|
|
||||||
day: &mut Day,
|
|
||||||
day_times: &Vec<InternalTime>,
|
|
||||||
time: &InternalTime,
|
|
||||||
column: u32,
|
|
||||||
) -> LessonParseResult {
|
|
||||||
let row = time.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 Lessons(Vec::new());
|
|
||||||
}
|
|
||||||
|
|
||||||
let raw_name = raw_name_opt.unwrap();
|
|
||||||
|
|
||||||
static OTHER_STREET_RE: LazyLock<Regex, fn() -> Regex> =
|
|
||||||
LazyLock::new(|| Regex::new(r"^[А-Я][а-я]+,?\s?[0-9]+$").unwrap());
|
|
||||||
|
|
||||||
if OTHER_STREET_RE.is_match(&raw_name) {
|
|
||||||
return Street(raw_name);
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(guess) = guess_lesson_type(&raw_name) {
|
|
||||||
guess
|
|
||||||
} else {
|
|
||||||
(raw_name, time.lesson_type.clone())
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let (default_range, lesson_time): (Option<[u8; 2]>, LessonTime) = {
|
|
||||||
// check if multi-lesson
|
|
||||||
let cell_range = get_merge_from_start(worksheet, row, column);
|
|
||||||
|
|
||||||
let end_time_arr = day_times
|
|
||||||
.iter()
|
|
||||||
.filter(|time| time.xls_range.1.0 == cell_range.1.0)
|
|
||||||
.collect::<Vec<&InternalTime>>();
|
|
||||||
|
|
||||||
let end_time = end_time_arr.first().expect("Unable to find lesson time!");
|
|
||||||
|
|
||||||
let range: Option<[u8; 2]> = if time.default_index != None {
|
|
||||||
let default = time.default_index.unwrap() as u8;
|
|
||||||
Some([default, end_time.default_index.unwrap() as u8])
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
};
|
|
||||||
|
|
||||||
let time = LessonTime {
|
|
||||||
start: time.time_range.start,
|
|
||||||
end: end_time.time_range.end,
|
|
||||||
};
|
|
||||||
|
|
||||||
(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())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Если количество кабинетов совпадает с количеством подгрупп, назначаем кабинеты по порядку
|
|
||||||
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());
|
|
||||||
}
|
|
||||||
|
|
||||||
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 {
|
|
||||||
lesson_type,
|
|
||||||
default_range,
|
|
||||||
name: Some(name),
|
|
||||||
time: lesson_time,
|
|
||||||
subgroups: Some(subgroups),
|
|
||||||
group: None,
|
|
||||||
};
|
|
||||||
|
|
||||||
let prev_lesson = if day.lessons.len() == 0 {
|
|
||||||
return Lessons(Vec::from([lesson]));
|
|
||||||
} else {
|
|
||||||
&day.lessons[day.lessons.len() - 1]
|
|
||||||
};
|
|
||||||
|
|
||||||
Lessons(Vec::from([
|
|
||||||
Lesson {
|
|
||||||
lesson_type: Break,
|
|
||||||
default_range: None,
|
|
||||||
name: None,
|
|
||||||
time: LessonTime {
|
|
||||||
start: prev_lesson.time.end,
|
|
||||||
end: lesson.time.start,
|
|
||||||
},
|
|
||||||
subgroups: Some(Vec::new()),
|
|
||||||
group: None,
|
|
||||||
},
|
|
||||||
lesson,
|
|
||||||
]))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_cabinets(worksheet: &WorkSheet, row: u32, column: u32) -> Vec<String> {
|
|
||||||
let mut cabinets: Vec<String> = Vec::new();
|
|
||||||
|
|
||||||
if let Some(raw) = get_string_from_cell(&worksheet, row, column) {
|
|
||||||
let clean = raw.replace("\n", " ");
|
|
||||||
let parts: Vec<&str> = clean.split(" ").collect();
|
|
||||||
|
|
||||||
for part in parts {
|
|
||||||
let clean_part = part.to_string().trim().to_string();
|
|
||||||
|
|
||||||
cabinets.push(clean_part);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cabinets
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_name_and_subgroups(name: &String) -> (String, Vec<LessonSubGroup>) {
|
|
||||||
static LESSON_RE: LazyLock<Regex, fn() -> Regex> =
|
|
||||||
LazyLock::new(|| Regex::new(r"(?:[А-Я][а-я]+[А-Я]{2}(?:\([0-9][а-я]+\))?)+$").unwrap());
|
|
||||||
static TEACHER_RE: LazyLock<Regex, fn() -> Regex> =
|
|
||||||
LazyLock::new(|| Regex::new(r"([А-Я][а-я]+)([А-Я])([А-Я])(?:\(([0-9])[а-я]+\))?").unwrap());
|
|
||||||
static CLEAN_RE: LazyLock<Regex, fn() -> Regex> =
|
|
||||||
LazyLock::new(|| Regex::new(r"[\s.,]+").unwrap());
|
|
||||||
static NAME_CLEAN_RE: LazyLock<Regex, fn() -> Regex> =
|
|
||||||
LazyLock::new(|| Regex::new(r"\.\s+$").unwrap());
|
|
||||||
|
|
||||||
let (teachers, lesson_name) = {
|
|
||||||
let clean_name = CLEAN_RE.replace_all(&name, "").to_string();
|
|
||||||
|
|
||||||
if let Some(captures) = LESSON_RE.captures(&clean_name) {
|
|
||||||
let capture = captures.get(0).unwrap();
|
|
||||||
let capture_str = capture.as_str().to_string();
|
|
||||||
let capture_name: String = capture_str.chars().take(5).collect();
|
|
||||||
|
|
||||||
(
|
|
||||||
NAME_CLEAN_RE.replace(&capture_str, "").to_string(),
|
|
||||||
name[0..name.find(&*capture_name).unwrap()].to_string(),
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
return (NAME_CLEAN_RE.replace(&name, "").to_string(), Vec::new());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut subgroups: Vec<LessonSubGroup> = Vec::new();
|
|
||||||
|
|
||||||
let teacher_it = TEACHER_RE.captures_iter(&teachers);
|
|
||||||
|
|
||||||
for captures in teacher_it {
|
|
||||||
subgroups.push(LessonSubGroup {
|
|
||||||
number: if let Some(capture) = captures.get(4) {
|
|
||||||
capture
|
|
||||||
.as_str()
|
|
||||||
.to_string()
|
|
||||||
.parse::<u8>()
|
|
||||||
.expect("Unable to read subgroup index!")
|
|
||||||
} else {
|
|
||||||
0
|
|
||||||
},
|
|
||||||
cabinet: None,
|
|
||||||
teacher: format!(
|
|
||||||
"{} {}.{}.",
|
|
||||||
captures.get(1).unwrap().as_str().to_string(),
|
|
||||||
captures.get(2).unwrap().as_str().to_string(),
|
|
||||||
captures.get(3).unwrap().as_str().to_string()
|
|
||||||
),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// фикс, если у кого-то отсутствует индекс подгруппы
|
|
||||||
|
|
||||||
if subgroups.len() == 1 {
|
|
||||||
let index = subgroups[0].number;
|
|
||||||
|
|
||||||
if index == 0 {
|
|
||||||
subgroups[0].number = 1u8;
|
|
||||||
} else {
|
|
||||||
subgroups.push(LessonSubGroup {
|
|
||||||
number: if index == 1 { 2 } else { 1 },
|
|
||||||
cabinet: None,
|
|
||||||
teacher: "Только у другой".to_string(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} else if subgroups.len() == 2 {
|
|
||||||
// если индексы отсутствуют у обоих, ставим поочерёдно
|
|
||||||
if subgroups[0].number == 0 && subgroups[1].number == 0 {
|
|
||||||
subgroups[0].number = 1;
|
|
||||||
subgroups[1].number = 2;
|
|
||||||
}
|
|
||||||
// если индекс отсутствует у первого, ставим 2, если у второго индекс 1 и наоборот
|
|
||||||
else if subgroups[0].number == 0 {
|
|
||||||
subgroups[0].number = if subgroups[1].number == 1 { 2 } else { 1 };
|
|
||||||
}
|
|
||||||
// если индекс отсутствует у второго, ставим 2, если у первого индекс 1 и наоборот
|
|
||||||
else if subgroups[1].number == 0 {
|
|
||||||
subgroups[1].number = if subgroups[0].number == 1 { 2 } else { 1 };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if subgroups.len() == 2 && subgroups[0].number == 2 && subgroups[1].number == 1 {
|
|
||||||
subgroups.reverse()
|
|
||||||
}
|
|
||||||
|
|
||||||
(lesson_name, subgroups)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn convert_groups_to_teachers(
|
|
||||||
groups: &HashMap<String, ScheduleEntity>,
|
|
||||||
) -> HashMap<String, ScheduleEntity> {
|
|
||||||
let mut teachers: HashMap<String, ScheduleEntity> = HashMap::new();
|
|
||||||
|
|
||||||
let empty_days: Vec<Day> = groups
|
|
||||||
.values()
|
|
||||||
.next()
|
|
||||||
.unwrap()
|
|
||||||
.days
|
|
||||||
.iter()
|
|
||||||
.map(|day| Day {
|
|
||||||
name: day.name.clone(),
|
|
||||||
street: day.street.clone(),
|
|
||||||
date: day.date.clone(),
|
|
||||||
lessons: vec![],
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
for group in groups.values() {
|
|
||||||
for (index, day) in group.days.iter().enumerate() {
|
|
||||||
for group_lesson in &day.lessons {
|
|
||||||
if group_lesson.lesson_type == Break {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if group_lesson.subgroups.is_none() {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
let subgroups = group_lesson.subgroups.as_ref().unwrap();
|
|
||||||
|
|
||||||
for subgroup in subgroups {
|
|
||||||
if subgroup.teacher == "Ошибка в расписании" {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if !teachers.contains_key(&subgroup.teacher) {
|
|
||||||
teachers.insert(
|
|
||||||
subgroup.teacher.clone(),
|
|
||||||
ScheduleEntity {
|
|
||||||
name: subgroup.teacher.clone(),
|
|
||||||
days: empty_days.to_vec(),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
let teacher_day = teachers
|
|
||||||
.get_mut(&subgroup.teacher)
|
|
||||||
.unwrap()
|
|
||||||
.days
|
|
||||||
.get_mut(index)
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
teacher_day.lessons.push({
|
|
||||||
let mut lesson = group_lesson.clone();
|
|
||||||
lesson.group = Some(group.name.clone());
|
|
||||||
|
|
||||||
lesson
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
teachers
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn parse_xls(
|
|
||||||
buffer: &Vec<u8>,
|
|
||||||
) -> (
|
|
||||||
HashMap<String, ScheduleEntity>,
|
|
||||||
HashMap<String, ScheduleEntity>,
|
|
||||||
) {
|
|
||||||
let cursor = Cursor::new(&buffer);
|
|
||||||
let mut workbook: Xls<_> = open_workbook_from_rs(cursor).expect("Can't open workbook");
|
|
||||||
|
|
||||||
let worksheet: WorkSheet = workbook
|
|
||||||
.worksheets()
|
|
||||||
.first()
|
|
||||||
.expect("No worksheet found")
|
|
||||||
.1
|
|
||||||
.to_owned();
|
|
||||||
|
|
||||||
let (days_markup, groups_markup) = parse_skeleton(&worksheet);
|
|
||||||
|
|
||||||
let mut groups: HashMap<String, ScheduleEntity> = 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 = ScheduleEntity {
|
|
||||||
name: group_markup.name,
|
|
||||||
days: Vec::new(),
|
|
||||||
};
|
|
||||||
|
|
||||||
for day_index in 0..(&days_markup).len() {
|
|
||||||
let day_markup = &days_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 lesson_time_column = days_markup[0].column + 1;
|
|
||||||
|
|
||||||
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)
|
|
||||||
.expect("Unable to obtain lesson start and end!");
|
|
||||||
|
|
||||||
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();
|
|
||||||
|
|
||||||
LessonTime {
|
|
||||||
start: day.date.clone()
|
|
||||||
+ Duration::hours(start_parts[0].parse().unwrap())
|
|
||||||
+ Duration::minutes(start_parts[1].parse().unwrap()),
|
|
||||||
end: day.date.clone()
|
|
||||||
+ Duration::hours(end_parts[0].parse().unwrap())
|
|
||||||
+ Duration::minutes(end_parts[1].parse().unwrap()),
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
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 {
|
|
||||||
match &mut parse_lesson(
|
|
||||||
&worksheet,
|
|
||||||
&mut day,
|
|
||||||
&day_times,
|
|
||||||
&time,
|
|
||||||
group_markup.column,
|
|
||||||
) {
|
|
||||||
Lessons(l) => day.lessons.append(l),
|
|
||||||
Street(s) => day.street = Some(s.to_owned()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
group.days.push(day);
|
|
||||||
}
|
|
||||||
|
|
||||||
groups.insert(group.name.clone(), group);
|
|
||||||
}
|
|
||||||
|
|
||||||
(convert_groups_to_teachers(&groups), groups)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn read() {
|
|
||||||
let buffer: Vec<u8> = include_bytes!("../../../../schedule.xls").to_vec();
|
|
||||||
let result = parse_xls(&buffer);
|
|
||||||
|
|
||||||
assert_ne!(result.0.len(), 0);
|
|
||||||
assert_ne!(result.1.len(), 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,107 +0,0 @@
|
|||||||
use chrono::{DateTime, Utc};
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
use serde_repr::{Deserialize_repr, Serialize_repr};
|
|
||||||
use std::collections::HashMap;
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
|
||||||
pub struct LessonTime {
|
|
||||||
pub start: DateTime<Utc>,
|
|
||||||
pub end: DateTime<Utc>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize_repr, Deserialize_repr, Debug, PartialEq, Clone)]
|
|
||||||
#[repr(u8)]
|
|
||||||
pub enum LessonType {
|
|
||||||
Default = 0, // Обычная
|
|
||||||
Additional, // Допы
|
|
||||||
Break, // Перемена
|
|
||||||
Consultation, // Консультация
|
|
||||||
IndependentWork, // Самостоятельная работа
|
|
||||||
Exam, // Зачёт
|
|
||||||
ExamWithGrade, // Зачет с оценкой
|
|
||||||
ExamDefault, // Экзамен
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
|
||||||
pub struct LessonSubGroup {
|
|
||||||
pub number: u8,
|
|
||||||
|
|
||||||
pub cabinet: Option<String>,
|
|
||||||
|
|
||||||
pub teacher: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
|
||||||
pub struct Lesson {
|
|
||||||
/**
|
|
||||||
* Тип занятия
|
|
||||||
*/
|
|
||||||
#[serde(rename = "type")]
|
|
||||||
pub lesson_type: LessonType,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Индексы пар, если присутствуют
|
|
||||||
*/
|
|
||||||
#[serde(rename = "defaultRange")]
|
|
||||||
pub default_range: Option<[u8; 2]>,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Название занятия
|
|
||||||
*/
|
|
||||||
pub name: Option<String>,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Начало и конец занятия
|
|
||||||
*/
|
|
||||||
pub time: LessonTime,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Подгруппы
|
|
||||||
*/
|
|
||||||
#[serde(rename = "subGroups")]
|
|
||||||
pub subgroups: Option<Vec<LessonSubGroup>>,
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Группа (только для расписания преподавателей)
|
|
||||||
*/
|
|
||||||
pub group: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
|
||||||
pub struct Day {
|
|
||||||
pub name: String,
|
|
||||||
|
|
||||||
pub street: Option<String>,
|
|
||||||
|
|
||||||
pub date: DateTime<Utc>,
|
|
||||||
|
|
||||||
pub lessons: Vec<Lesson>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug)]
|
|
||||||
pub struct ScheduleEntity {
|
|
||||||
pub name: String,
|
|
||||||
|
|
||||||
pub days: Vec<Day>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug)]
|
|
||||||
pub struct Schedule {
|
|
||||||
#[serde(rename = "updatedAt")]
|
|
||||||
pub updated_at: DateTime<Utc>,
|
|
||||||
|
|
||||||
pub groups: HashMap<String, ScheduleEntity>,
|
|
||||||
|
|
||||||
#[serde(rename = "updatedGroups")]
|
|
||||||
pub updated_groups: Vec<Vec<usize>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug)]
|
|
||||||
pub struct TeacherSchedule {
|
|
||||||
#[serde(rename = "updatedAt")]
|
|
||||||
pub updated_at: DateTime<Utc>,
|
|
||||||
|
|
||||||
pub teacher: ScheduleEntity,
|
|
||||||
|
|
||||||
pub updated: Vec<usize>,
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
-- This file was automatically created by Diesel to setup helper functions
|
|
||||||
-- and other internal bookkeeping. This file is safe to edit, any future
|
|
||||||
-- changes will be added to existing projects as new migrations.
|
|
||||||
|
|
||||||
DROP FUNCTION IF EXISTS diesel_manage_updated_at(_tbl regclass);
|
|
||||||
DROP FUNCTION IF EXISTS diesel_set_updated_at();
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
-- This file was automatically created by Diesel to setup helper functions
|
|
||||||
-- and other internal bookkeeping. This file is safe to edit, any future
|
|
||||||
-- changes will be added to existing projects as new migrations.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-- Sets up a trigger for the given table to automatically set a column called
|
|
||||||
-- `updated_at` whenever the row is modified (unless `updated_at` was included
|
|
||||||
-- in the modified columns)
|
|
||||||
--
|
|
||||||
-- # Example
|
|
||||||
--
|
|
||||||
-- ```sql
|
|
||||||
-- CREATE TABLE users (id SERIAL PRIMARY KEY, updated_at TIMESTAMP NOT NULL DEFAULT NOW());
|
|
||||||
--
|
|
||||||
-- SELECT diesel_manage_updated_at('users');
|
|
||||||
-- ```
|
|
||||||
CREATE OR REPLACE FUNCTION diesel_manage_updated_at(_tbl regclass) RETURNS VOID AS $$
|
|
||||||
BEGIN
|
|
||||||
EXECUTE format('CREATE TRIGGER set_updated_at BEFORE UPDATE ON %s
|
|
||||||
FOR EACH ROW EXECUTE PROCEDURE diesel_set_updated_at()', _tbl);
|
|
||||||
END;
|
|
||||||
$$ LANGUAGE plpgsql;
|
|
||||||
|
|
||||||
CREATE OR REPLACE FUNCTION diesel_set_updated_at() RETURNS trigger AS $$
|
|
||||||
BEGIN
|
|
||||||
IF (
|
|
||||||
NEW IS DISTINCT FROM OLD AND
|
|
||||||
NEW.updated_at IS NOT DISTINCT FROM OLD.updated_at
|
|
||||||
) THEN
|
|
||||||
NEW.updated_at := current_timestamp;
|
|
||||||
END IF;
|
|
||||||
RETURN NEW;
|
|
||||||
END;
|
|
||||||
$$ LANGUAGE plpgsql;
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
DROP TYPE user_role;
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
CREATE TYPE user_role AS ENUM (
|
|
||||||
'STUDENT',
|
|
||||||
'TEACHER',
|
|
||||||
'ADMIN');
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
DROP TABLE users;
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
CREATE TABLE users
|
|
||||||
(
|
|
||||||
id text PRIMARY KEY NOT NULL,
|
|
||||||
username text UNIQUE NOT NULL,
|
|
||||||
"password" text NOT NULL,
|
|
||||||
vk_id int4 NULL,
|
|
||||||
access_token text UNIQUE NOT NULL,
|
|
||||||
"group" text NOT NULL,
|
|
||||||
role user_role NOT NULL,
|
|
||||||
version text NOT NULL
|
|
||||||
);
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
DROP TABLE fcm;
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
CREATE TABLE fcm
|
|
||||||
(
|
|
||||||
user_id text PRIMARY KEY NOT NULL,
|
|
||||||
token text NOT NULL,
|
|
||||||
topics text[] NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE UNIQUE INDEX fcm_user_id_key ON fcm USING btree (user_id);
|
|
||||||
|
|
||||||
ALTER TABLE fcm
|
|
||||||
ADD CONSTRAINT fcm_user_id_fkey FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE RESTRICT ON UPDATE CASCADE;
|
|
||||||
12
providers/Cargo.toml
Normal file
12
providers/Cargo.toml
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
[package]
|
||||||
|
name = "providers"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2024"
|
||||||
|
|
||||||
|
[features]
|
||||||
|
test = ["provider-engels-polytechnic/test"]
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
base = { path = "base" }
|
||||||
|
|
||||||
|
provider-engels-polytechnic = { path = "provider-engels-polytechnic" }
|
||||||
17
providers/base/Cargo.toml
Normal file
17
providers/base/Cargo.toml
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
[package]
|
||||||
|
name = "base"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2024"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
tokio-util = "0.7.16"
|
||||||
|
async-trait = "0.1.89"
|
||||||
|
|
||||||
|
chrono = { version = "0.4.41", features = ["serde"] }
|
||||||
|
|
||||||
|
serde = { version = "1.0.219", features = ["derive"] }
|
||||||
|
serde_repr = "0.1.20"
|
||||||
|
|
||||||
|
utoipa = { version = "5.4.0", features = ["macros", "chrono"] }
|
||||||
|
|
||||||
|
sha1 = "0.11.0-rc.2"
|
||||||
53
providers/base/src/hasher.rs
Normal file
53
providers/base/src/hasher.rs
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
use sha1::Digest;
|
||||||
|
use sha1::digest::OutputSizeUser;
|
||||||
|
use sha1::digest::typenum::Unsigned;
|
||||||
|
use std::hash::Hasher;
|
||||||
|
|
||||||
|
/// Hesher returning hash from the algorithm implementing Digest
|
||||||
|
pub struct DigestHasher<D: Digest> {
|
||||||
|
digest: D,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<D> DigestHasher<D>
|
||||||
|
where
|
||||||
|
D: Digest,
|
||||||
|
{
|
||||||
|
/// Obtain hash.
|
||||||
|
pub fn finalize(self) -> String {
|
||||||
|
static ALPHABET: [char; 16] = [
|
||||||
|
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
|
||||||
|
];
|
||||||
|
|
||||||
|
let mut hex = String::with_capacity(<D as OutputSizeUser>::OutputSize::USIZE * 2);
|
||||||
|
|
||||||
|
for byte in self.digest.finalize().0.into_iter() {
|
||||||
|
let byte: u8 = byte;
|
||||||
|
|
||||||
|
hex.push(ALPHABET[(byte >> 4) as usize]);
|
||||||
|
hex.push(ALPHABET[(byte & 0xF) as usize]);
|
||||||
|
}
|
||||||
|
|
||||||
|
hex
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<D> From<D> for DigestHasher<D>
|
||||||
|
where
|
||||||
|
D: Digest,
|
||||||
|
{
|
||||||
|
/// Creating a hash from an algorithm implementing Digest.
|
||||||
|
fn from(digest: D) -> Self {
|
||||||
|
DigestHasher { digest }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<D: Digest> Hasher for DigestHasher<D> {
|
||||||
|
/// Stopper to prevent calling the standard Hasher result.
|
||||||
|
fn finish(&self) -> u64 {
|
||||||
|
unimplemented!("Do not call finish()");
|
||||||
|
}
|
||||||
|
|
||||||
|
fn write(&mut self, bytes: &[u8]) {
|
||||||
|
self.digest.update(bytes);
|
||||||
|
}
|
||||||
|
}
|
||||||
289
providers/base/src/lib.rs
Normal file
289
providers/base/src/lib.rs
Normal file
@@ -0,0 +1,289 @@
|
|||||||
|
use crate::hasher::DigestHasher;
|
||||||
|
use async_trait::async_trait;
|
||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use serde_repr::{Deserialize_repr, Serialize_repr};
|
||||||
|
use sha1::{Digest, Sha1};
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::hash::Hash;
|
||||||
|
use std::sync::Arc;
|
||||||
|
use tokio_util::sync::CancellationToken;
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
|
||||||
|
mod hasher;
|
||||||
|
|
||||||
|
// pub(crate) mod internal {
|
||||||
|
// use super::{LessonBoundaries, LessonType};
|
||||||
|
// use chrono::{DateTime, Utc};
|
||||||
|
//
|
||||||
|
// /// Data cell storing the group name.
|
||||||
|
// pub struct GroupCellInfo {
|
||||||
|
// /// Column index.
|
||||||
|
// pub column: u32,
|
||||||
|
//
|
||||||
|
// /// Text in the cell.
|
||||||
|
// pub name: String,
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// /// Data cell storing the line.
|
||||||
|
// pub struct DayCellInfo {
|
||||||
|
// /// Line index.
|
||||||
|
// pub row: u32,
|
||||||
|
//
|
||||||
|
// /// Column index.
|
||||||
|
// pub column: u32,
|
||||||
|
//
|
||||||
|
// /// Day name.
|
||||||
|
// pub name: String,
|
||||||
|
//
|
||||||
|
// /// Date of the day.
|
||||||
|
// pub date: DateTime<Utc>,
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// /// Data on the time of lessons from the second column of the schedule.
|
||||||
|
// pub struct BoundariesCellInfo {
|
||||||
|
// /// Temporary segment of the lesson.
|
||||||
|
// pub time_range: LessonBoundaries,
|
||||||
|
//
|
||||||
|
// /// Type of lesson.
|
||||||
|
// pub lesson_type: LessonType,
|
||||||
|
//
|
||||||
|
// /// The lesson index.
|
||||||
|
// pub default_index: Option<u32>,
|
||||||
|
//
|
||||||
|
// /// The frame of the cell.
|
||||||
|
// pub xls_range: ((u32, u32), (u32, u32)),
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
/// The beginning and end of the lesson.
|
||||||
|
#[derive(Clone, Hash, Debug, Serialize, Deserialize, ToSchema)]
|
||||||
|
pub struct LessonBoundaries {
|
||||||
|
/// The beginning of a lesson.
|
||||||
|
pub start: DateTime<Utc>,
|
||||||
|
|
||||||
|
/// The end of the lesson.
|
||||||
|
pub end: DateTime<Utc>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Type of lesson.
|
||||||
|
#[derive(Clone, Hash, PartialEq, Debug, Serialize_repr, Deserialize_repr, ToSchema)]
|
||||||
|
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
|
||||||
|
#[repr(u8)]
|
||||||
|
pub enum LessonType {
|
||||||
|
/// Обычная.
|
||||||
|
Default = 0,
|
||||||
|
|
||||||
|
/// Допы.
|
||||||
|
Additional,
|
||||||
|
|
||||||
|
/// Перемена.
|
||||||
|
Break,
|
||||||
|
|
||||||
|
/// Консультация.
|
||||||
|
Consultation,
|
||||||
|
|
||||||
|
/// Самостоятельная работа.
|
||||||
|
IndependentWork,
|
||||||
|
|
||||||
|
/// Зачёт.
|
||||||
|
Exam,
|
||||||
|
|
||||||
|
/// Зачёт с оценкой.
|
||||||
|
ExamWithGrade,
|
||||||
|
|
||||||
|
/// Экзамен.
|
||||||
|
ExamDefault,
|
||||||
|
|
||||||
|
/// Курсовой проект.
|
||||||
|
CourseProject,
|
||||||
|
|
||||||
|
/// Защита курсового проекта.
|
||||||
|
CourseProjectDefense,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Hash, Debug, Serialize, Deserialize, ToSchema)]
|
||||||
|
pub struct LessonSubGroup {
|
||||||
|
/// Cabinet, if present.
|
||||||
|
pub cabinet: Option<String>,
|
||||||
|
|
||||||
|
/// Full name of the teacher.
|
||||||
|
pub teacher: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Hash, Debug, Serialize, Deserialize, ToSchema)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct Lesson {
|
||||||
|
/// Type.
|
||||||
|
#[serde(rename = "type")]
|
||||||
|
pub lesson_type: LessonType,
|
||||||
|
|
||||||
|
/// Lesson indexes, if present.
|
||||||
|
pub range: Option<[u8; 2]>,
|
||||||
|
|
||||||
|
/// Name.
|
||||||
|
pub name: Option<String>,
|
||||||
|
|
||||||
|
/// The beginning and end.
|
||||||
|
pub time: LessonBoundaries,
|
||||||
|
|
||||||
|
/// List of subgroups.
|
||||||
|
#[serde(rename = "subgroups")]
|
||||||
|
pub subgroups: Option<Vec<Option<LessonSubGroup>>>,
|
||||||
|
|
||||||
|
/// Group name, if this is a schedule for teachers.
|
||||||
|
pub group: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Hash, Debug, Serialize, Deserialize, ToSchema)]
|
||||||
|
pub struct Day {
|
||||||
|
/// Day of the week.
|
||||||
|
pub name: String,
|
||||||
|
|
||||||
|
/// Address of another corps.
|
||||||
|
pub street: Option<String>,
|
||||||
|
|
||||||
|
/// Date.
|
||||||
|
pub date: DateTime<Utc>,
|
||||||
|
|
||||||
|
/// List of lessons on this day.
|
||||||
|
pub lessons: Vec<Lesson>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Hash, Debug, Serialize, Deserialize, ToSchema)]
|
||||||
|
pub struct ScheduleEntry {
|
||||||
|
/// The name of the group or name of the teacher.
|
||||||
|
pub name: String,
|
||||||
|
|
||||||
|
/// List of six days.
|
||||||
|
pub days: Vec<Day>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct ParsedSchedule {
|
||||||
|
/// List of groups.
|
||||||
|
pub groups: HashMap<String, ScheduleEntry>,
|
||||||
|
|
||||||
|
/// List of teachers.
|
||||||
|
pub teachers: HashMap<String, ScheduleEntry>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Represents a snapshot of the schedule parsed from an XLS file.
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct ScheduleSnapshot {
|
||||||
|
/// Timestamp when the Polytechnic website was queried for the schedule.
|
||||||
|
pub fetched_at: DateTime<Utc>,
|
||||||
|
|
||||||
|
/// Timestamp indicating when the schedule was last updated on the Polytechnic website.
|
||||||
|
///
|
||||||
|
/// <note>
|
||||||
|
/// This value is determined by the website's content and does not depend on the application.
|
||||||
|
/// </note>
|
||||||
|
pub updated_at: DateTime<Utc>,
|
||||||
|
|
||||||
|
/// URL pointing to the XLS file containing the source schedule data.
|
||||||
|
pub url: String,
|
||||||
|
|
||||||
|
/// Parsed schedule data in the application's internal representation.
|
||||||
|
pub data: ParsedSchedule,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ScheduleSnapshot {
|
||||||
|
/// Converting the schedule data into a hash.
|
||||||
|
/// ### Important!
|
||||||
|
/// The hash does not depend on the dates.
|
||||||
|
/// If the application is restarted, but the file with source schedule will remain unchanged, then the hash will not change.
|
||||||
|
pub fn hash(&self) -> String {
|
||||||
|
let mut hasher = DigestHasher::from(Sha1::new());
|
||||||
|
|
||||||
|
self.data.teachers.iter().for_each(|e| e.hash(&mut hasher));
|
||||||
|
self.data.groups.iter().for_each(|e| e.hash(&mut hasher));
|
||||||
|
|
||||||
|
hasher.finalize()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Simply updates the value of [`ScheduleSnapshot::fetched_at`].
|
||||||
|
/// Used for auto-updates.
|
||||||
|
pub fn update(&mut self) {
|
||||||
|
self.fetched_at = Utc::now();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// #[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("{_0:?}: Failed to read XLS file.")]
|
||||||
|
// #[schema(value_type = String)]
|
||||||
|
// BadXLS(Arc<calamine::XlsError>),
|
||||||
|
//
|
||||||
|
// /// Not a single sheet was found.
|
||||||
|
// #[display("No work sheets found.")]
|
||||||
|
// NoWorkSheets,
|
||||||
|
//
|
||||||
|
// /// There are no data on the boundaries of the sheet.
|
||||||
|
// #[display("There is no data on work sheet boundaries.")]
|
||||||
|
// UnknownWorkSheetRange,
|
||||||
|
//
|
||||||
|
// /// 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 (at {_0}) was found.")]
|
||||||
|
// LessonTimeNotFound(ErrorCellPos),
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// impl Serialize for ParseError {
|
||||||
|
// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
||||||
|
// where
|
||||||
|
// S: Serializer,
|
||||||
|
// {
|
||||||
|
// match self {
|
||||||
|
// ParseError::BadXLS(_) => serializer.serialize_str("BAD_XLS"),
|
||||||
|
// ParseError::NoWorkSheets => serializer.serialize_str("NO_WORK_SHEETS"),
|
||||||
|
// ParseError::UnknownWorkSheetRange => {
|
||||||
|
// serializer.serialize_str("UNKNOWN_WORK_SHEET_RANGE")
|
||||||
|
// }
|
||||||
|
// ParseError::LessonBoundaries(_) => serializer.serialize_str("GLOBAL_TIME"),
|
||||||
|
// ParseError::LessonTimeNotFound(_) => serializer.serialize_str("LESSON_TIME_NOT_FOUND"),
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
#[async_trait]
|
||||||
|
pub trait ScheduleProvider
|
||||||
|
where
|
||||||
|
Self: Sync + Send,
|
||||||
|
{
|
||||||
|
/// Returns ok when task has been canceled.
|
||||||
|
/// Returns err when error appeared while trying to parse or download schedule
|
||||||
|
async fn start_auto_update_task(
|
||||||
|
&self,
|
||||||
|
cancellation_token: CancellationToken,
|
||||||
|
) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>>;
|
||||||
|
|
||||||
|
async fn get_schedule(&self) -> Arc<ScheduleSnapshot>;
|
||||||
|
}
|
||||||
32
providers/provider-engels-polytechnic/Cargo.toml
Normal file
32
providers/provider-engels-polytechnic/Cargo.toml
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
[package]
|
||||||
|
name = "provider-engels-polytechnic"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2024"
|
||||||
|
|
||||||
|
[features]
|
||||||
|
test = []
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
base = { path = "../base" }
|
||||||
|
|
||||||
|
tokio = { version = "1.47.1", features = ["sync", "macros", "time"] }
|
||||||
|
tokio-util = "0.7.16"
|
||||||
|
|
||||||
|
chrono = { version = "0.4.41", features = ["serde"] }
|
||||||
|
|
||||||
|
serde = { version = "1.0.219", features = ["derive"] }
|
||||||
|
|
||||||
|
derive_more = { version = "2.0.1", features = ["error", "display"] }
|
||||||
|
|
||||||
|
utoipa = { version = "5.4.0", features = ["macros", "chrono"] }
|
||||||
|
|
||||||
|
calamine = "0.30.0"
|
||||||
|
async-trait = "0.1.89"
|
||||||
|
|
||||||
|
reqwest = "0.12.23"
|
||||||
|
ua_generator = "0.5.22"
|
||||||
|
regex = "1.11.2"
|
||||||
|
strsim = "0.11.1"
|
||||||
|
log = "0.4.27"
|
||||||
|
sentry = "0.42.0"
|
||||||
|
|
||||||
85
providers/provider-engels-polytechnic/src/lib.rs
Normal file
85
providers/provider-engels-polytechnic/src/lib.rs
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
use crate::updater::Updater;
|
||||||
|
use async_trait::async_trait;
|
||||||
|
use base::{ScheduleProvider, ScheduleSnapshot};
|
||||||
|
use std::ops::DerefMut;
|
||||||
|
use std::sync::Arc;
|
||||||
|
use std::time::Duration;
|
||||||
|
use tokio::sync::RwLock;
|
||||||
|
use tokio::time::interval;
|
||||||
|
use tokio_util::sync::CancellationToken;
|
||||||
|
|
||||||
|
pub use crate::updater::UpdateSource;
|
||||||
|
|
||||||
|
mod parser;
|
||||||
|
mod updater;
|
||||||
|
mod xls_downloader;
|
||||||
|
|
||||||
|
#[cfg(feature = "test")]
|
||||||
|
pub mod test_utils {
|
||||||
|
pub use crate::parser::test_utils::test_result;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct EngelsPolytechnicProvider {
|
||||||
|
updater: Updater,
|
||||||
|
snapshot: Arc<ScheduleSnapshot>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl EngelsPolytechnicProvider {
|
||||||
|
pub async fn new(
|
||||||
|
update_source: UpdateSource,
|
||||||
|
) -> Result<Arc<dyn ScheduleProvider>, crate::updater::error::Error> {
|
||||||
|
let (updater, snapshot) = Updater::new(update_source).await?;
|
||||||
|
|
||||||
|
Ok(Arc::new(Wrapper {
|
||||||
|
inner: RwLock::new(Self {
|
||||||
|
updater,
|
||||||
|
snapshot: Arc::new(snapshot),
|
||||||
|
}),
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct Wrapper {
|
||||||
|
inner: RwLock<EngelsPolytechnicProvider>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[async_trait]
|
||||||
|
impl ScheduleProvider for Wrapper {
|
||||||
|
async fn start_auto_update_task(
|
||||||
|
&self,
|
||||||
|
cancellation_token: CancellationToken,
|
||||||
|
) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
|
||||||
|
let mut ticker = interval(Duration::from_secs(60 * 30));
|
||||||
|
ticker.tick().await; // bc we already have the latest schedule, when instantiating provider
|
||||||
|
|
||||||
|
loop {
|
||||||
|
tokio::select! {
|
||||||
|
_ = ticker.tick() => {
|
||||||
|
let mut lock = self.inner.write().await;
|
||||||
|
let this= lock.deref_mut();
|
||||||
|
|
||||||
|
log::info!("Updating schedule...");
|
||||||
|
|
||||||
|
match this.updater.update(&mut this.snapshot).await {
|
||||||
|
Ok(snapshot) => {
|
||||||
|
this.snapshot = Arc::new(snapshot);
|
||||||
|
},
|
||||||
|
|
||||||
|
Err(err) => {
|
||||||
|
cancellation_token.cancel();
|
||||||
|
return Err(err.into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_ = cancellation_token.cancelled() => {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn get_schedule(&self) -> Arc<ScheduleSnapshot> {
|
||||||
|
self.inner.read().await.snapshot.clone()
|
||||||
|
}
|
||||||
|
}
|
||||||
21
providers/provider-engels-polytechnic/src/parser/macros.rs
Normal file
21
providers/provider-engels-polytechnic/src/parser/macros.rs
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
#[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;
|
||||||
|
}
|
||||||
|
}};
|
||||||
|
}
|
||||||
912
providers/provider-engels-polytechnic/src/parser/mod.rs
Normal file
912
providers/provider-engels-polytechnic/src/parser/mod.rs
Normal file
@@ -0,0 +1,912 @@
|
|||||||
|
use crate::or_continue;
|
||||||
|
use crate::parser::error::{ErrorCell, ErrorCellPos};
|
||||||
|
use crate::parser::worksheet::WorkSheet;
|
||||||
|
use crate::parser::LessonParseResult::{Lessons, Street};
|
||||||
|
use base::LessonType::Break;
|
||||||
|
use base::{
|
||||||
|
Day, Lesson, LessonBoundaries, LessonSubGroup, LessonType, ParsedSchedule, ScheduleEntry,
|
||||||
|
};
|
||||||
|
use calamine::{open_workbook_from_rs, Reader, Xls};
|
||||||
|
use chrono::{DateTime, Duration, NaiveDate, NaiveTime, Utc};
|
||||||
|
use regex::Regex;
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::io::Cursor;
|
||||||
|
use std::sync::LazyLock;
|
||||||
|
|
||||||
|
mod macros;
|
||||||
|
mod worksheet;
|
||||||
|
|
||||||
|
pub mod error {
|
||||||
|
use derive_more::{Display, Error};
|
||||||
|
use serde::{Serialize, Serializer};
|
||||||
|
use std::sync::Arc;
|
||||||
|
use utoipa::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 Error {
|
||||||
|
/// Errors related to reading XLS file.
|
||||||
|
#[display("{_0:?}: Failed to read XLS file.")]
|
||||||
|
#[schema(value_type = String)]
|
||||||
|
BadXLS(Arc<calamine::XlsError>),
|
||||||
|
|
||||||
|
/// Not a single sheet was found.
|
||||||
|
#[display("No work sheets found.")]
|
||||||
|
NoWorkSheets,
|
||||||
|
|
||||||
|
/// There are no data on the boundaries of the sheet.
|
||||||
|
#[display("There is no data on work sheet boundaries.")]
|
||||||
|
UnknownWorkSheetRange,
|
||||||
|
|
||||||
|
/// 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 (at {_0}) was found.")]
|
||||||
|
LessonTimeNotFound(ErrorCellPos),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Serialize for Error {
|
||||||
|
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
||||||
|
where
|
||||||
|
S: Serializer,
|
||||||
|
{
|
||||||
|
match self {
|
||||||
|
Error::BadXLS(_) => serializer.serialize_str("BAD_XLS"),
|
||||||
|
Error::NoWorkSheets => serializer.serialize_str("NO_WORK_SHEETS"),
|
||||||
|
Error::UnknownWorkSheetRange => {
|
||||||
|
serializer.serialize_str("UNKNOWN_WORK_SHEET_RANGE")
|
||||||
|
}
|
||||||
|
Error::LessonBoundaries(_) => serializer.serialize_str("GLOBAL_TIME"),
|
||||||
|
Error::LessonTimeNotFound(_) => serializer.serialize_str("LESSON_TIME_NOT_FOUND"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Data cell storing the group name.
|
||||||
|
pub struct GroupCellInfo {
|
||||||
|
/// Column index.
|
||||||
|
pub column: u32,
|
||||||
|
|
||||||
|
/// Text in the cell.
|
||||||
|
pub name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Data cell storing the line.
|
||||||
|
pub struct DayCellInfo {
|
||||||
|
/// Line index.
|
||||||
|
pub row: u32,
|
||||||
|
|
||||||
|
/// Column index.
|
||||||
|
pub column: u32,
|
||||||
|
|
||||||
|
/// Day name.
|
||||||
|
pub name: String,
|
||||||
|
|
||||||
|
/// Date of the day.
|
||||||
|
pub date: DateTime<Utc>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Data on the time of lessons from the second column of the schedule.
|
||||||
|
pub struct BoundariesCellInfo {
|
||||||
|
/// Temporary segment of the lesson.
|
||||||
|
pub time_range: LessonBoundaries,
|
||||||
|
|
||||||
|
/// Type of lesson.
|
||||||
|
pub lesson_type: LessonType,
|
||||||
|
|
||||||
|
/// The lesson index.
|
||||||
|
pub default_index: Option<u32>,
|
||||||
|
|
||||||
|
/// The frame of the cell.
|
||||||
|
pub xls_range: ((u32, u32), (u32, u32)),
|
||||||
|
}
|
||||||
|
/// Obtaining a "skeleton" schedule from the working sheet.
|
||||||
|
fn parse_skeleton(
|
||||||
|
worksheet: &WorkSheet,
|
||||||
|
) -> Result<(Vec<DayCellInfo>, Vec<GroupCellInfo>), crate::parser::error::Error> {
|
||||||
|
let mut groups: Vec<GroupCellInfo> = Vec::new();
|
||||||
|
let mut days: Vec<(u32, String, Option<DateTime<Utc>>)> = Vec::new();
|
||||||
|
|
||||||
|
let worksheet_start = worksheet
|
||||||
|
.start()
|
||||||
|
.ok_or(error::Error::UnknownWorkSheetRange)?;
|
||||||
|
let worksheet_end = worksheet.end().ok_or(error::Error::UnknownWorkSheetRange)?;
|
||||||
|
|
||||||
|
let mut row = worksheet_start.0;
|
||||||
|
|
||||||
|
while row < worksheet_end.0 {
|
||||||
|
row += 1;
|
||||||
|
|
||||||
|
let day_full_name = or_continue!(worksheet.get_string_from_cell(row, 0));
|
||||||
|
|
||||||
|
// parse groups row when days column will found
|
||||||
|
if groups.is_empty() {
|
||||||
|
// переход на предыдущую строку
|
||||||
|
row -= 1;
|
||||||
|
|
||||||
|
for column in (worksheet_start.1 + 2)..=worksheet_end.1 {
|
||||||
|
groups.push(GroupCellInfo {
|
||||||
|
column,
|
||||||
|
name: or_continue!(worksheet.get_string_from_cell(row, column))
|
||||||
|
.replace(" ", ""),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// возврат на текущую строку
|
||||||
|
row += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
let (day_name, day_date) = {
|
||||||
|
let space_index = match day_full_name.find(' ') {
|
||||||
|
Some(index) => {
|
||||||
|
if index < 10 {
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
|
index
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None => break,
|
||||||
|
};
|
||||||
|
|
||||||
|
let name = day_full_name[..space_index].to_string();
|
||||||
|
|
||||||
|
let date_slice = &day_full_name[space_index + 1..];
|
||||||
|
let date = NaiveDate::parse_from_str(date_slice, "%d.%m.%Y")
|
||||||
|
.map(|date| date.and_time(NaiveTime::default()).and_utc())
|
||||||
|
.ok();
|
||||||
|
|
||||||
|
(name, date)
|
||||||
|
};
|
||||||
|
|
||||||
|
days.push((row, day_name, day_date));
|
||||||
|
}
|
||||||
|
|
||||||
|
// fix unparsable day dates
|
||||||
|
let days_max = days.len().min(5);
|
||||||
|
|
||||||
|
for i in 0..days_max {
|
||||||
|
if days[i].2.is_none() && days[i + 1].2.is_some() {
|
||||||
|
days[i].2 = Some(days[i + 1].2.unwrap() - Duration::days(1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for i in 0..days_max {
|
||||||
|
let i = days_max - i;
|
||||||
|
|
||||||
|
if days[i - 1].2.is_none() && days[i].2.is_some() {
|
||||||
|
days[i - 1].2 = Some(days[i].2.unwrap() - Duration::days(1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let days = days
|
||||||
|
.into_iter()
|
||||||
|
.map(|day| DayCellInfo {
|
||||||
|
row: day.0,
|
||||||
|
column: 0,
|
||||||
|
name: day.1,
|
||||||
|
date: day.2.unwrap(),
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
Ok((days, groups))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The result of obtaining a lesson from the cell.
|
||||||
|
enum LessonParseResult {
|
||||||
|
/// List of lessons long from one to two.
|
||||||
|
///
|
||||||
|
/// The number of lessons will be equal to one if the couple is the first in the day,
|
||||||
|
/// otherwise the list from the change template and the lesson itself will be returned.
|
||||||
|
Lessons(Vec<Lesson>),
|
||||||
|
|
||||||
|
/// Street on which the Polytechnic Corps is located.
|
||||||
|
Street(String),
|
||||||
|
}
|
||||||
|
|
||||||
|
// noinspection GrazieInspection
|
||||||
|
/// Obtaining a non-standard type of lesson by name.
|
||||||
|
fn guess_lesson_type(text: &String) -> Option<LessonType> {
|
||||||
|
static MAP: LazyLock<HashMap<&str, LessonType>> = LazyLock::new(|| {
|
||||||
|
HashMap::from([
|
||||||
|
("консультация", LessonType::Consultation),
|
||||||
|
("самостоятельная работа", LessonType::IndependentWork),
|
||||||
|
("зачет", LessonType::Exam),
|
||||||
|
("зачет с оценкой", LessonType::ExamWithGrade),
|
||||||
|
("экзамен", LessonType::ExamDefault),
|
||||||
|
("курсовой проект", LessonType::CourseProject),
|
||||||
|
("защита курсового проекта", LessonType::CourseProjectDefense),
|
||||||
|
])
|
||||||
|
});
|
||||||
|
|
||||||
|
let name_lower = text.to_lowercase();
|
||||||
|
|
||||||
|
match MAP
|
||||||
|
.iter()
|
||||||
|
.map(|(text, lesson_type)| (lesson_type, strsim::levenshtein(text, &*name_lower)))
|
||||||
|
.filter(|x| x.1 <= 4)
|
||||||
|
.min_by_key(|(_, score)| *score)
|
||||||
|
{
|
||||||
|
None => None,
|
||||||
|
Some(v) => Some(v.0.clone()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Getting a pair or street from a cell.
|
||||||
|
fn parse_lesson(
|
||||||
|
worksheet: &WorkSheet,
|
||||||
|
day: &Day,
|
||||||
|
day_boundaries: &Vec<BoundariesCellInfo>,
|
||||||
|
lesson_boundaries: &BoundariesCellInfo,
|
||||||
|
group_column: u32,
|
||||||
|
) -> Result<LessonParseResult, crate::parser::error::Error> {
|
||||||
|
let row = lesson_boundaries.xls_range.0.0;
|
||||||
|
|
||||||
|
let name = {
|
||||||
|
let cell_data = match worksheet.get_string_from_cell(row, group_column) {
|
||||||
|
Some(x) => x,
|
||||||
|
None => return Ok(Lessons(Vec::new())),
|
||||||
|
};
|
||||||
|
|
||||||
|
static OTHER_STREET_RE: LazyLock<Regex> =
|
||||||
|
LazyLock::new(|| Regex::new(r"^[А-Я][а-я]+[,\s]\d+$").unwrap());
|
||||||
|
|
||||||
|
if OTHER_STREET_RE.is_match(&cell_data) {
|
||||||
|
return Ok(Street(cell_data));
|
||||||
|
}
|
||||||
|
|
||||||
|
cell_data
|
||||||
|
};
|
||||||
|
|
||||||
|
let cell_range = worksheet.get_merge_from_start(row, group_column);
|
||||||
|
|
||||||
|
let (default_range, lesson_time) = {
|
||||||
|
let end_time_arr = day_boundaries
|
||||||
|
.iter()
|
||||||
|
.filter(|time| time.xls_range.1.0 == cell_range.1.0)
|
||||||
|
.collect::<Vec<&BoundariesCellInfo>>();
|
||||||
|
|
||||||
|
let end_time = end_time_arr
|
||||||
|
.first()
|
||||||
|
.ok_or(error::Error::LessonTimeNotFound(ErrorCellPos {
|
||||||
|
row,
|
||||||
|
column: group_column,
|
||||||
|
}))?;
|
||||||
|
|
||||||
|
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 = LessonBoundaries {
|
||||||
|
start: lesson_boundaries.time_range.start,
|
||||||
|
end: end_time.time_range.end,
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok((range, time))
|
||||||
|
}?;
|
||||||
|
|
||||||
|
let (name, mut subgroups, lesson_type) = parse_name_and_subgroups(&name)?;
|
||||||
|
|
||||||
|
{
|
||||||
|
let cabinets: Vec<String> = parse_cabinets(
|
||||||
|
worksheet,
|
||||||
|
(cell_range.0.0, cell_range.1.0),
|
||||||
|
group_column + 1,
|
||||||
|
);
|
||||||
|
|
||||||
|
let cab_count = cabinets.len();
|
||||||
|
|
||||||
|
if cab_count == 1 {
|
||||||
|
// Назначаем этот кабинет всем подгруппам
|
||||||
|
let cab = Some(cabinets.get(0).unwrap().clone());
|
||||||
|
|
||||||
|
for subgroup in &mut subgroups {
|
||||||
|
if let Some(subgroup) = subgroup {
|
||||||
|
subgroup.cabinet = cab.clone()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if cab_count == 2 {
|
||||||
|
while subgroups.len() < cab_count {
|
||||||
|
subgroups.push(subgroups.last().unwrap_or(&None).clone());
|
||||||
|
}
|
||||||
|
|
||||||
|
for i in 0..cab_count {
|
||||||
|
let subgroup = subgroups.get_mut(i).unwrap();
|
||||||
|
let cabinet = Some(cabinets.get(i).unwrap().clone());
|
||||||
|
|
||||||
|
match subgroup {
|
||||||
|
None => {
|
||||||
|
let _ = subgroup.insert(LessonSubGroup {
|
||||||
|
teacher: None,
|
||||||
|
cabinet,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Some(subgroup) => {
|
||||||
|
subgroup.cabinet = cabinet;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let lesson = Lesson {
|
||||||
|
lesson_type: lesson_type.unwrap_or(lesson_boundaries.lesson_type.clone()),
|
||||||
|
range: default_range,
|
||||||
|
name: Some(name),
|
||||||
|
time: lesson_time,
|
||||||
|
subgroups: if subgroups.len() == 2
|
||||||
|
&& subgroups.get(0).unwrap().is_none()
|
||||||
|
&& subgroups.get(1).unwrap().is_none()
|
||||||
|
{
|
||||||
|
None
|
||||||
|
} else {
|
||||||
|
Some(subgroups)
|
||||||
|
},
|
||||||
|
group: None,
|
||||||
|
};
|
||||||
|
|
||||||
|
let prev_lesson = if day.lessons.is_empty() {
|
||||||
|
return Ok(Lessons(Vec::from([lesson])));
|
||||||
|
} else {
|
||||||
|
&day.lessons[day.lessons.len() - 1]
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(Lessons(Vec::from([
|
||||||
|
Lesson {
|
||||||
|
lesson_type: Break,
|
||||||
|
range: None,
|
||||||
|
name: None,
|
||||||
|
time: LessonBoundaries {
|
||||||
|
start: prev_lesson.time.end,
|
||||||
|
end: lesson.time.start,
|
||||||
|
},
|
||||||
|
subgroups: Some(Vec::new()),
|
||||||
|
group: None,
|
||||||
|
},
|
||||||
|
lesson,
|
||||||
|
])))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Obtaining a list of cabinets to the right of the lesson cell.
|
||||||
|
fn parse_cabinets(worksheet: &WorkSheet, row_range: (u32, u32), column: u32) -> Vec<String> {
|
||||||
|
let mut cabinets: Vec<String> = Vec::new();
|
||||||
|
|
||||||
|
for row in row_range.0..row_range.1 {
|
||||||
|
let raw = or_continue!(worksheet.get_string_from_cell(row, column));
|
||||||
|
|
||||||
|
let clean = raw.replace("\n", " ");
|
||||||
|
let parts: Vec<&str> = clean.split(" ").collect();
|
||||||
|
|
||||||
|
parts.iter().take(2).for_each(|part| {
|
||||||
|
let clean_part = part.to_string().trim().to_string();
|
||||||
|
|
||||||
|
cabinets.push(clean_part);
|
||||||
|
});
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
cabinets
|
||||||
|
}
|
||||||
|
|
||||||
|
//noinspection GrazieInspection
|
||||||
|
/// Getting the "pure" name of the lesson and list of teachers from the text of the lesson cell.
|
||||||
|
fn parse_name_and_subgroups(
|
||||||
|
text: &String,
|
||||||
|
) -> Result<(String, Vec<Option<LessonSubGroup>>, Option<LessonType>), crate::parser::error::Error>
|
||||||
|
{
|
||||||
|
// Части названия пары:
|
||||||
|
// 1. Само название.
|
||||||
|
// 2. Список преподавателей и подгрупп.
|
||||||
|
// 3. "Модификатор" (чаще всего).
|
||||||
|
//
|
||||||
|
// Регулярное выражение для получения ФИО преподавателей и номеров подгрупп (aka. второй части).
|
||||||
|
// (?:[А-Я][а-я]+\s?(?:[А-Я][\s.]*){2}(?:\(\d\s?[а-я]+\))?(?:, )?)+[\s.]*
|
||||||
|
//
|
||||||
|
// Подробнее:
|
||||||
|
// (?:
|
||||||
|
// [А-Я][а-я]+ - Фамилия.
|
||||||
|
// \s? - Кто знает, будет ли там пробел.
|
||||||
|
// (?:[А-Я][\s.]*){2} - Имя и отчество с учётом случайных пробелов и точек.
|
||||||
|
// (?:
|
||||||
|
// \( - Открытие подгруппы.
|
||||||
|
// \s? - Кто знает, будет ли там пробел.
|
||||||
|
// \d - Номер подгруппы.
|
||||||
|
// \s? - Кто знает, будет ли там пробел.
|
||||||
|
// [а-я\s]+ - Слово "подгруппа" с учётов ошибок.
|
||||||
|
// \) - Закрытие подгруппы.
|
||||||
|
// )? - Явное указание подгруппы может отсутствовать по понятным причинам.
|
||||||
|
// (?:, )? - Разделители между отдельными частями.
|
||||||
|
// )+
|
||||||
|
// [\s.]* - Забираем с собой всякий мусор, что бы не передать его в третью часть.
|
||||||
|
|
||||||
|
static NAMES_REGEX: LazyLock<Regex> = LazyLock::new(|| {
|
||||||
|
Regex::new(
|
||||||
|
r"(?:[А-Я][а-я]+\s?(?:[А-Я][\s.]*){2}(?:\(\s*\d\s*[а-я\s]+\))?(?:[\s,]+)?){1,2}+[\s.,]*",
|
||||||
|
)
|
||||||
|
.unwrap()
|
||||||
|
});
|
||||||
|
|
||||||
|
// Отчистка
|
||||||
|
static CLEAN_RE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"[\s\n\t]+").unwrap());
|
||||||
|
|
||||||
|
let text = CLEAN_RE
|
||||||
|
.replace(&text.replace(&[' ', '\t', '\n'], " "), " ")
|
||||||
|
.to_string();
|
||||||
|
|
||||||
|
let (lesson_name, subgroups, lesson_type) = match NAMES_REGEX.captures(&text) {
|
||||||
|
Some(captures) => {
|
||||||
|
let capture = captures.get(0).unwrap();
|
||||||
|
|
||||||
|
let subgroups: Vec<Option<LessonSubGroup>> = {
|
||||||
|
let src = capture.as_str().replace(&[' ', '.'], "");
|
||||||
|
|
||||||
|
let mut shared_subgroup = false;
|
||||||
|
let mut subgroups: [Option<LessonSubGroup>; 2] = [None, None];
|
||||||
|
|
||||||
|
for name in src.split(',') {
|
||||||
|
let open_bracket_index = name.find('(');
|
||||||
|
|
||||||
|
let number: u8 = open_bracket_index
|
||||||
|
.map_or(0, |index| name[(index + 1)..(index + 2)].parse().unwrap());
|
||||||
|
|
||||||
|
let teacher_name = {
|
||||||
|
let name_end = open_bracket_index.unwrap_or_else(|| name.len());
|
||||||
|
|
||||||
|
// Я ебал. Как же я долго до этого доходил.
|
||||||
|
format!(
|
||||||
|
"{} {}.{}.",
|
||||||
|
name.get(..name_end - 4).unwrap(),
|
||||||
|
name.get(name_end - 4..name_end - 2).unwrap(),
|
||||||
|
name.get(name_end - 2..name_end).unwrap(),
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
let lesson = Some(LessonSubGroup {
|
||||||
|
cabinet: None,
|
||||||
|
teacher: Some(teacher_name),
|
||||||
|
});
|
||||||
|
|
||||||
|
match number {
|
||||||
|
0 => {
|
||||||
|
subgroups[0] = lesson;
|
||||||
|
subgroups[1] = None;
|
||||||
|
shared_subgroup = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
num => {
|
||||||
|
// 1 - 1 = 0 | 2 - 1 = 1 | 3 - 1 = 2 (schedule index to array index)
|
||||||
|
// 0 % 2 = 0 | 1 % 2 = 1 | 2 % 2 = 0 (clamp)
|
||||||
|
let normalised = (num - 1) % 2;
|
||||||
|
|
||||||
|
subgroups[normalised as usize] = lesson;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if shared_subgroup {
|
||||||
|
Vec::from([subgroups[0].take()])
|
||||||
|
} else {
|
||||||
|
Vec::from(subgroups)
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let name = text[..capture.start()].trim().to_string();
|
||||||
|
let extra = text[capture.end()..].trim().to_string();
|
||||||
|
|
||||||
|
let lesson_type = if extra.len() > 4 {
|
||||||
|
let result = guess_lesson_type(&extra);
|
||||||
|
|
||||||
|
if result.is_none() {
|
||||||
|
#[cfg(not(debug_assertions))]
|
||||||
|
sentry::capture_message(
|
||||||
|
&*format!("Не удалось угадать тип пары '{}'!", extra),
|
||||||
|
sentry::Level::Warning,
|
||||||
|
);
|
||||||
|
|
||||||
|
#[cfg(debug_assertions)]
|
||||||
|
log::warn!("Не удалось угадать тип пары '{}'!", extra);
|
||||||
|
}
|
||||||
|
|
||||||
|
result
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
|
||||||
|
(name, subgroups, lesson_type)
|
||||||
|
}
|
||||||
|
None => (text, Vec::new(), None),
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok((lesson_name, subgroups, lesson_type))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Getting the start and end of a pair from a cell in the first column of a document.
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
///
|
||||||
|
/// * `cell_data`: text in cell.
|
||||||
|
/// * `date`: date of the current day.
|
||||||
|
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),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Parse the column of the document to obtain a list of day's lesson boundaries.
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
///
|
||||||
|
/// * `worksheet`: document.
|
||||||
|
/// * `date`: date of the current day.
|
||||||
|
/// * `row_range`: row boundaries of the current day.
|
||||||
|
/// * `column`: column with the required data.
|
||||||
|
fn parse_day_boundaries(
|
||||||
|
worksheet: &WorkSheet,
|
||||||
|
date: DateTime<Utc>,
|
||||||
|
row_range: (u32, u32),
|
||||||
|
column: u32,
|
||||||
|
) -> Result<Vec<BoundariesCellInfo>, crate::parser::error::Error> {
|
||||||
|
let mut day_times: Vec<BoundariesCellInfo> = Vec::new();
|
||||||
|
|
||||||
|
for row in row_range.0..row_range.1 {
|
||||||
|
let time_cell = if let Some(str) = worksheet.get_string_from_cell(row, column) {
|
||||||
|
str
|
||||||
|
} else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
|
||||||
|
let lesson_time = parse_lesson_boundaries_cell(&time_cell, date.clone()).ok_or(
|
||||||
|
error::Error::LessonBoundaries(ErrorCell::new(row, 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: worksheet.get_merge_from_start(row, column),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(day_times)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Parse the column of the document to obtain a list of week's lesson boundaries.
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
///
|
||||||
|
/// * `worksheet`: document.
|
||||||
|
/// * `week_markup`: markup of the current week.
|
||||||
|
fn parse_week_boundaries(
|
||||||
|
worksheet: &WorkSheet,
|
||||||
|
week_markup: &Vec<DayCellInfo>,
|
||||||
|
) -> Result<Vec<Vec<BoundariesCellInfo>>, crate::parser::error::Error> {
|
||||||
|
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 end_row = if day_index != week_markup.len() - 1 {
|
||||||
|
week_markup[day_index + 1].row
|
||||||
|
} else {
|
||||||
|
worksheet_end_row
|
||||||
|
};
|
||||||
|
|
||||||
|
let day_boundaries = parse_day_boundaries(
|
||||||
|
&worksheet,
|
||||||
|
day_markup.date.clone(),
|
||||||
|
(day_markup.row, end_row),
|
||||||
|
lesson_time_column,
|
||||||
|
)?;
|
||||||
|
|
||||||
|
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>,
|
||||||
|
) -> HashMap<String, ScheduleEntry> {
|
||||||
|
let mut teachers: HashMap<String, ScheduleEntry> = HashMap::new();
|
||||||
|
|
||||||
|
let empty_days: Vec<Day> = groups
|
||||||
|
.values()
|
||||||
|
.next()
|
||||||
|
.unwrap()
|
||||||
|
.days
|
||||||
|
.iter()
|
||||||
|
.map(|day| Day {
|
||||||
|
name: day.name.clone(),
|
||||||
|
street: day.street.clone(),
|
||||||
|
date: day.date.clone(),
|
||||||
|
lessons: vec![],
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
for group in groups.values() {
|
||||||
|
for (index, day) in group.days.iter().enumerate() {
|
||||||
|
for group_lesson in &day.lessons {
|
||||||
|
if group_lesson.lesson_type == Break {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if group_lesson.subgroups.is_none() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
let subgroups = group_lesson.subgroups.as_ref().unwrap();
|
||||||
|
|
||||||
|
for subgroup in subgroups {
|
||||||
|
let teacher = match subgroup {
|
||||||
|
None => continue,
|
||||||
|
Some(subgroup) => match &subgroup.teacher {
|
||||||
|
None => continue,
|
||||||
|
Some(teacher) => teacher,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
if teacher == "Ошибка в расписании" {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if !teachers.contains_key(teacher) {
|
||||||
|
teachers.insert(
|
||||||
|
teacher.clone(),
|
||||||
|
ScheduleEntry {
|
||||||
|
name: teacher.clone(),
|
||||||
|
days: empty_days.to_vec(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
let teacher_day = teachers
|
||||||
|
.get_mut(teacher)
|
||||||
|
.unwrap()
|
||||||
|
.days
|
||||||
|
.get_mut(index)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
teacher_day.lessons.push({
|
||||||
|
let mut lesson = group_lesson.clone();
|
||||||
|
lesson.group = Some(group.name.clone());
|
||||||
|
|
||||||
|
lesson
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
teachers.iter_mut().for_each(|(_, teacher)| {
|
||||||
|
teacher.days.iter_mut().for_each(|day| {
|
||||||
|
day.lessons
|
||||||
|
.sort_by(|a, b| a.range.as_ref().unwrap()[1].cmp(&b.range.as_ref().unwrap()[1]))
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
teachers
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Reading XLS Document from the buffer and converting it into the schedule ready to use.
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
///
|
||||||
|
/// * `buffer`: XLS data containing schedule.
|
||||||
|
///
|
||||||
|
/// returns: Result<ParseResult, crate::parser::error::Error>
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// use schedule_parser::parse_xls;
|
||||||
|
///
|
||||||
|
/// let result = parse_xls(&include_bytes!("../../schedule.xls").to_vec());
|
||||||
|
///
|
||||||
|
/// 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);
|
||||||
|
/// ```
|
||||||
|
pub fn parse_xls(buffer: &Vec<u8>) -> Result<ParsedSchedule, crate::parser::error::Error> {
|
||||||
|
let cursor = Cursor::new(&buffer);
|
||||||
|
let mut workbook: Xls<_> =
|
||||||
|
open_workbook_from_rs(cursor).map_err(|e| error::Error::BadXLS(std::sync::Arc::new(e)))?;
|
||||||
|
|
||||||
|
let worksheet = {
|
||||||
|
let (worksheet_name, worksheet) = workbook
|
||||||
|
.worksheets()
|
||||||
|
.first()
|
||||||
|
.ok_or(error::Error::NoWorkSheets)?
|
||||||
|
.clone();
|
||||||
|
|
||||||
|
let worksheet_merges = workbook
|
||||||
|
.worksheet_merge_cells(&*worksheet_name)
|
||||||
|
.ok_or(error::Error::NoWorkSheets)?;
|
||||||
|
|
||||||
|
WorkSheet {
|
||||||
|
data: worksheet,
|
||||||
|
merges: worksheet_merges,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let (week_markup, groups_markup) = parse_skeleton(&worksheet)?;
|
||||||
|
let week_boundaries = parse_week_boundaries(&worksheet, &week_markup)?;
|
||||||
|
|
||||||
|
let mut groups: HashMap<String, ScheduleEntry> = HashMap::new();
|
||||||
|
|
||||||
|
for group_markup in groups_markup {
|
||||||
|
let mut group = ScheduleEntry {
|
||||||
|
name: group_markup.name,
|
||||||
|
days: Vec::new(),
|
||||||
|
};
|
||||||
|
|
||||||
|
for day_index in 0..(&week_markup).len() {
|
||||||
|
let day_markup = &week_markup[day_index];
|
||||||
|
|
||||||
|
let mut day = Day {
|
||||||
|
name: day_markup.name.clone(),
|
||||||
|
street: None,
|
||||||
|
date: day_markup.date,
|
||||||
|
lessons: Vec::new(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let day_boundaries = &week_boundaries[day_index];
|
||||||
|
|
||||||
|
for lesson_boundaries in day_boundaries {
|
||||||
|
match &mut parse_lesson(
|
||||||
|
&worksheet,
|
||||||
|
&day,
|
||||||
|
&day_boundaries,
|
||||||
|
&lesson_boundaries,
|
||||||
|
group_markup.column,
|
||||||
|
)? {
|
||||||
|
Lessons(lesson) => day.lessons.append(lesson),
|
||||||
|
Street(street) => day.street = Some(street.to_owned()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
group.days.push(day);
|
||||||
|
}
|
||||||
|
|
||||||
|
groups.insert(group.name.clone(), group);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(ParsedSchedule {
|
||||||
|
teachers: convert_groups_to_teachers(&groups),
|
||||||
|
groups,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(any(test, feature = "test"))]
|
||||||
|
pub mod test_utils {
|
||||||
|
use super::*;
|
||||||
|
use base::ParsedSchedule;
|
||||||
|
|
||||||
|
pub fn test_result() -> Result<ParsedSchedule, crate::parser::error::Error> {
|
||||||
|
parse_xls(&include_bytes!("../../../../test-data/engels-polytechnic.xls").to_vec())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
pub mod tests {
|
||||||
|
#[test]
|
||||||
|
fn read() {
|
||||||
|
let result = super::test_utils::test_result();
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
|
let lesson = &thursday.lessons[0];
|
||||||
|
assert_eq!(lesson.range.unwrap()[1], 3);
|
||||||
|
assert!(lesson.subgroups.is_some());
|
||||||
|
|
||||||
|
let subgroups = lesson.subgroups.as_ref().unwrap();
|
||||||
|
assert_eq!(subgroups.len(), 2);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
subgroups[0].as_ref().unwrap().cabinet,
|
||||||
|
Some("44".to_string())
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
subgroups[1].as_ref().unwrap().cabinet,
|
||||||
|
Some("43".to_string())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
use regex::Regex;
|
||||||
|
use std::ops::Deref;
|
||||||
|
use std::sync::LazyLock;
|
||||||
|
|
||||||
|
/// XLS WorkSheet data.
|
||||||
|
pub 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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl WorkSheet {
|
||||||
|
/// Getting a line from the required cell.
|
||||||
|
pub fn get_string_from_cell(&self, row: u32, col: u32) -> Option<String> {
|
||||||
|
let cell_data = if let Some(data) = self.get((row as usize, col as usize)) {
|
||||||
|
data.to_string()
|
||||||
|
} else {
|
||||||
|
return None;
|
||||||
|
};
|
||||||
|
|
||||||
|
if cell_data.trim().is_empty() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
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, " "), " ")
|
||||||
|
.trim()
|
||||||
|
.to_string();
|
||||||
|
|
||||||
|
if trimmed_data.is_empty() {
|
||||||
|
None
|
||||||
|
} else {
|
||||||
|
Some(trimmed_data)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Obtaining the boundaries of the cell along its upper left coordinate.
|
||||||
|
pub fn get_merge_from_start(&self, row: u32, column: u32) -> ((u32, u32), (u32, u32)) {
|
||||||
|
match self
|
||||||
|
.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)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
263
providers/provider-engels-polytechnic/src/updater.rs
Normal file
263
providers/provider-engels-polytechnic/src/updater.rs
Normal file
@@ -0,0 +1,263 @@
|
|||||||
|
use crate::parser::parse_xls;
|
||||||
|
use crate::updater::error::{Error, QueryUrlError, SnapshotCreationError};
|
||||||
|
use crate::xls_downloader::{FetchError, XlsDownloader};
|
||||||
|
use base::ScheduleSnapshot;
|
||||||
|
|
||||||
|
pub enum UpdateSource {
|
||||||
|
Prepared(ScheduleSnapshot),
|
||||||
|
|
||||||
|
Url(String),
|
||||||
|
|
||||||
|
GrabFromSite {
|
||||||
|
yandex_api_key: String,
|
||||||
|
yandex_func_id: String,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct Updater {
|
||||||
|
downloader: XlsDownloader,
|
||||||
|
update_source: UpdateSource,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub mod error {
|
||||||
|
use crate::xls_downloader::FetchError;
|
||||||
|
use derive_more::{Display, Error};
|
||||||
|
|
||||||
|
#[derive(Debug, Display, Error)]
|
||||||
|
pub enum Error {
|
||||||
|
/// An error occurred while querying the Yandex Cloud API for a URL.
|
||||||
|
///
|
||||||
|
/// This may result from network failures, invalid API credentials, or issues with the Yandex Cloud Function invocation.
|
||||||
|
/// See [`QueryUrlError`] for more details about specific causes.
|
||||||
|
QueryUrlFailed(QueryUrlError),
|
||||||
|
|
||||||
|
/// The schedule snapshot creation process failed.
|
||||||
|
///
|
||||||
|
/// This can happen due to URL conflicts (same URL already in use), failed network requests,
|
||||||
|
/// download errors, or invalid XLS file content. See [`SnapshotCreationError`] for details.
|
||||||
|
SnapshotCreationFailed(SnapshotCreationError),
|
||||||
|
}
|
||||||
|
/// Errors that may occur when querying the Yandex Cloud API to retrieve a URL.
|
||||||
|
#[derive(Debug, Display, Error)]
|
||||||
|
pub enum QueryUrlError {
|
||||||
|
/// Occurs when the request to the Yandex Cloud API fails.
|
||||||
|
///
|
||||||
|
/// This may be due to network issues, invalid API key, incorrect function ID, or other
|
||||||
|
/// problems with the Yandex Cloud Function invocation.
|
||||||
|
#[display("An error occurred during the request to the Yandex Cloud API: {_0}")]
|
||||||
|
RequestFailed(reqwest::Error),
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Errors that may occur during the creation of a schedule snapshot.
|
||||||
|
#[derive(Debug, Display, Error)]
|
||||||
|
pub enum SnapshotCreationError {
|
||||||
|
/// The URL is the same as the one already being used (no update needed).
|
||||||
|
#[display("The URL is the same as the one already being used.")]
|
||||||
|
SameUrl,
|
||||||
|
|
||||||
|
/// The URL query for the XLS file failed to execute, either due to network issues or invalid API parameters.
|
||||||
|
#[display("Failed to fetch URL: {_0}")]
|
||||||
|
FetchFailed(FetchError),
|
||||||
|
|
||||||
|
/// Downloading the XLS file content failed after successfully obtaining the URL.
|
||||||
|
#[display("Download failed: {_0}")]
|
||||||
|
DownloadFailed(FetchError),
|
||||||
|
|
||||||
|
/// The XLS file could not be parsed into a valid schedule format.
|
||||||
|
#[display("Schedule data is invalid: {_0}")]
|
||||||
|
InvalidSchedule(crate::parser::error::Error),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Updater {
|
||||||
|
/// Constructs a new `ScheduleSnapshot` by downloading and parsing schedule data from the specified URL.
|
||||||
|
///
|
||||||
|
/// This method first checks if the provided URL is the same as the one already configured in the downloader.
|
||||||
|
/// If different, it updates the downloader's URL, fetches the XLS content, parses it, and creates a snapshot.
|
||||||
|
/// Errors are returned for URL conflicts, network issues, download failures, or invalid data.
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
///
|
||||||
|
/// * `downloader`: A mutable reference to an `XLSDownloader` implementation used to fetch and parse the schedule data.
|
||||||
|
/// * `url`: The source URL pointing to the XLS file containing schedule data.
|
||||||
|
///
|
||||||
|
/// returns: Result<ScheduleSnapshot, SnapshotCreationError>
|
||||||
|
pub async fn new_snapshot(
|
||||||
|
downloader: &mut XlsDownloader,
|
||||||
|
url: String,
|
||||||
|
) -> Result<ScheduleSnapshot, SnapshotCreationError> {
|
||||||
|
if downloader.url.as_ref().is_some_and(|_url| _url.eq(&url)) {
|
||||||
|
return Err(SnapshotCreationError::SameUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
let head_result = downloader.set_url(&*url).await.map_err(|error| {
|
||||||
|
if let FetchError::Unknown(error) = &error {
|
||||||
|
sentry::capture_error(&error);
|
||||||
|
}
|
||||||
|
|
||||||
|
SnapshotCreationError::FetchFailed(error)
|
||||||
|
})?;
|
||||||
|
|
||||||
|
let xls_data = downloader
|
||||||
|
.fetch(false)
|
||||||
|
.await
|
||||||
|
.map_err(|error| {
|
||||||
|
if let FetchError::Unknown(error) = &error {
|
||||||
|
sentry::capture_error(&error);
|
||||||
|
}
|
||||||
|
|
||||||
|
SnapshotCreationError::DownloadFailed(error)
|
||||||
|
})?
|
||||||
|
.data
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let parse_result = parse_xls(&xls_data).map_err(|error| {
|
||||||
|
sentry::capture_error(&error);
|
||||||
|
|
||||||
|
SnapshotCreationError::InvalidSchedule(error)
|
||||||
|
})?;
|
||||||
|
|
||||||
|
Ok(ScheduleSnapshot {
|
||||||
|
fetched_at: head_result.requested_at,
|
||||||
|
updated_at: head_result.uploaded_at,
|
||||||
|
url,
|
||||||
|
data: parse_result,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Queries the Yandex Cloud Function (FaaS) to obtain a URL for the schedule file.
|
||||||
|
///
|
||||||
|
/// This sends a POST request to the specified Yandex Cloud Function endpoint,
|
||||||
|
/// using the provided API key for authentication. The returned URI is combined
|
||||||
|
/// with the "https://politehnikum-eng.ru" base domain to form the complete URL.
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
///
|
||||||
|
/// * `api_key` - Authentication token for Yandex Cloud API
|
||||||
|
/// * `func_id` - ID of the target Yandex Cloud Function to invoke
|
||||||
|
///
|
||||||
|
/// # Returns
|
||||||
|
///
|
||||||
|
/// Result containing:
|
||||||
|
/// - `Ok(String)` - Complete URL constructed from the Function's response
|
||||||
|
/// - `Err(QueryUrlError)` - If the request or response processing fails
|
||||||
|
async fn query_url(api_key: &str, func_id: &str) -> Result<String, QueryUrlError> {
|
||||||
|
let client = reqwest::Client::new();
|
||||||
|
|
||||||
|
let uri = client
|
||||||
|
.post(format!(
|
||||||
|
"https://functions.yandexcloud.net/{}?integration=raw",
|
||||||
|
func_id
|
||||||
|
))
|
||||||
|
.header("Authorization", format!("Api-Key {}", api_key))
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|error| QueryUrlError::RequestFailed(error))?
|
||||||
|
.text()
|
||||||
|
.await
|
||||||
|
.map_err(|error| QueryUrlError::RequestFailed(error))?;
|
||||||
|
|
||||||
|
Ok(format!("https://politehnikum-eng.ru{}", uri.trim()))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Initializes the schedule by fetching the URL from the environment or Yandex Cloud Function (FaaS)
|
||||||
|
/// and creating a [`ScheduleSnapshot`] with the downloaded data.
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
///
|
||||||
|
/// * `downloader`: Mutable reference to an `XLSDownloader` implementation used to fetch and parse the schedule
|
||||||
|
/// * `app_env`: Reference to the application environment containing either a predefined URL or Yandex Cloud credentials
|
||||||
|
///
|
||||||
|
/// # Returns
|
||||||
|
///
|
||||||
|
/// Returns `Ok(())` if the snapshot was successfully initialized, or an `Error` if:
|
||||||
|
/// - URL query to Yandex Cloud failed ([`QueryUrlError`])
|
||||||
|
/// - Schedule snapshot creation failed ([`SnapshotCreationError`])
|
||||||
|
pub async fn new(update_source: UpdateSource) -> Result<(Self, ScheduleSnapshot), Error> {
|
||||||
|
let mut this = Updater {
|
||||||
|
downloader: XlsDownloader::new(),
|
||||||
|
update_source,
|
||||||
|
};
|
||||||
|
|
||||||
|
if let UpdateSource::Prepared(snapshot) = &this.update_source {
|
||||||
|
let snapshot = snapshot.clone();
|
||||||
|
return Ok((this, snapshot));
|
||||||
|
}
|
||||||
|
|
||||||
|
let url = match &this.update_source {
|
||||||
|
UpdateSource::Url(url) => {
|
||||||
|
log::info!("The default link {} will be used", url);
|
||||||
|
url.clone()
|
||||||
|
}
|
||||||
|
UpdateSource::GrabFromSite {
|
||||||
|
yandex_api_key,
|
||||||
|
yandex_func_id,
|
||||||
|
} => {
|
||||||
|
log::info!("Obtaining a link using FaaS...");
|
||||||
|
Self::query_url(yandex_api_key, yandex_func_id)
|
||||||
|
.await
|
||||||
|
.map_err(|error| Error::QueryUrlFailed(error))?
|
||||||
|
}
|
||||||
|
_ => unreachable!(),
|
||||||
|
};
|
||||||
|
|
||||||
|
log::info!("For the initial setup, a link {} will be used", url);
|
||||||
|
|
||||||
|
let snapshot = Self::new_snapshot(&mut this.downloader, url)
|
||||||
|
.await
|
||||||
|
.map_err(|error| Error::SnapshotCreationFailed(error))?;
|
||||||
|
|
||||||
|
log::info!("Schedule snapshot successfully created!");
|
||||||
|
|
||||||
|
Ok((this, snapshot))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Updates the schedule snapshot by querying the latest URL from FaaS and checking for changes.
|
||||||
|
/// If the URL hasn't changed, only updates the [`fetched_at`] timestamp. If changed, downloads
|
||||||
|
/// and parses the new schedule data.
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
///
|
||||||
|
/// * `downloader`: XLS file downloader used to fetch and parse the schedule data
|
||||||
|
/// * `app_env`: Application environment containing Yandex Cloud configuration and auto-update settings
|
||||||
|
///
|
||||||
|
/// returns: `Result<(), Error>` - Returns error if URL query fails or schedule parsing encounters issues
|
||||||
|
///
|
||||||
|
/// # Safety
|
||||||
|
///
|
||||||
|
/// Use `unsafe` to access the initialized snapshot, guaranteed valid by prior `init()` call
|
||||||
|
pub async fn update(
|
||||||
|
&mut self,
|
||||||
|
current_snapshot: &ScheduleSnapshot,
|
||||||
|
) -> Result<ScheduleSnapshot, Error> {
|
||||||
|
if let UpdateSource::Prepared(snapshot) = &self.update_source {
|
||||||
|
let mut snapshot = snapshot.clone();
|
||||||
|
snapshot.update();
|
||||||
|
return Ok(snapshot);
|
||||||
|
}
|
||||||
|
|
||||||
|
let url = match &self.update_source {
|
||||||
|
UpdateSource::Url(url) => url.clone(),
|
||||||
|
UpdateSource::GrabFromSite {
|
||||||
|
yandex_api_key,
|
||||||
|
yandex_func_id,
|
||||||
|
} => Self::query_url(yandex_api_key.as_str(), yandex_func_id.as_str())
|
||||||
|
.await
|
||||||
|
.map_err(|error| Error::QueryUrlFailed(error))?,
|
||||||
|
_ => unreachable!(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let snapshot = match Self::new_snapshot(&mut self.downloader, url).await {
|
||||||
|
Ok(snapshot) => snapshot,
|
||||||
|
Err(SnapshotCreationError::SameUrl) => {
|
||||||
|
let mut clone = current_snapshot.clone();
|
||||||
|
clone.update();
|
||||||
|
|
||||||
|
clone
|
||||||
|
}
|
||||||
|
Err(error) => return Err(Error::SnapshotCreationFailed(error)),
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(snapshot)
|
||||||
|
}
|
||||||
|
}
|
||||||
237
providers/provider-engels-polytechnic/src/xls_downloader.rs
Normal file
237
providers/provider-engels-polytechnic/src/xls_downloader.rs
Normal file
@@ -0,0 +1,237 @@
|
|||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
use derive_more::{Display, Error};
|
||||||
|
use std::mem::discriminant;
|
||||||
|
use std::sync::Arc;
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
|
||||||
|
/// XLS data retrieval errors.
|
||||||
|
#[derive(Clone, Debug, ToSchema, Display, Error)]
|
||||||
|
pub enum FetchError {
|
||||||
|
/// File url is not set.
|
||||||
|
#[display("The link to the timetable was not provided earlier.")]
|
||||||
|
NoUrlProvided,
|
||||||
|
|
||||||
|
/// Unknown error.
|
||||||
|
#[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.
|
||||||
|
#[display("Server returned a status code {status_code}.")]
|
||||||
|
BadStatusCode { status_code: u16 },
|
||||||
|
|
||||||
|
/// The url leads to a file of a different type.
|
||||||
|
#[display("The link leads to a file of type '{content_type}'.")]
|
||||||
|
BadContentType { content_type: String },
|
||||||
|
|
||||||
|
/// Server doesn't return expected headers.
|
||||||
|
#[display("Server doesn't return expected header(s) '{expected_header}'.")]
|
||||||
|
BadHeaders { expected_header: String },
|
||||||
|
}
|
||||||
|
|
||||||
|
impl FetchError {
|
||||||
|
pub fn unknown(error: Arc<reqwest::Error>) -> Self {
|
||||||
|
Self::Unknown(error)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn bad_status_code(status_code: u16) -> Self {
|
||||||
|
Self::BadStatusCode { status_code }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn bad_content_type(content_type: &str) -> Self {
|
||||||
|
Self::BadContentType {
|
||||||
|
content_type: content_type.to_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn bad_headers(expected_header: &str) -> Self {
|
||||||
|
Self::BadHeaders {
|
||||||
|
expected_header: expected_header.to_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PartialEq for FetchError {
|
||||||
|
fn eq(&self, other: &Self) -> bool {
|
||||||
|
discriminant(self) == discriminant(other)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Result of XLS data retrieval.
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct FetchOk {
|
||||||
|
/// File upload date.
|
||||||
|
pub uploaded_at: DateTime<Utc>,
|
||||||
|
|
||||||
|
/// Date data received.
|
||||||
|
pub requested_at: DateTime<Utc>,
|
||||||
|
|
||||||
|
/// File data.
|
||||||
|
pub data: Option<Vec<u8>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl FetchOk {
|
||||||
|
/// Result without file content.
|
||||||
|
pub fn head(uploaded_at: DateTime<Utc>) -> Self {
|
||||||
|
FetchOk {
|
||||||
|
uploaded_at,
|
||||||
|
requested_at: Utc::now(),
|
||||||
|
data: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Full result.
|
||||||
|
pub fn get(uploaded_at: DateTime<Utc>, data: Vec<u8>) -> Self {
|
||||||
|
FetchOk {
|
||||||
|
uploaded_at,
|
||||||
|
requested_at: Utc::now(),
|
||||||
|
data: Some(data),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub type FetchResult = Result<FetchOk, FetchError>;
|
||||||
|
|
||||||
|
pub struct XlsDownloader {
|
||||||
|
pub url: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl XlsDownloader {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
XlsDownloader { url: None }
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn fetch_specified(url: &str, head: bool) -> FetchResult {
|
||||||
|
let client = reqwest::Client::new();
|
||||||
|
|
||||||
|
let response = if head {
|
||||||
|
client.head(url)
|
||||||
|
} else {
|
||||||
|
client.get(url)
|
||||||
|
}
|
||||||
|
.header("User-Agent", ua_generator::ua::spoof_chrome_ua())
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| FetchError::unknown(Arc::new(e)))?;
|
||||||
|
|
||||||
|
if response.status().as_u16() != 200 {
|
||||||
|
return Err(FetchError::bad_status_code(response.status().as_u16()));
|
||||||
|
}
|
||||||
|
|
||||||
|
let headers = response.headers();
|
||||||
|
|
||||||
|
let content_type = headers
|
||||||
|
.get("Content-Type")
|
||||||
|
.ok_or(FetchError::bad_headers("Content-Type"))?;
|
||||||
|
|
||||||
|
if !headers.contains_key("etag") {
|
||||||
|
return Err(FetchError::bad_headers("etag"));
|
||||||
|
}
|
||||||
|
|
||||||
|
let last_modified = headers
|
||||||
|
.get("last-modified")
|
||||||
|
.ok_or(FetchError::bad_headers("last-modified"))?;
|
||||||
|
|
||||||
|
if content_type != "application/vnd.ms-excel" {
|
||||||
|
return Err(FetchError::bad_content_type(content_type.to_str().unwrap()));
|
||||||
|
}
|
||||||
|
|
||||||
|
let last_modified = DateTime::parse_from_rfc2822(&last_modified.to_str().unwrap())
|
||||||
|
.unwrap()
|
||||||
|
.with_timezone(&Utc);
|
||||||
|
|
||||||
|
Ok(if head {
|
||||||
|
FetchOk::head(last_modified)
|
||||||
|
} else {
|
||||||
|
FetchOk::get(last_modified, response.bytes().await.unwrap().to_vec())
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn fetch(&self, head: bool) -> FetchResult {
|
||||||
|
if self.url.is_none() {
|
||||||
|
Err(FetchError::NoUrlProvided)
|
||||||
|
} else {
|
||||||
|
Self::fetch_specified(&*self.url.as_ref().unwrap(), head).await
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn set_url(&mut self, url: &str) -> FetchResult {
|
||||||
|
let result = Self::fetch_specified(url, true).await;
|
||||||
|
|
||||||
|
if let Ok(_) = result {
|
||||||
|
self.url = Some(url.to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
result
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use crate::xls_downloader::{FetchError, XlsDownloader};
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn bad_url() {
|
||||||
|
let url = "bad_url";
|
||||||
|
|
||||||
|
let mut downloader = XlsDownloader::new();
|
||||||
|
assert!(downloader.set_url(url).await.is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn bad_status_code() {
|
||||||
|
let url = "https://www.google.com/not-found";
|
||||||
|
|
||||||
|
let mut downloader = XlsDownloader::new();
|
||||||
|
assert_eq!(
|
||||||
|
downloader.set_url(url).await,
|
||||||
|
Err(FetchError::bad_status_code(404))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn bad_headers() {
|
||||||
|
let url = "https://www.google.com/favicon.ico";
|
||||||
|
|
||||||
|
let mut downloader = XlsDownloader::new();
|
||||||
|
assert_eq!(
|
||||||
|
downloader.set_url(url).await,
|
||||||
|
Err(FetchError::BadHeaders {
|
||||||
|
expected_header: "ETag".to_string(),
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn bad_content_type() {
|
||||||
|
let url = "https://s3.aero-storage.ldragol.ru/679e5d1145a6ad00843ad3f1/67ddb59fd46303008396ac96%2Fexample.txt";
|
||||||
|
|
||||||
|
let mut downloader = XlsDownloader::new();
|
||||||
|
assert!(downloader.set_url(url).await.is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn ok() {
|
||||||
|
let url = "https://s3.aero-storage.ldragol.ru/679e5d1145a6ad00843ad3f1/67ddb5fad46303008396ac97%2Fschedule.xls";
|
||||||
|
|
||||||
|
let mut downloader = XlsDownloader::new();
|
||||||
|
assert!(downloader.set_url(url).await.is_ok());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn downloader_ok() {
|
||||||
|
let url = "https://s3.aero-storage.ldragol.ru/679e5d1145a6ad00843ad3f1/67ddb5fad46303008396ac97%2Fschedule.xls";
|
||||||
|
|
||||||
|
let mut downloader = XlsDownloader::new();
|
||||||
|
assert!(downloader.set_url(url).await.is_ok());
|
||||||
|
assert!(downloader.fetch(false).await.is_ok());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn downloader_no_url_provided() {
|
||||||
|
let downloader = XlsDownloader::new();
|
||||||
|
|
||||||
|
let result = downloader.fetch(false).await;
|
||||||
|
assert_eq!(result, Err(FetchError::NoUrlProvided));
|
||||||
|
}
|
||||||
|
}
|
||||||
9
providers/src/lib.rs
Normal file
9
providers/src/lib.rs
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
pub use base;
|
||||||
|
|
||||||
|
pub use provider_engels_polytechnic::EngelsPolytechnicProvider;
|
||||||
|
pub use provider_engels_polytechnic::UpdateSource as EngelsPolytechnicUpdateSource;
|
||||||
|
|
||||||
|
#[cfg(feature = "test")]
|
||||||
|
pub mod test_utils {
|
||||||
|
pub use provider_engels_polytechnic::test_utils as engels_polytechnic;
|
||||||
|
}
|
||||||
BIN
schedule.xls
BIN
schedule.xls
Binary file not shown.
@@ -1,34 +0,0 @@
|
|||||||
pub mod users {
|
|
||||||
use crate::database::models::User;
|
|
||||||
use crate::database::schema::fcm::user_id;
|
|
||||||
use crate::database::schema::users::dsl::users;
|
|
||||||
use crate::database::schema::users::dsl::*;
|
|
||||||
use diesel::{ExpressionMethods, QueryResult};
|
|
||||||
use diesel::{PgConnection, SelectableHelper};
|
|
||||||
use diesel::{QueryDsl, RunQueryDsl};
|
|
||||||
use std::ops::DerefMut;
|
|
||||||
use std::sync::Mutex;
|
|
||||||
|
|
||||||
pub fn get(connection: &Mutex<PgConnection>, _id: String) -> QueryResult<User> {
|
|
||||||
let mut lock = connection.lock().unwrap();
|
|
||||||
let con = lock.deref_mut();
|
|
||||||
|
|
||||||
users
|
|
||||||
.filter(id.eq(_id))
|
|
||||||
.select(User::as_select())
|
|
||||||
.first(con)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_by_username(
|
|
||||||
connection: &Mutex<PgConnection>,
|
|
||||||
_username: String,
|
|
||||||
) -> QueryResult<User> {
|
|
||||||
let mut lock = connection.lock().unwrap();
|
|
||||||
let con = lock.deref_mut();
|
|
||||||
|
|
||||||
users
|
|
||||||
.filter(username.eq(_username))
|
|
||||||
.select(User::as_select())
|
|
||||||
.first(con)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
pub mod schema;
|
|
||||||
pub mod models;
|
|
||||||
pub mod driver;
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
use diesel::prelude::*;
|
|
||||||
use serde::Serialize;
|
|
||||||
|
|
||||||
#[derive(diesel_derive_enum::DbEnum, Serialize, Debug, Clone, Copy, PartialEq)]
|
|
||||||
#[ExistingTypePath = "crate::database::schema::sql_types::UserRole"]
|
|
||||||
#[DbValueStyle = "UPPERCASE"]
|
|
||||||
#[serde(rename_all = "UPPERCASE")]
|
|
||||||
pub enum UserRole {
|
|
||||||
Student,
|
|
||||||
Teacher,
|
|
||||||
Admin,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Identifiable, AsChangeset, Queryable, Selectable, Serialize)]
|
|
||||||
#[diesel(table_name = crate::database::schema::users)]
|
|
||||||
#[diesel(treat_none_as_null = true)]
|
|
||||||
pub struct User {
|
|
||||||
pub id: String,
|
|
||||||
pub username: String,
|
|
||||||
pub password: String,
|
|
||||||
pub vk_id: Option<i32>,
|
|
||||||
pub access_token: String,
|
|
||||||
pub group: String,
|
|
||||||
pub role: UserRole,
|
|
||||||
pub version: String,
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
// @generated automatically by Diesel CLI.
|
|
||||||
|
|
||||||
pub mod sql_types {
|
|
||||||
#[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
|
|
||||||
#[diesel(postgres_type(name = "user_role"))]
|
|
||||||
pub struct UserRole;
|
|
||||||
}
|
|
||||||
|
|
||||||
diesel::table! {
|
|
||||||
fcm (user_id) {
|
|
||||||
user_id -> Text,
|
|
||||||
token -> Text,
|
|
||||||
topics -> Nullable<Array<Nullable<Text>>>,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
diesel::table! {
|
|
||||||
use diesel::sql_types::*;
|
|
||||||
use super::sql_types::UserRole;
|
|
||||||
|
|
||||||
users (id) {
|
|
||||||
id -> Text,
|
|
||||||
username -> Text,
|
|
||||||
password -> Text,
|
|
||||||
vk_id -> Nullable<Int4>,
|
|
||||||
access_token -> Text,
|
|
||||||
group -> Text,
|
|
||||||
role -> UserRole,
|
|
||||||
version -> Text,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
diesel::joinable!(fcm -> users (user_id));
|
|
||||||
|
|
||||||
diesel::allow_tables_to_appear_in_same_query!(
|
|
||||||
fcm,
|
|
||||||
users,
|
|
||||||
);
|
|
||||||
108
src/extractors/authorized_user.rs
Normal file
108
src/extractors/authorized_user.rs
Normal file
@@ -0,0 +1,108 @@
|
|||||||
|
use crate::extractors::base::FromRequestAsync;
|
||||||
|
use crate::state::AppState;
|
||||||
|
use crate::utility::jwt;
|
||||||
|
use actix_macros::MiddlewareError;
|
||||||
|
use actix_web::body::BoxBody;
|
||||||
|
use actix_web::dev::Payload;
|
||||||
|
use actix_web::http::header;
|
||||||
|
use actix_web::{web, HttpRequest};
|
||||||
|
use database::entity::User;
|
||||||
|
use database::query::Query;
|
||||||
|
use derive_more::Display;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use std::fmt::Debug;
|
||||||
|
use std::ops::Deref;
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Display, MiddlewareError)]
|
||||||
|
#[status_code = "actix_web::http::StatusCode::UNAUTHORIZED"]
|
||||||
|
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
|
||||||
|
pub enum Error {
|
||||||
|
/// There is no Authorization header or cookie in the request.
|
||||||
|
#[display("No Authorization header or cookie found")]
|
||||||
|
NoHeaderOrCookieFound,
|
||||||
|
|
||||||
|
/// Unknown authorization type other than Bearer.
|
||||||
|
#[display("Bearer token is required")]
|
||||||
|
UnknownAuthorizationType,
|
||||||
|
|
||||||
|
/// Invalid or expired access token.
|
||||||
|
#[display("Invalid or expired access token")]
|
||||||
|
InvalidAccessToken,
|
||||||
|
|
||||||
|
/// The user bound to the token is not found in the database.
|
||||||
|
#[display("No user associated with access token")]
|
||||||
|
NoUser,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Error {
|
||||||
|
pub fn into_err(self) -> actix_web::Error {
|
||||||
|
actix_web::Error::from(self)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_access_token_from_header(req: &HttpRequest) -> Result<String, Error> {
|
||||||
|
let header_value = req
|
||||||
|
.headers()
|
||||||
|
.get(header::AUTHORIZATION)
|
||||||
|
.ok_or(Error::NoHeaderOrCookieFound)?
|
||||||
|
.to_str()
|
||||||
|
.map_err(|_| Error::NoHeaderOrCookieFound)?
|
||||||
|
.to_string();
|
||||||
|
|
||||||
|
let parts = header_value
|
||||||
|
.split_once(' ')
|
||||||
|
.ok_or(Error::UnknownAuthorizationType)?;
|
||||||
|
|
||||||
|
if parts.0 != "Bearer" {
|
||||||
|
Err(Error::UnknownAuthorizationType)
|
||||||
|
} else {
|
||||||
|
Ok(parts.1.to_string())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_access_token_from_cookies(req: &HttpRequest) -> Result<String, Error> {
|
||||||
|
let cookie = req
|
||||||
|
.cookie("access_token")
|
||||||
|
.ok_or(Error::NoHeaderOrCookieFound)?;
|
||||||
|
|
||||||
|
Ok(cookie.value().to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// User extractor from request with Bearer access token.
|
||||||
|
impl FromRequestAsync for User {
|
||||||
|
type Error = actix_web::Error;
|
||||||
|
|
||||||
|
async fn from_request_async(
|
||||||
|
req: &HttpRequest,
|
||||||
|
_payload: &mut Payload,
|
||||||
|
) -> Result<Self, Self::Error> {
|
||||||
|
let access_token = match get_access_token_from_header(req) {
|
||||||
|
Err(Error::NoHeaderOrCookieFound) => {
|
||||||
|
get_access_token_from_cookies(req).map_err(|error| error.into_err())?
|
||||||
|
}
|
||||||
|
Err(error) => {
|
||||||
|
return Err(error.into_err());
|
||||||
|
}
|
||||||
|
Ok(access_token) => access_token,
|
||||||
|
};
|
||||||
|
|
||||||
|
let user_id = jwt::verify_and_decode(&access_token)
|
||||||
|
.map_err(|_| Error::InvalidAccessToken.into_err())?;
|
||||||
|
|
||||||
|
let db = req
|
||||||
|
.app_data::<web::Data<AppState>>()
|
||||||
|
.unwrap()
|
||||||
|
.get_database();
|
||||||
|
|
||||||
|
Query::find_user_by_id(db, &user_id)
|
||||||
|
.await
|
||||||
|
.map_err(|_| Error::NoUser.into())
|
||||||
|
.and_then(|user| {
|
||||||
|
if let Some(user) = user {
|
||||||
|
Ok(user)
|
||||||
|
} else {
|
||||||
|
Err(actix_web::Error::from(Error::NoUser))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
156
src/extractors/base.rs
Normal file
156
src/extractors/base.rs
Normal file
@@ -0,0 +1,156 @@
|
|||||||
|
use actix_web::dev::Payload;
|
||||||
|
use actix_web::{FromRequest, HttpRequest};
|
||||||
|
use futures_util::future::LocalBoxFuture;
|
||||||
|
use std::future::{Ready, ready};
|
||||||
|
use std::ops;
|
||||||
|
|
||||||
|
/// # Async extractor.
|
||||||
|
|
||||||
|
/// Asynchronous object extractor from a query.
|
||||||
|
pub struct AsyncExtractor<T>(T);
|
||||||
|
|
||||||
|
impl<T> AsyncExtractor<T> {
|
||||||
|
#[allow(dead_code)]
|
||||||
|
/// Retrieve the object extracted with the extractor.
|
||||||
|
pub fn into_inner(self) -> T {
|
||||||
|
self.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T> ops::Deref for AsyncExtractor<T> {
|
||||||
|
type Target = T;
|
||||||
|
|
||||||
|
fn deref(&self) -> &Self::Target {
|
||||||
|
&self.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T> ops::DerefMut for AsyncExtractor<T> {
|
||||||
|
fn deref_mut(&mut self) -> &mut Self::Target {
|
||||||
|
&mut self.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub trait FromRequestAsync: Sized {
|
||||||
|
type Error: Into<actix_web::Error>;
|
||||||
|
|
||||||
|
/// Asynchronous function for extracting data from a query.
|
||||||
|
///
|
||||||
|
/// returns: Result<Self, Self::Error>
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// struct User {
|
||||||
|
/// pub id: String,
|
||||||
|
/// pub username: String,
|
||||||
|
/// }
|
||||||
|
///
|
||||||
|
/// // TODO: Я вообще этот экстрактор не использую, нахуя мне тогда писать пример, если я не ебу как его использовать. Я забыл.
|
||||||
|
///
|
||||||
|
/// #[get("/")]
|
||||||
|
/// fn get_user_async(
|
||||||
|
/// user: web::AsyncExtractor<User>,
|
||||||
|
/// ) -> web::Json<User> {
|
||||||
|
/// let user = user.into_inner();
|
||||||
|
///
|
||||||
|
/// web::Json(user)
|
||||||
|
/// }
|
||||||
|
/// ```
|
||||||
|
async fn from_request_async(
|
||||||
|
req: &HttpRequest,
|
||||||
|
payload: &mut Payload,
|
||||||
|
) -> Result<Self, Self::Error>;
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T: FromRequestAsync> FromRequest for AsyncExtractor<T> {
|
||||||
|
type Error = T::Error;
|
||||||
|
type Future = LocalBoxFuture<'static, Result<Self, Self::Error>>;
|
||||||
|
|
||||||
|
fn from_request(req: &HttpRequest, _payload: &mut Payload) -> Self::Future {
|
||||||
|
let req = req.clone();
|
||||||
|
let mut payload = Payload::None;
|
||||||
|
|
||||||
|
Box::pin(async move {
|
||||||
|
T::from_request_async(&req, &mut payload)
|
||||||
|
.await
|
||||||
|
.map(|res| Self(res))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// # Sync extractor.
|
||||||
|
|
||||||
|
/// Synchronous object extractor from a query.
|
||||||
|
pub struct SyncExtractor<T>(T);
|
||||||
|
|
||||||
|
impl<T> SyncExtractor<T> {
|
||||||
|
/// Retrieving an object extracted with the extractor.
|
||||||
|
#[allow(unused)]
|
||||||
|
pub fn into_inner(self) -> T {
|
||||||
|
self.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T> ops::Deref for SyncExtractor<T> {
|
||||||
|
type Target = T;
|
||||||
|
|
||||||
|
fn deref(&self) -> &Self::Target {
|
||||||
|
&self.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T> ops::DerefMut for SyncExtractor<T> {
|
||||||
|
fn deref_mut(&mut self) -> &mut Self::Target {
|
||||||
|
&mut self.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub trait FromRequestSync: Sized {
|
||||||
|
type Error: Into<actix_web::Error>;
|
||||||
|
|
||||||
|
/// Synchronous function for extracting data from a query.
|
||||||
|
///
|
||||||
|
/// returns: Result<Self, Self::Error>
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// struct User {
|
||||||
|
/// pub id: String,
|
||||||
|
/// pub username: String,
|
||||||
|
/// }
|
||||||
|
///
|
||||||
|
/// impl FromRequestSync for User {
|
||||||
|
/// type Error = actix_web::Error;
|
||||||
|
///
|
||||||
|
/// fn from_request_sync(req: &HttpRequest, _: &mut Payload) -> Result<Self, Self::Error> {
|
||||||
|
/// // do magic here.
|
||||||
|
///
|
||||||
|
/// Ok(User {
|
||||||
|
/// id: "qwerty".to_string(),
|
||||||
|
/// username: "n08i40k".to_string()
|
||||||
|
/// })
|
||||||
|
/// }
|
||||||
|
/// }
|
||||||
|
///
|
||||||
|
/// #[get("/")]
|
||||||
|
/// fn get_user_sync(
|
||||||
|
/// user: web::SyncExtractor<User>,
|
||||||
|
/// ) -> web::Json<User> {
|
||||||
|
/// let user = user.into_inner();
|
||||||
|
///
|
||||||
|
/// web::Json(user)
|
||||||
|
/// }
|
||||||
|
/// ```
|
||||||
|
fn from_request_sync(req: &HttpRequest, payload: &mut Payload) -> Result<Self, Self::Error>;
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T: FromRequestSync> FromRequest for SyncExtractor<T> {
|
||||||
|
type Error = T::Error;
|
||||||
|
type Future = Ready<Result<Self, Self::Error>>;
|
||||||
|
|
||||||
|
fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future {
|
||||||
|
ready(T::from_request_sync(req, payload).map(|res| Self(res)))
|
||||||
|
}
|
||||||
|
}
|
||||||
2
src/extractors/mod.rs
Normal file
2
src/extractors/mod.rs
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
pub mod authorized_user;
|
||||||
|
pub mod base;
|
||||||
153
src/main.rs
153
src/main.rs
@@ -1,64 +1,119 @@
|
|||||||
use crate::routes::auth::sign_in::sign_in;
|
use crate::middlewares::authorization::JWTAuthorization;
|
||||||
use crate::xls_downloader::basic_impl::BasicXlsDownloader;
|
use crate::middlewares::content_type::ContentTypeBootstrap;
|
||||||
use actix_web::{App, HttpServer, web};
|
use crate::state::{new_app_state, AppState};
|
||||||
use chrono::{DateTime, Utc};
|
use actix_web::dev::{ServiceFactory, ServiceRequest};
|
||||||
use diesel::{Connection, PgConnection};
|
use actix_web::{App, Error, HttpServer};
|
||||||
use dotenvy::dotenv;
|
use dotenvy::dotenv;
|
||||||
use schedule_parser::schema::ScheduleEntity;
|
use log::info;
|
||||||
use std::collections::HashMap;
|
use std::io;
|
||||||
use std::env;
|
use utoipa_actix_web::scope::Scope;
|
||||||
use std::sync::{Mutex, MutexGuard};
|
use utoipa_actix_web::AppExt;
|
||||||
|
use utoipa_rapidoc::RapiDoc;
|
||||||
|
|
||||||
mod database;
|
mod state;
|
||||||
|
|
||||||
|
mod extractors;
|
||||||
|
mod middlewares;
|
||||||
mod routes;
|
mod routes;
|
||||||
|
|
||||||
mod utility;
|
mod utility;
|
||||||
mod xls_downloader;
|
|
||||||
|
|
||||||
pub struct AppState {
|
mod test_env;
|
||||||
downloader: Mutex<BasicXlsDownloader>,
|
|
||||||
schedule: Mutex<
|
pub fn get_api_scope<
|
||||||
Option<(
|
I: Into<Scope<T>>,
|
||||||
String,
|
T: ServiceFactory<ServiceRequest, Config = (), Error = Error, InitError = ()>,
|
||||||
DateTime<Utc>,
|
>(
|
||||||
(
|
scope: I,
|
||||||
HashMap<String, ScheduleEntity>,
|
) -> Scope<T> {
|
||||||
HashMap<String, ScheduleEntity>,
|
let auth_scope = utoipa_actix_web::scope("/auth")
|
||||||
),
|
.service(routes::auth::sign_in)
|
||||||
)>,
|
.service(routes::auth::sign_in_vk)
|
||||||
>,
|
.service(routes::auth::sign_up)
|
||||||
database: Mutex<PgConnection>,
|
.service(routes::auth::sign_up_vk);
|
||||||
|
|
||||||
|
let users_scope = utoipa_actix_web::scope("/users")
|
||||||
|
.wrap(JWTAuthorization::default())
|
||||||
|
.service(routes::users::change_group)
|
||||||
|
.service(routes::users::change_username)
|
||||||
|
.service(routes::users::me);
|
||||||
|
|
||||||
|
let schedule_scope = utoipa_actix_web::scope("/schedule")
|
||||||
|
.wrap(JWTAuthorization {
|
||||||
|
ignore: &["/group-names", "/teacher-names"],
|
||||||
|
})
|
||||||
|
.service(routes::schedule::schedule)
|
||||||
|
.service(routes::schedule::cache_status)
|
||||||
|
.service(routes::schedule::group)
|
||||||
|
.service(routes::schedule::group_names)
|
||||||
|
.service(routes::schedule::teacher)
|
||||||
|
.service(routes::schedule::teacher_names);
|
||||||
|
|
||||||
|
let flow_scope = utoipa_actix_web::scope("/flow")
|
||||||
|
.wrap(JWTAuthorization {
|
||||||
|
ignore: &["/telegram-auth"],
|
||||||
|
})
|
||||||
|
.service(routes::flow::telegram_auth)
|
||||||
|
.service(routes::flow::telegram_complete);
|
||||||
|
|
||||||
|
let vk_id_scope = utoipa_actix_web::scope("/vkid") //
|
||||||
|
.service(routes::vk_id::oauth);
|
||||||
|
|
||||||
|
utoipa_actix_web::scope(scope)
|
||||||
|
.service(auth_scope)
|
||||||
|
.service(users_scope)
|
||||||
|
.service(schedule_scope)
|
||||||
|
.service(flow_scope)
|
||||||
|
.service(vk_id_scope)
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AppState {
|
async fn async_main() -> io::Result<()> {
|
||||||
pub fn connection(&self) -> MutexGuard<PgConnection> {
|
info!("Запуск сервера...");
|
||||||
self.database.lock().unwrap()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[actix_web::main]
|
let app_state = new_app_state(None).await.unwrap();
|
||||||
async fn main() {
|
|
||||||
dotenv().ok();
|
|
||||||
|
|
||||||
let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
|
|
||||||
|
|
||||||
let data = web::Data::new(AppState {
|
|
||||||
downloader: Mutex::new(BasicXlsDownloader::new()),
|
|
||||||
schedule: Mutex::new(None),
|
|
||||||
database: Mutex::new(
|
|
||||||
PgConnection::establish(&database_url)
|
|
||||||
.unwrap_or_else(|_| panic!("Error connecting to {}", database_url)),
|
|
||||||
),
|
|
||||||
});
|
|
||||||
|
|
||||||
HttpServer::new(move || {
|
HttpServer::new(move || {
|
||||||
let schedule_scope = web::scope("/auth").service(sign_in);
|
let (app, api) = App::new()
|
||||||
let api_scope = web::scope("/api/v1").service(schedule_scope);
|
.into_utoipa_app()
|
||||||
|
.app_data(app_state.clone())
|
||||||
|
.service(
|
||||||
|
get_api_scope("/api/v1")
|
||||||
|
.wrap(sentry_actix::Sentry::new())
|
||||||
|
.wrap(ContentTypeBootstrap),
|
||||||
|
)
|
||||||
|
.split_for_parts();
|
||||||
|
|
||||||
App::new().app_data(data.clone()).service(api_scope)
|
let rapidoc_service = RapiDoc::with_openapi("/api-docs-json", api).path("/api-docs");
|
||||||
|
|
||||||
|
// Because CORS error on non-localhost
|
||||||
|
let patched_rapidoc_html = rapidoc_service.to_html().replace(
|
||||||
|
"https://unpkg.com/rapidoc/dist/rapidoc-min.js",
|
||||||
|
"https://cdn.jsdelivr.net/npm/rapidoc/dist/rapidoc-min.min.js",
|
||||||
|
);
|
||||||
|
|
||||||
|
app.service(rapidoc_service.custom_html(patched_rapidoc_html))
|
||||||
})
|
})
|
||||||
.bind(("127.0.0.1", 8080))
|
.workers(4)
|
||||||
.unwrap()
|
.bind(("0.0.0.0", 5050))?
|
||||||
.run()
|
.run()
|
||||||
.await
|
.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()
|
||||||
|
},
|
||||||
|
));
|
||||||
|
|
||||||
|
let _ = dotenv();
|
||||||
|
|
||||||
|
env_logger::init();
|
||||||
|
|
||||||
|
actix_web::rt::System::new().block_on(async { async_main().await })?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
115
src/middlewares/authorization.rs
Normal file
115
src/middlewares/authorization.rs
Normal file
@@ -0,0 +1,115 @@
|
|||||||
|
use crate::extractors::authorized_user;
|
||||||
|
use crate::extractors::base::FromRequestAsync;
|
||||||
|
use actix_web::body::{BoxBody, EitherBody};
|
||||||
|
use actix_web::dev::{Payload, Service, ServiceRequest, ServiceResponse, Transform, forward_ready};
|
||||||
|
use actix_web::{Error, HttpRequest, ResponseError};
|
||||||
|
use futures_util::future::LocalBoxFuture;
|
||||||
|
use std::future::{Ready, ready};
|
||||||
|
use std::rc::Rc;
|
||||||
|
use database::entity::User;
|
||||||
|
|
||||||
|
/// Middleware guard working with JWT tokens.
|
||||||
|
pub struct JWTAuthorization {
|
||||||
|
/// List of ignored endpoints.
|
||||||
|
pub ignore: &'static [&'static str],
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for JWTAuthorization {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self { ignore: &[] }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<S, B> Transform<S, ServiceRequest> for JWTAuthorization
|
||||||
|
where
|
||||||
|
S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = Error> + 'static,
|
||||||
|
S::Future: 'static,
|
||||||
|
B: 'static,
|
||||||
|
{
|
||||||
|
type Response = ServiceResponse<EitherBody<B, BoxBody>>;
|
||||||
|
type Error = Error;
|
||||||
|
type Transform = JWTAuthorizationMiddleware<S>;
|
||||||
|
type InitError = ();
|
||||||
|
type Future = Ready<Result<Self::Transform, Self::InitError>>;
|
||||||
|
|
||||||
|
fn new_transform(&self, service: S) -> Self::Future {
|
||||||
|
ready(Ok(JWTAuthorizationMiddleware {
|
||||||
|
service: Rc::new(service),
|
||||||
|
ignore: self.ignore,
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct JWTAuthorizationMiddleware<S> {
|
||||||
|
service: Rc<S>,
|
||||||
|
/// List of ignored endpoints.
|
||||||
|
ignore: &'static [&'static str],
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<S, B> JWTAuthorizationMiddleware<S>
|
||||||
|
where
|
||||||
|
S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = Error>,
|
||||||
|
S::Future: 'static,
|
||||||
|
B: 'static,
|
||||||
|
{
|
||||||
|
/// Checking the validity of the token.
|
||||||
|
async fn check_authorization(req: &HttpRequest) -> Result<(), authorized_user::Error> {
|
||||||
|
let mut payload = Payload::None;
|
||||||
|
|
||||||
|
User::from_request_async(req, &mut payload)
|
||||||
|
.await
|
||||||
|
.map(|_| ())
|
||||||
|
.map_err(|e| e.as_error::<authorized_user::Error>().unwrap().clone())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn should_skip(&self, req: &ServiceRequest) -> bool {
|
||||||
|
let path = req.match_info().unprocessed();
|
||||||
|
|
||||||
|
self.ignore.iter().any(|ignore| {
|
||||||
|
if !path.starts_with(ignore) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(other) = path.as_bytes().iter().nth(ignore.len()) {
|
||||||
|
return ['?' as u8, '/' as u8].contains(other);
|
||||||
|
}
|
||||||
|
|
||||||
|
true
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<S, B> Service<ServiceRequest> for JWTAuthorizationMiddleware<S>
|
||||||
|
where
|
||||||
|
S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = Error> + 'static,
|
||||||
|
S::Future: 'static,
|
||||||
|
B: 'static,
|
||||||
|
{
|
||||||
|
type Response = ServiceResponse<EitherBody<B, BoxBody>>;
|
||||||
|
type Error = Error;
|
||||||
|
type Future = LocalBoxFuture<'static, Result<Self::Response, Self::Error>>;
|
||||||
|
|
||||||
|
forward_ready!(service);
|
||||||
|
|
||||||
|
fn call(&self, req: ServiceRequest) -> Self::Future {
|
||||||
|
if self.should_skip(&req) {
|
||||||
|
let fut = self.service.call(req);
|
||||||
|
return Box::pin(async move { Ok(fut.await?.map_into_left_body()) });
|
||||||
|
}
|
||||||
|
|
||||||
|
let service = Rc::clone(&self.service);
|
||||||
|
|
||||||
|
Box::pin(async move {
|
||||||
|
match Self::check_authorization(req.request()).await {
|
||||||
|
Ok(_) => {
|
||||||
|
let fut = service.call(req).await?;
|
||||||
|
Ok(fut.map_into_left_body())
|
||||||
|
}
|
||||||
|
Err(err) => Ok(ServiceResponse::new(
|
||||||
|
req.into_parts().0,
|
||||||
|
err.error_response().map_into_right_body(),
|
||||||
|
)),
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
64
src/middlewares/content_type.rs
Normal file
64
src/middlewares/content_type.rs
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
use actix_web::Error;
|
||||||
|
use actix_web::body::{BoxBody, EitherBody};
|
||||||
|
use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform, forward_ready};
|
||||||
|
use actix_web::http::header;
|
||||||
|
use actix_web::http::header::HeaderValue;
|
||||||
|
use futures_util::future::LocalBoxFuture;
|
||||||
|
use std::future::{Ready, ready};
|
||||||
|
|
||||||
|
/// Middleware to specify the encoding in the Content-Type header.
|
||||||
|
pub struct ContentTypeBootstrap;
|
||||||
|
|
||||||
|
impl<S, B> Transform<S, ServiceRequest> for ContentTypeBootstrap
|
||||||
|
where
|
||||||
|
S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = Error>,
|
||||||
|
S::Future: 'static,
|
||||||
|
B: 'static,
|
||||||
|
{
|
||||||
|
type Response = ServiceResponse<EitherBody<B, BoxBody>>;
|
||||||
|
type Error = Error;
|
||||||
|
type Transform = ContentTypeMiddleware<S>;
|
||||||
|
type InitError = ();
|
||||||
|
type Future = Ready<Result<Self::Transform, Self::InitError>>;
|
||||||
|
|
||||||
|
fn new_transform(&self, service: S) -> Self::Future {
|
||||||
|
ready(Ok(ContentTypeMiddleware { service }))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct ContentTypeMiddleware<S> {
|
||||||
|
service: S,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a, S, B> Service<ServiceRequest> for ContentTypeMiddleware<S>
|
||||||
|
where
|
||||||
|
S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = Error>,
|
||||||
|
S::Future: 'static,
|
||||||
|
B: 'static,
|
||||||
|
{
|
||||||
|
type Response = ServiceResponse<EitherBody<B, BoxBody>>;
|
||||||
|
type Error = Error;
|
||||||
|
type Future = LocalBoxFuture<'static, Result<Self::Response, Self::Error>>;
|
||||||
|
|
||||||
|
forward_ready!(service);
|
||||||
|
|
||||||
|
fn call(&self, req: ServiceRequest) -> Self::Future {
|
||||||
|
let fut = self.service.call(req);
|
||||||
|
|
||||||
|
Box::pin(async move {
|
||||||
|
let mut response = fut.await?;
|
||||||
|
|
||||||
|
let headers = response.response_mut().headers_mut();
|
||||||
|
if let Some(content_type) = headers.get("Content-Type") {
|
||||||
|
if content_type == "application/json" {
|
||||||
|
headers.insert(
|
||||||
|
header::CONTENT_TYPE,
|
||||||
|
HeaderValue::from_static("application/json; charset=utf8"),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(response.map_into_left_body())
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
19
src/middlewares/error.rs
Normal file
19
src/middlewares/error.rs
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use std::fmt::Display;
|
||||||
|
use std::fmt::Write;
|
||||||
|
|
||||||
|
/// Server response to errors within Middleware.
|
||||||
|
#[derive(Serialize, Deserialize)]
|
||||||
|
pub struct MiddlewareError<T: Display> {
|
||||||
|
code: T,
|
||||||
|
message: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T: Display + Serialize> MiddlewareError<T> {
|
||||||
|
pub fn new(code: T) -> Self {
|
||||||
|
let mut message = String::new();
|
||||||
|
write!(&mut message, "{}", code).unwrap();
|
||||||
|
|
||||||
|
Self { code, message }
|
||||||
|
}
|
||||||
|
}
|
||||||
4
src/middlewares/mod.rs
Normal file
4
src/middlewares/mod.rs
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
pub mod error;
|
||||||
|
|
||||||
|
pub mod authorization;
|
||||||
|
pub mod content_type;
|
||||||
@@ -1,2 +1,8 @@
|
|||||||
pub mod sign_in;
|
mod shared;
|
||||||
mod schema;
|
mod sign_in;
|
||||||
|
mod sign_up;
|
||||||
|
|
||||||
|
pub use sign_in::*;
|
||||||
|
pub use sign_up::*;
|
||||||
|
|
||||||
|
// TODO: change-password
|
||||||
|
|||||||
@@ -1,56 +0,0 @@
|
|||||||
use crate::database::models::User;
|
|
||||||
use serde::{Deserialize, Serialize, Serializer};
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
pub struct SignInDto {
|
|
||||||
pub username: String,
|
|
||||||
pub password: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct SignInResult(Result<SignInOk, SignInErr>);
|
|
||||||
|
|
||||||
#[derive(Serialize)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct SignInOk {
|
|
||||||
id: String,
|
|
||||||
access_token: String,
|
|
||||||
group: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize)]
|
|
||||||
pub struct SignInErr {
|
|
||||||
code: SignInErrCode,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Serialize)]
|
|
||||||
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
|
|
||||||
pub enum SignInErrCode {
|
|
||||||
IncorrectCredentials,
|
|
||||||
InvalidVkAccessToken,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl SignInResult {
|
|
||||||
pub fn ok(user: &User) -> Self {
|
|
||||||
Self(Ok(SignInOk {
|
|
||||||
id: user.id.clone(),
|
|
||||||
access_token: user.access_token.clone(),
|
|
||||||
group: user.group.clone(),
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn err(code: SignInErrCode) -> SignInResult {
|
|
||||||
Self(Err(SignInErr { code }))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Serialize for SignInResult {
|
|
||||||
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
|
||||||
where
|
|
||||||
S: Serializer,
|
|
||||||
{
|
|
||||||
match &self.0 {
|
|
||||||
Ok(ok) => serializer.serialize_some(&ok),
|
|
||||||
Err(err) => serializer.serialize_some(&err),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
83
src/routes/auth/shared.rs
Normal file
83
src/routes/auth/shared.rs
Normal file
@@ -0,0 +1,83 @@
|
|||||||
|
use jsonwebtoken::errors::ErrorKind;
|
||||||
|
use jsonwebtoken::{Algorithm, DecodingKey, Validation, decode};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Deserialize, Serialize)]
|
||||||
|
struct TokenData {
|
||||||
|
iis: String,
|
||||||
|
sub: i32,
|
||||||
|
app: i32,
|
||||||
|
exp: i32,
|
||||||
|
iat: i32,
|
||||||
|
jti: i32,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
struct Claims {
|
||||||
|
sub: i32,
|
||||||
|
iis: String,
|
||||||
|
jti: i32,
|
||||||
|
app: i32,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub enum Error {
|
||||||
|
JwtError(ErrorKind),
|
||||||
|
InvalidSignature,
|
||||||
|
InvalidToken,
|
||||||
|
Expired,
|
||||||
|
UnknownIssuer(String),
|
||||||
|
UnknownType(i32),
|
||||||
|
UnknownClientId(i32),
|
||||||
|
}
|
||||||
|
|
||||||
|
//noinspection SpellCheckingInspection
|
||||||
|
const VK_PUBLIC_KEY: &str = concat!(
|
||||||
|
"-----BEGIN PUBLIC KEY-----\n",
|
||||||
|
"MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvsvJlhFX9Ju/pvCz1frB\n",
|
||||||
|
"DgJs592VjdwQuRAmnlJAItyHkoiDIOEocPzgcUBTbDf1plDcTyO2RCkUt0pz0WK6\n",
|
||||||
|
"6HNhpJyIfARjaWHeUlv4TpuHXAJJsBKklkU2gf1cjID+40sWWYjtq5dAkXnSJUVA\n",
|
||||||
|
"UR+sq0lJ7GmTdJtAr8hzESqGEcSP15PTs7VUdHZ1nkC2XgkuR8KmKAUb388ji1Q4\n",
|
||||||
|
"n02rJNOPQgd9r0ac4N2v/yTAFPXumO78N25bpcuWf5vcL9e8THk/U2zt7wf+aAWL\n",
|
||||||
|
"748e0pREqNluTBJNZfmhC79Xx6GHtwqHyyduiqfPmejmiujNM/rqnA4e30Tg86Yn\n",
|
||||||
|
"cNZ6vLJyF72Eva1wXchukH/aLispbY+EqNPxxn4zzCWaLKHG87gaCxpVv9Tm0jSD\n",
|
||||||
|
"2es22NjrUbtb+2pAGnXbyDp2eGUqw0RrTQFZqt/VcmmSCE45FlcZMT28otrwG1ZB\n",
|
||||||
|
"kZAb5Js3wLEch3ZfYL8sjhyNRPBmJBrAvzrd8qa3rdUjkC9sKyjGAaHu2MNmFl1Y\n",
|
||||||
|
"JFQ3J54tGpkGgJjD7Kz3w0K6OiPDlVCNQN5sqXm24fCw85Pbi8SJiaLTp/CImrs1\n",
|
||||||
|
"Z3nHW5q8hljA7OGmqfOP0nZS/5zW9GHPyepsI1rW6CympYLJ15WeNzePxYS5KEX9\n",
|
||||||
|
"EncmkSD9b45ge95hJeJZteUCAwEAAQ==\n",
|
||||||
|
"-----END PUBLIC KEY-----"
|
||||||
|
);
|
||||||
|
|
||||||
|
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(Algorithm::RS256)) {
|
||||||
|
Ok(token_data) => {
|
||||||
|
let claims = token_data.claims;
|
||||||
|
|
||||||
|
if claims.iis != "VK" {
|
||||||
|
Err(Error::UnknownIssuer(claims.iis))
|
||||||
|
} else if claims.jti != 21 {
|
||||||
|
Err(Error::UnknownType(claims.jti))
|
||||||
|
} else if claims.app != client_id {
|
||||||
|
Err(Error::UnknownClientId(claims.app))
|
||||||
|
} else {
|
||||||
|
Ok(claims.sub)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(err) => Err(match err.into_kind() {
|
||||||
|
ErrorKind::InvalidToken => Error::InvalidToken,
|
||||||
|
ErrorKind::InvalidSignature => Error::InvalidSignature,
|
||||||
|
ErrorKind::InvalidAlgorithmName => Error::InvalidToken,
|
||||||
|
ErrorKind::MissingRequiredClaim(_) => Error::InvalidToken,
|
||||||
|
ErrorKind::ExpiredSignature => Error::Expired,
|
||||||
|
ErrorKind::InvalidAlgorithm => Error::InvalidToken,
|
||||||
|
ErrorKind::MissingAlgorithm => Error::InvalidToken,
|
||||||
|
ErrorKind::Base64(_) => Error::InvalidToken,
|
||||||
|
ErrorKind::Json(_) => Error::InvalidToken,
|
||||||
|
ErrorKind::Utf8(_) => Error::InvalidToken,
|
||||||
|
kind => Error::JwtError(kind),
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,33 +1,238 @@
|
|||||||
use crate::database::driver;
|
use self::schema::*;
|
||||||
use crate::database::models::User;
|
use crate::routes::auth::shared::parse_vk_id;
|
||||||
use crate::routes::auth::schema::SignInErrCode::IncorrectCredentials;
|
use crate::routes::auth::sign_in::schema::SignInData::{Default, VkOAuth};
|
||||||
use crate::routes::auth::schema::{SignInDto, SignInResult};
|
use crate::routes::schema::user::UserResponse;
|
||||||
use crate::{AppState, utility};
|
use crate::routes::schema::ResponseError;
|
||||||
|
use crate::{utility, AppState};
|
||||||
use actix_web::{post, web};
|
use actix_web::{post, web};
|
||||||
use diesel::SaveChangesDsl;
|
use database::query::Query;
|
||||||
use std::ops::DerefMut;
|
|
||||||
use web::Json;
|
use web::Json;
|
||||||
|
|
||||||
#[post("/sign-in")]
|
async fn sign_in_combined(
|
||||||
pub async fn sign_in(data: Json<SignInDto>, app_state: web::Data<AppState>) -> Json<SignInResult> {
|
data: SignInData,
|
||||||
let result = match driver::users::get_by_username(&app_state.database, data.username.clone()) {
|
app_state: &web::Data<AppState>,
|
||||||
Ok(mut user) => match bcrypt::verify(&data.password, &user.password) {
|
) -> Result<UserResponse, ErrorCode> {
|
||||||
Ok(true) => {
|
let db = app_state.get_database();
|
||||||
let mut lock = app_state.connection();
|
|
||||||
let conn = lock.deref_mut();
|
|
||||||
|
|
||||||
user.access_token = utility::jwt::encode(&user.id);
|
let user = match &data {
|
||||||
|
Default(data) => Query::find_user_by_username(db, &data.username).await,
|
||||||
|
VkOAuth(id) => Query::find_user_by_vk_id(db, *id).await,
|
||||||
|
}
|
||||||
|
.ok()
|
||||||
|
.flatten();
|
||||||
|
|
||||||
user.save_changes::<User>(conn)
|
match user {
|
||||||
.expect("Failed to update user");
|
Some(user) => {
|
||||||
|
if let Default(data) = data {
|
||||||
|
if user.password.is_none() {
|
||||||
|
return Err(ErrorCode::IncorrectCredentials);
|
||||||
|
}
|
||||||
|
|
||||||
SignInResult::ok(&user)
|
match bcrypt::verify(&data.password, &user.password.as_ref().unwrap()) {
|
||||||
|
Ok(result) => {
|
||||||
|
if !result {
|
||||||
|
return Err(ErrorCode::IncorrectCredentials);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(_) => {
|
||||||
|
return Err(ErrorCode::IncorrectCredentials);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Ok(false) | Err(_) => SignInResult::err(IncorrectCredentials),
|
|
||||||
},
|
|
||||||
|
|
||||||
Err(_) => SignInResult::err(IncorrectCredentials),
|
let access_token = utility::jwt::encode(&user.id);
|
||||||
};
|
Ok(UserResponse::from_user_with_token(user, access_token))
|
||||||
|
}
|
||||||
|
|
||||||
Json(result)
|
None => Err(ErrorCode::IncorrectCredentials),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(responses(
|
||||||
|
(status = OK, body = UserResponse),
|
||||||
|
(status = NOT_ACCEPTABLE, body = ResponseError<ErrorCode>)
|
||||||
|
))]
|
||||||
|
#[post("/sign-in")]
|
||||||
|
pub async fn sign_in(data: Json<Request>, app_state: web::Data<AppState>) -> ServiceResponse {
|
||||||
|
sign_in_combined(Default(data.into_inner()), &app_state)
|
||||||
|
.await
|
||||||
|
.into()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(responses(
|
||||||
|
(status = OK, body = UserResponse),
|
||||||
|
(status = NOT_ACCEPTABLE, body = ResponseError<ErrorCode>)
|
||||||
|
))]
|
||||||
|
#[post("/sign-in-vk")]
|
||||||
|
pub async fn sign_in_vk(
|
||||||
|
data_json: Json<vk::Request>,
|
||||||
|
app_state: web::Data<AppState>,
|
||||||
|
) -> ServiceResponse {
|
||||||
|
let data = data_json.into_inner();
|
||||||
|
|
||||||
|
match parse_vk_id(&data.access_token, app_state.get_env().vk_id.client_id) {
|
||||||
|
Ok(id) => sign_in_combined(VkOAuth(id), &app_state).await,
|
||||||
|
Err(_) => Err(ErrorCode::InvalidVkAccessToken),
|
||||||
|
}
|
||||||
|
.into()
|
||||||
|
}
|
||||||
|
|
||||||
|
mod schema {
|
||||||
|
use crate::routes::schema::user::UserResponse;
|
||||||
|
use actix_macros::ErrResponse;
|
||||||
|
use derive_more::Display;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
|
||||||
|
#[derive(Deserialize, Serialize, ToSchema)]
|
||||||
|
#[schema(as = SignIn::Request)]
|
||||||
|
pub struct Request {
|
||||||
|
/// User name.
|
||||||
|
#[schema(examples("n08i40k"))]
|
||||||
|
pub username: String,
|
||||||
|
|
||||||
|
/// Password.
|
||||||
|
pub password: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub mod vk {
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, ToSchema)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
#[schema(as = SignInVk::Request)]
|
||||||
|
pub struct Request {
|
||||||
|
/// VK ID token.
|
||||||
|
pub access_token: String,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub type ServiceResponse = crate::routes::schema::Response<UserResponse, ErrorCode>;
|
||||||
|
|
||||||
|
#[derive(Clone, Serialize, Display, ToSchema, ErrResponse)]
|
||||||
|
#[schema(as = SignIn::ErrorCode)]
|
||||||
|
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
|
||||||
|
#[status_code = "actix_web::http::StatusCode::NOT_ACCEPTABLE"]
|
||||||
|
pub enum ErrorCode {
|
||||||
|
/// Incorrect username or password.
|
||||||
|
#[display("Incorrect username or password.")]
|
||||||
|
IncorrectCredentials,
|
||||||
|
|
||||||
|
/// Invalid VK ID token.
|
||||||
|
#[display("Invalid VK ID token.")]
|
||||||
|
InvalidVkAccessToken,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Internal
|
||||||
|
|
||||||
|
/// Type of authorization.
|
||||||
|
pub enum SignInData {
|
||||||
|
/// User and password name and password.
|
||||||
|
Default(Request),
|
||||||
|
|
||||||
|
/// Identifier of the attached account VK.
|
||||||
|
VkOAuth(i32),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::schema::*;
|
||||||
|
use crate::routes::auth::sign_in::sign_in;
|
||||||
|
use crate::test_env::tests::{static_app_state, test_app_state, test_env};
|
||||||
|
use actix_test::test_app;
|
||||||
|
use actix_web::dev::ServiceResponse;
|
||||||
|
use actix_web::http::Method;
|
||||||
|
use actix_web::http::StatusCode;
|
||||||
|
use actix_web::test;
|
||||||
|
use database::entity::sea_orm_active_enums::UserRole;
|
||||||
|
use database::entity::ActiveUser;
|
||||||
|
use database::sea_orm::{ActiveModelTrait, Set};
|
||||||
|
use sha1::{Digest, Sha1};
|
||||||
|
use std::fmt::Write;
|
||||||
|
|
||||||
|
async fn sign_in_client(data: Request) -> ServiceResponse {
|
||||||
|
let app = test_app(test_app_state().await, sign_in).await;
|
||||||
|
|
||||||
|
let req = test::TestRequest::with_uri("/sign-in")
|
||||||
|
.method(Method::POST)
|
||||||
|
.set_json(data)
|
||||||
|
.to_request();
|
||||||
|
|
||||||
|
test::call_service(&app, req).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn prepare(username: String) {
|
||||||
|
let id = {
|
||||||
|
let mut sha = Sha1::new();
|
||||||
|
sha.update(&username);
|
||||||
|
|
||||||
|
let result = sha.finalize();
|
||||||
|
let bytes = &result[..12];
|
||||||
|
|
||||||
|
let mut hex = String::new();
|
||||||
|
for byte in bytes {
|
||||||
|
write!(&mut hex, "{:02x}", byte).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
hex
|
||||||
|
};
|
||||||
|
|
||||||
|
test_env();
|
||||||
|
|
||||||
|
let app_state = static_app_state().await;
|
||||||
|
|
||||||
|
let active_user = ActiveUser {
|
||||||
|
id: Set(id.clone()),
|
||||||
|
username: Set(username),
|
||||||
|
password: Set(Some(
|
||||||
|
bcrypt::hash("example".to_string(), bcrypt::DEFAULT_COST).unwrap(),
|
||||||
|
)),
|
||||||
|
vk_id: Set(None),
|
||||||
|
telegram_id: Set(None),
|
||||||
|
group: Set(Some("ИС-214/23".to_string())),
|
||||||
|
role: Set(UserRole::Student),
|
||||||
|
android_version: Set(None),
|
||||||
|
};
|
||||||
|
|
||||||
|
active_user
|
||||||
|
.save(app_state.get_database())
|
||||||
|
.await
|
||||||
|
.expect("Failed to save user");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::test]
|
||||||
|
async fn sign_in_ok() {
|
||||||
|
prepare("test::sign_in_ok".to_string()).await;
|
||||||
|
|
||||||
|
let resp = sign_in_client(Request {
|
||||||
|
username: "test::sign_in_ok".to_string(),
|
||||||
|
password: "example".to_string(),
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
|
||||||
|
assert_eq!(resp.status(), StatusCode::OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::test]
|
||||||
|
async fn sign_in_err() {
|
||||||
|
prepare("test::sign_in_err".to_string()).await;
|
||||||
|
|
||||||
|
let invalid_username = sign_in_client(Request {
|
||||||
|
username: "test::sign_in_err::username".to_string(),
|
||||||
|
password: "example".to_string(),
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
|
||||||
|
assert_eq!(invalid_username.status(), StatusCode::NOT_ACCEPTABLE);
|
||||||
|
|
||||||
|
let invalid_password = sign_in_client(Request {
|
||||||
|
username: "test::sign_in_err".to_string(),
|
||||||
|
password: "bad_password".to_string(),
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
|
||||||
|
assert_eq!(invalid_password.status(), StatusCode::NOT_ACCEPTABLE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
378
src/routes/auth/sign_up.rs
Normal file
378
src/routes/auth/sign_up.rs
Normal file
@@ -0,0 +1,378 @@
|
|||||||
|
use self::schema::*;
|
||||||
|
use crate::routes::auth::shared::parse_vk_id;
|
||||||
|
use crate::routes::schema::user::UserResponse;
|
||||||
|
use crate::routes::schema::ResponseError;
|
||||||
|
use crate::{utility, AppState};
|
||||||
|
use actix_web::{post, web};
|
||||||
|
use database::entity::sea_orm_active_enums::UserRole;
|
||||||
|
use database::entity::ActiveUser;
|
||||||
|
use database::query::Query;
|
||||||
|
use database::sea_orm::ActiveModelTrait;
|
||||||
|
use std::ops::Deref;
|
||||||
|
use web::Json;
|
||||||
|
|
||||||
|
async fn sign_up_combined(
|
||||||
|
data: SignUpData,
|
||||||
|
app_state: &web::Data<AppState>,
|
||||||
|
) -> Result<UserResponse, ErrorCode> {
|
||||||
|
// If user selected forbidden role.
|
||||||
|
if data.role == UserRole::Admin {
|
||||||
|
return Err(ErrorCode::DisallowedRole);
|
||||||
|
}
|
||||||
|
|
||||||
|
if !app_state
|
||||||
|
.get_schedule_snapshot("eng_polytechnic")
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.data
|
||||||
|
.groups
|
||||||
|
.contains_key(&data.group)
|
||||||
|
{
|
||||||
|
return Err(ErrorCode::InvalidGroupName);
|
||||||
|
}
|
||||||
|
|
||||||
|
let db = app_state.get_database();
|
||||||
|
|
||||||
|
// If user with specified username already exists.O
|
||||||
|
if Query::find_user_by_username(db, &data.username)
|
||||||
|
.await
|
||||||
|
.is_ok_and(|user| user.is_some())
|
||||||
|
{
|
||||||
|
return Err(ErrorCode::UsernameAlreadyExists);
|
||||||
|
}
|
||||||
|
|
||||||
|
// If user with specified VKID already exists.
|
||||||
|
if let Some(id) = data.vk_id {
|
||||||
|
if Query::find_user_by_vk_id(db, id)
|
||||||
|
.await
|
||||||
|
.is_ok_and(|user| user.is_some())
|
||||||
|
{
|
||||||
|
return Err(ErrorCode::VkAlreadyExists);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let active_user: ActiveUser = data.into();
|
||||||
|
let user = active_user.insert(db).await.unwrap();
|
||||||
|
let access_token = utility::jwt::encode(&user.id);
|
||||||
|
|
||||||
|
Ok(UserResponse::from_user_with_token(user, access_token))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(responses(
|
||||||
|
(status = OK, body = UserResponse),
|
||||||
|
(status = NOT_ACCEPTABLE, body = ResponseError<ErrorCode>)
|
||||||
|
))]
|
||||||
|
#[post("/sign-up")]
|
||||||
|
pub async fn sign_up(data_json: Json<Request>, app_state: web::Data<AppState>) -> ServiceResponse {
|
||||||
|
let data = data_json.into_inner();
|
||||||
|
|
||||||
|
sign_up_combined(
|
||||||
|
SignUpData {
|
||||||
|
username: data.username,
|
||||||
|
password: Some(data.password),
|
||||||
|
vk_id: None,
|
||||||
|
group: data.group,
|
||||||
|
role: data.role,
|
||||||
|
version: data.version,
|
||||||
|
},
|
||||||
|
&app_state,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.into()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(responses(
|
||||||
|
(status = OK, body = UserResponse),
|
||||||
|
(status = NOT_ACCEPTABLE, body = ResponseError<ErrorCode>)
|
||||||
|
))]
|
||||||
|
#[post("/sign-up-vk")]
|
||||||
|
pub async fn sign_up_vk(
|
||||||
|
data_json: Json<vk::Request>,
|
||||||
|
app_state: web::Data<AppState>,
|
||||||
|
) -> ServiceResponse {
|
||||||
|
let data = data_json.into_inner();
|
||||||
|
|
||||||
|
match parse_vk_id(&data.access_token, app_state.get_env().vk_id.client_id) {
|
||||||
|
Ok(id) => {
|
||||||
|
sign_up_combined(
|
||||||
|
SignUpData {
|
||||||
|
username: data.username,
|
||||||
|
password: None,
|
||||||
|
vk_id: Some(id),
|
||||||
|
group: data.group,
|
||||||
|
role: data.role,
|
||||||
|
version: data.version,
|
||||||
|
},
|
||||||
|
&app_state,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
Err(_) => Err(ErrorCode::InvalidVkAccessToken),
|
||||||
|
}
|
||||||
|
.into()
|
||||||
|
}
|
||||||
|
|
||||||
|
mod schema {
|
||||||
|
use crate::routes::schema::user::UserResponse;
|
||||||
|
use actix_macros::ErrResponse;
|
||||||
|
use database::entity::sea_orm_active_enums::UserRole;
|
||||||
|
use database::entity::ActiveUser;
|
||||||
|
use database::sea_orm::Set;
|
||||||
|
use derive_more::Display;
|
||||||
|
use objectid::ObjectId;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
/// WEB
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, utoipa::ToSchema)]
|
||||||
|
#[schema(as = SignUp::Request)]
|
||||||
|
pub struct Request {
|
||||||
|
/// User name.
|
||||||
|
#[schema(examples("n08i40k"))]
|
||||||
|
pub username: String,
|
||||||
|
|
||||||
|
/// Password.
|
||||||
|
pub password: String,
|
||||||
|
|
||||||
|
/// Group.
|
||||||
|
#[schema(examples("ИС-214/23"))]
|
||||||
|
pub group: String,
|
||||||
|
|
||||||
|
/// Role.
|
||||||
|
pub role: UserRole,
|
||||||
|
|
||||||
|
/// Version of the installed Polytechnic+ application.
|
||||||
|
#[schema(examples("3.0.0"))]
|
||||||
|
pub version: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub mod vk {
|
||||||
|
use database::entity::sea_orm_active_enums::UserRole;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, utoipa::ToSchema)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
#[schema(as = SignUpVk::Request)]
|
||||||
|
pub struct Request {
|
||||||
|
/// VK ID token.
|
||||||
|
pub access_token: String,
|
||||||
|
|
||||||
|
/// User name.
|
||||||
|
#[schema(examples("n08i40k"))]
|
||||||
|
pub username: String,
|
||||||
|
|
||||||
|
/// Group.
|
||||||
|
#[schema(examples("ИС-214/23"))]
|
||||||
|
pub group: String,
|
||||||
|
|
||||||
|
/// Role.
|
||||||
|
pub role: UserRole,
|
||||||
|
|
||||||
|
/// Version of the installed Polytechnic+ application.
|
||||||
|
#[schema(examples("3.0.0"))]
|
||||||
|
pub version: String,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub type ServiceResponse = crate::routes::schema::Response<UserResponse, ErrorCode>;
|
||||||
|
|
||||||
|
#[derive(Clone, Serialize, Display, utoipa::ToSchema, ErrResponse)]
|
||||||
|
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
|
||||||
|
#[schema(as = SignUp::ErrorCode)]
|
||||||
|
#[status_code = "actix_web::http::StatusCode::NOT_ACCEPTABLE"]
|
||||||
|
pub enum ErrorCode {
|
||||||
|
/// Conveyed the role of Admin.
|
||||||
|
#[display("Conveyed the role of Admin.")]
|
||||||
|
DisallowedRole,
|
||||||
|
|
||||||
|
/// Unknown name of the group.
|
||||||
|
#[display("Unknown name of the group.")]
|
||||||
|
InvalidGroupName,
|
||||||
|
|
||||||
|
/// User with this name is already registered.
|
||||||
|
#[display("User with this name is already registered.")]
|
||||||
|
UsernameAlreadyExists,
|
||||||
|
|
||||||
|
/// Invalid VK ID token.
|
||||||
|
#[display("Invalid VK ID token.")]
|
||||||
|
InvalidVkAccessToken,
|
||||||
|
|
||||||
|
/// User with such an account VK is already registered.
|
||||||
|
#[display("User with such an account VK is already registered.")]
|
||||||
|
VkAlreadyExists,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Internal
|
||||||
|
|
||||||
|
/// Data for registration.
|
||||||
|
pub struct SignUpData {
|
||||||
|
// TODO: сделать ограничение на минимальную и максимальную длину при регистрации и смене.
|
||||||
|
/// User name.
|
||||||
|
pub username: String,
|
||||||
|
|
||||||
|
/// Password.
|
||||||
|
///
|
||||||
|
/// Should be present even if registration occurs using the VK ID token.
|
||||||
|
pub password: Option<String>,
|
||||||
|
|
||||||
|
/// Account identifier VK.
|
||||||
|
pub vk_id: Option<i32>,
|
||||||
|
|
||||||
|
/// Group.
|
||||||
|
pub group: String,
|
||||||
|
|
||||||
|
/// Role.
|
||||||
|
pub role: UserRole,
|
||||||
|
|
||||||
|
/// Version of the installed Polytechnic+ application.
|
||||||
|
pub version: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Into<ActiveUser> for SignUpData {
|
||||||
|
fn into(self) -> ActiveUser {
|
||||||
|
assert_ne!(self.password.is_some(), self.vk_id.is_some());
|
||||||
|
|
||||||
|
ActiveUser {
|
||||||
|
id: Set(ObjectId::new().unwrap().to_string()),
|
||||||
|
username: Set(self.username),
|
||||||
|
password: Set(self
|
||||||
|
.password
|
||||||
|
.map(|x| bcrypt::hash(x, bcrypt::DEFAULT_COST).unwrap())),
|
||||||
|
vk_id: Set(self.vk_id),
|
||||||
|
telegram_id: Set(None),
|
||||||
|
group: Set(Some(self.group)),
|
||||||
|
role: Set(self.role),
|
||||||
|
android_version: Set(Some(self.version)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
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 actix_test::test_app;
|
||||||
|
use actix_web::dev::ServiceResponse;
|
||||||
|
use actix_web::http::Method;
|
||||||
|
use actix_web::http::StatusCode;
|
||||||
|
use actix_web::test;
|
||||||
|
use database::entity::sea_orm_active_enums::UserRole;
|
||||||
|
use database::entity::{UserColumn, UserEntity};
|
||||||
|
use database::sea_orm::ColumnTrait;
|
||||||
|
use database::sea_orm::{EntityTrait, QueryFilter};
|
||||||
|
use std::ops::Deref;
|
||||||
|
|
||||||
|
struct SignUpPartial<'a> {
|
||||||
|
username: &'a str,
|
||||||
|
group: &'a str,
|
||||||
|
role: UserRole,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn sign_up_client(data: SignUpPartial<'_>) -> ServiceResponse {
|
||||||
|
let app = test_app(test_app_state().await, sign_up).await;
|
||||||
|
|
||||||
|
let req = test::TestRequest::with_uri("/sign-up")
|
||||||
|
.method(Method::POST)
|
||||||
|
.set_json(Request {
|
||||||
|
username: data.username.to_string(),
|
||||||
|
password: "example".to_string(),
|
||||||
|
group: data.group.to_string(),
|
||||||
|
role: data.role.clone(),
|
||||||
|
version: "1.0.0".to_string(),
|
||||||
|
})
|
||||||
|
.to_request();
|
||||||
|
|
||||||
|
test::call_service(&app, req).await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::test]
|
||||||
|
async fn sign_up_valid() {
|
||||||
|
// prepare
|
||||||
|
|
||||||
|
test_env();
|
||||||
|
|
||||||
|
let app_state = static_app_state().await;
|
||||||
|
|
||||||
|
UserEntity::delete_many()
|
||||||
|
.filter(UserColumn::Username.eq("test::sign_up_valid"))
|
||||||
|
.exec(app_state.get_database())
|
||||||
|
.await
|
||||||
|
.expect("Failed to delete user");
|
||||||
|
|
||||||
|
// test
|
||||||
|
|
||||||
|
let resp = sign_up_client(SignUpPartial {
|
||||||
|
username: "test::sign_up_valid",
|
||||||
|
group: "ИС-214/23",
|
||||||
|
role: UserRole::Student,
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
|
||||||
|
assert_eq!(resp.status(), StatusCode::OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::test]
|
||||||
|
async fn sign_up_multiple() {
|
||||||
|
// prepare
|
||||||
|
|
||||||
|
test_env();
|
||||||
|
|
||||||
|
let app_state = static_app_state().await;
|
||||||
|
|
||||||
|
UserEntity::delete_many()
|
||||||
|
.filter(UserColumn::Username.eq("test::sign_up_multiple"))
|
||||||
|
.exec(app_state.get_database())
|
||||||
|
.await
|
||||||
|
.expect("Failed to delete user");
|
||||||
|
|
||||||
|
let create = sign_up_client(SignUpPartial {
|
||||||
|
username: "test::sign_up_multiple",
|
||||||
|
group: "ИС-214/23",
|
||||||
|
role: UserRole::Student,
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
|
||||||
|
assert_eq!(create.status(), StatusCode::OK);
|
||||||
|
|
||||||
|
let resp = sign_up_client(SignUpPartial {
|
||||||
|
username: "test::sign_up_multiple",
|
||||||
|
group: "ИС-214/23",
|
||||||
|
role: UserRole::Student,
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
|
||||||
|
assert_eq!(resp.status(), StatusCode::NOT_ACCEPTABLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::test]
|
||||||
|
async fn sign_up_invalid_role() {
|
||||||
|
test_env();
|
||||||
|
|
||||||
|
// test
|
||||||
|
let resp = sign_up_client(SignUpPartial {
|
||||||
|
username: "test::sign_up_invalid_role",
|
||||||
|
group: "ИС-214/23",
|
||||||
|
role: UserRole::Admin,
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
|
||||||
|
assert_eq!(resp.status(), StatusCode::NOT_ACCEPTABLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::test]
|
||||||
|
async fn sign_up_invalid_group() {
|
||||||
|
test_env();
|
||||||
|
|
||||||
|
// test
|
||||||
|
let resp = sign_up_client(SignUpPartial {
|
||||||
|
username: "test::sign_up_invalid_group",
|
||||||
|
group: "invalid_group",
|
||||||
|
role: UserRole::Student,
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
|
||||||
|
assert_eq!(resp.status(), StatusCode::NOT_ACCEPTABLE);
|
||||||
|
}
|
||||||
|
}
|
||||||
5
src/routes/flow/mod.rs
Normal file
5
src/routes/flow/mod.rs
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
mod telegram_auth;
|
||||||
|
mod telegram_complete;
|
||||||
|
|
||||||
|
pub use telegram_auth::*;
|
||||||
|
pub use telegram_complete::*;
|
||||||
170
src/routes/flow/telegram_auth.rs
Normal file
170
src/routes/flow/telegram_auth.rs
Normal file
@@ -0,0 +1,170 @@
|
|||||||
|
use self::schema::*;
|
||||||
|
use crate::routes::schema::ResponseError;
|
||||||
|
use crate::utility::telegram::{WebAppInitDataMap, WebAppUser};
|
||||||
|
use crate::{utility, AppState};
|
||||||
|
use actix_web::{post, web};
|
||||||
|
use chrono::{DateTime, Duration, Utc};
|
||||||
|
use database::entity::sea_orm_active_enums::UserRole;
|
||||||
|
use database::entity::ActiveUser;
|
||||||
|
use database::query::Query;
|
||||||
|
use database::sea_orm::{ActiveModelTrait, Set};
|
||||||
|
use objectid::ObjectId;
|
||||||
|
use std::ops::Deref;
|
||||||
|
use std::sync::Arc;
|
||||||
|
use web::Json;
|
||||||
|
|
||||||
|
#[utoipa::path(responses(
|
||||||
|
(status = OK, body = Response),
|
||||||
|
(status = UNAUTHORIZED, body = ResponseError<ErrorCode>),
|
||||||
|
))]
|
||||||
|
#[post("/telegram-auth")]
|
||||||
|
pub async fn telegram_auth(
|
||||||
|
data_json: Json<Request>,
|
||||||
|
app_state: web::Data<AppState>,
|
||||||
|
) -> ServiceResponse {
|
||||||
|
let init_data = WebAppInitDataMap::from_str(data_json.into_inner().init_data);
|
||||||
|
|
||||||
|
{
|
||||||
|
let env = &app_state.get_env().telegram;
|
||||||
|
|
||||||
|
if let Err(error) = init_data.verify(env.bot_id, env.test_dc) {
|
||||||
|
return Err(ErrorCode::InvalidInitData(Arc::new(error))).into();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let auth_date = DateTime::<Utc>::from_timestamp(
|
||||||
|
init_data
|
||||||
|
.data_map
|
||||||
|
.get("auth_date")
|
||||||
|
.unwrap()
|
||||||
|
.parse()
|
||||||
|
.unwrap(),
|
||||||
|
0,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
if Utc::now() - auth_date > Duration::minutes(5) {
|
||||||
|
return Err(ErrorCode::ExpiredInitData).into();
|
||||||
|
}
|
||||||
|
|
||||||
|
let web_app_user =
|
||||||
|
serde_json::from_str::<WebAppUser>(init_data.data_map.get("user").unwrap()).unwrap();
|
||||||
|
|
||||||
|
let user =
|
||||||
|
match Query::find_user_by_telegram_id(app_state.get_database(), web_app_user.id).await {
|
||||||
|
Ok(Some(value)) => Ok(value),
|
||||||
|
_ => {
|
||||||
|
let new_user = ActiveUser {
|
||||||
|
id: Set(ObjectId::new().unwrap().to_string()),
|
||||||
|
username: Set(format!("telegram_{}", web_app_user.id)), // можно оставить, а можно поменять
|
||||||
|
password: Set(None), // ибо нехуй
|
||||||
|
vk_id: Set(None),
|
||||||
|
telegram_id: Set(Some(web_app_user.id)),
|
||||||
|
group: Set(None),
|
||||||
|
role: Set(UserRole::Student), // TODO: при реге проверять данные
|
||||||
|
android_version: Set(None),
|
||||||
|
};
|
||||||
|
|
||||||
|
new_user.insert(app_state.get_database()).await
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.expect("Failed to get or add user");
|
||||||
|
|
||||||
|
let access_token = utility::jwt::encode(&user.id);
|
||||||
|
Ok(Response::new(&access_token, user.group.is_some())).into()
|
||||||
|
}
|
||||||
|
|
||||||
|
mod schema {
|
||||||
|
use crate::routes::schema::PartialOkResponse;
|
||||||
|
use crate::state::AppState;
|
||||||
|
use crate::utility::telegram::VerifyError;
|
||||||
|
use actix_macros::ErrResponse;
|
||||||
|
use actix_web::body::EitherBody;
|
||||||
|
use actix_web::cookie::time::OffsetDateTime;
|
||||||
|
use actix_web::cookie::CookieBuilder;
|
||||||
|
use actix_web::{web, HttpRequest, HttpResponse};
|
||||||
|
use derive_more::Display;
|
||||||
|
use serde::{Deserialize, Serialize, Serializer};
|
||||||
|
use std::ops::Add;
|
||||||
|
use std::sync::Arc;
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, ToSchema)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
#[schema(as = Flow::TelegramAuth::Request)]
|
||||||
|
pub struct Request {
|
||||||
|
/// Telegram WebApp init data.
|
||||||
|
pub init_data: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, ToSchema)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
#[schema(as = Flow::TelegramAuth::Response)]
|
||||||
|
pub struct Response {
|
||||||
|
// #[serde(skip)] // TODO: я пока не придумал как не отдавать сырой токен в ответе
|
||||||
|
// #[schema(ignore)]
|
||||||
|
access_token: String,
|
||||||
|
|
||||||
|
pub completed: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Response {
|
||||||
|
pub fn new(access_token: &str, completed: bool) -> Self {
|
||||||
|
Self {
|
||||||
|
access_token: access_token.to_string(),
|
||||||
|
completed,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PartialOkResponse for Response {
|
||||||
|
fn post_process(
|
||||||
|
&mut self,
|
||||||
|
request: &HttpRequest,
|
||||||
|
response: &mut HttpResponse<EitherBody<String>>,
|
||||||
|
) -> () {
|
||||||
|
let access_token = &self.access_token;
|
||||||
|
|
||||||
|
let app_state = request.app_data::<web::Data<AppState>>().unwrap();
|
||||||
|
let mini_app_host = &*app_state.get_env().telegram.mini_app_host;
|
||||||
|
|
||||||
|
let cookie = CookieBuilder::new("access_token", access_token)
|
||||||
|
.domain(mini_app_host)
|
||||||
|
.path("/")
|
||||||
|
.expires(
|
||||||
|
OffsetDateTime::now_utc().add(std::time::Duration::from_secs(60 * 60 * 24 * 7)),
|
||||||
|
)
|
||||||
|
.http_only(true)
|
||||||
|
.secure(true)
|
||||||
|
.finish();
|
||||||
|
|
||||||
|
response.add_cookie(&cookie).unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub type ServiceResponse = crate::routes::schema::Response<Response, ErrorCode>;
|
||||||
|
|
||||||
|
#[derive(Clone, ToSchema, Display, ErrResponse)]
|
||||||
|
#[status_code = "actix_web::http::StatusCode::UNAUTHORIZED"]
|
||||||
|
#[schema(as = Flow::TelegramAuth::ErrorCode)]
|
||||||
|
pub enum ErrorCode {
|
||||||
|
#[display("Invalid init data provided: {_0}")]
|
||||||
|
#[schema(value_type = String)]
|
||||||
|
InvalidInitData(Arc<VerifyError>),
|
||||||
|
|
||||||
|
#[display("Expired init data provided.")]
|
||||||
|
ExpiredInitData,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Serialize for ErrorCode {
|
||||||
|
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
||||||
|
where
|
||||||
|
S: Serializer,
|
||||||
|
{
|
||||||
|
match self {
|
||||||
|
ErrorCode::InvalidInitData(_) => serializer.serialize_str("INVALID_INIT_DATA"),
|
||||||
|
ErrorCode::ExpiredInitData => serializer.serialize_str("EXPIRED_INIT_DATA"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
105
src/routes/flow/telegram_complete.rs
Normal file
105
src/routes/flow/telegram_complete.rs
Normal file
@@ -0,0 +1,105 @@
|
|||||||
|
use self::schema::*;
|
||||||
|
use crate::extractors::base::AsyncExtractor;
|
||||||
|
use crate::routes::schema::ResponseError;
|
||||||
|
use crate::AppState;
|
||||||
|
use actix_web::{post, web};
|
||||||
|
use database::entity::User;
|
||||||
|
use database::query::Query;
|
||||||
|
use database::sea_orm::{ActiveModelTrait, IntoActiveModel, Set};
|
||||||
|
use std::ops::Deref;
|
||||||
|
use web::Json;
|
||||||
|
|
||||||
|
#[utoipa::path(responses(
|
||||||
|
(status = OK),
|
||||||
|
(status = CONFLICT, body = ResponseError<ErrorCode>),
|
||||||
|
(status = INTERNAL_SERVER_ERROR, body = ResponseError<ErrorCode>),
|
||||||
|
(status = BAD_REQUEST, body = ResponseError<ErrorCode>)
|
||||||
|
))]
|
||||||
|
#[post("/telegram-complete")]
|
||||||
|
pub async fn telegram_complete(
|
||||||
|
data: Json<Request>,
|
||||||
|
app_state: web::Data<AppState>,
|
||||||
|
user: AsyncExtractor<User>,
|
||||||
|
) -> ServiceResponse {
|
||||||
|
let user = user.into_inner();
|
||||||
|
|
||||||
|
// проверка на перезапись уже имеющихся данных
|
||||||
|
if user.group.is_some() {
|
||||||
|
return Err(ErrorCode::AlreadyCompleted).into();
|
||||||
|
}
|
||||||
|
|
||||||
|
let data = data.into_inner();
|
||||||
|
|
||||||
|
let db = app_state.get_database();
|
||||||
|
let mut active_user = user.clone().into_active_model();
|
||||||
|
|
||||||
|
// замена существующего имени, если оно отличается
|
||||||
|
if user.username != data.username {
|
||||||
|
if Query::is_user_exists_by_username(db, &data.username)
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
{
|
||||||
|
return Err(ErrorCode::UsernameAlreadyExists).into();
|
||||||
|
}
|
||||||
|
|
||||||
|
active_user.username = Set(data.username);
|
||||||
|
}
|
||||||
|
|
||||||
|
// проверка на существование группы
|
||||||
|
if !app_state
|
||||||
|
.get_schedule_snapshot("eng_polytechnic")
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.data
|
||||||
|
.groups
|
||||||
|
.contains_key(&data.group)
|
||||||
|
{
|
||||||
|
return Err(ErrorCode::InvalidGroupName).into();
|
||||||
|
}
|
||||||
|
|
||||||
|
active_user.group = Set(Some(data.group));
|
||||||
|
|
||||||
|
active_user
|
||||||
|
.update(db)
|
||||||
|
.await
|
||||||
|
.expect("Failed to update user");
|
||||||
|
|
||||||
|
Ok(()).into()
|
||||||
|
}
|
||||||
|
|
||||||
|
mod schema {
|
||||||
|
use actix_macros::ErrResponse;
|
||||||
|
use derive_more::Display;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, ToSchema)]
|
||||||
|
#[schema(as = Flow::TelegramFill::Request)]
|
||||||
|
pub struct Request {
|
||||||
|
/// Username.
|
||||||
|
pub username: String,
|
||||||
|
|
||||||
|
/// Group.
|
||||||
|
pub group: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub type ServiceResponse = crate::routes::schema::Response<(), ErrorCode>;
|
||||||
|
|
||||||
|
#[derive(Clone, Serialize, Display, ToSchema, ErrResponse)]
|
||||||
|
#[status_code = "actix_web::http::StatusCode::UNAUTHORIZED"]
|
||||||
|
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
|
||||||
|
#[schema(as = Flow::TelegramFill::ErrorCode)]
|
||||||
|
pub enum ErrorCode {
|
||||||
|
#[display("This flow is already completed.")]
|
||||||
|
#[status_code = "actix_web::http::StatusCode::CONFLICT"]
|
||||||
|
AlreadyCompleted,
|
||||||
|
|
||||||
|
#[display("User with that name already exists.")]
|
||||||
|
#[status_code = "actix_web::http::StatusCode::BAD_REQUEST"]
|
||||||
|
UsernameAlreadyExists,
|
||||||
|
|
||||||
|
#[display("The required group does not exist.")]
|
||||||
|
#[status_code = "actix_web::http::StatusCode::BAD_REQUEST"]
|
||||||
|
InvalidGroupName,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1 +1,6 @@
|
|||||||
pub mod auth;
|
pub mod auth;
|
||||||
|
pub mod flow;
|
||||||
|
pub mod schedule;
|
||||||
|
mod schema;
|
||||||
|
pub mod users;
|
||||||
|
pub mod vk_id;
|
||||||
|
|||||||
11
src/routes/schedule/cache_status.rs
Normal file
11
src/routes/schedule/cache_status.rs
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
use crate::AppState;
|
||||||
|
use crate::routes::schedule::schema::CacheStatus;
|
||||||
|
use actix_web::{get, web};
|
||||||
|
|
||||||
|
#[utoipa::path(responses(
|
||||||
|
(status = OK, body = CacheStatus),
|
||||||
|
))]
|
||||||
|
#[get("/cache-status")]
|
||||||
|
pub async fn cache_status(app_state: web::Data<AppState>) -> CacheStatus {
|
||||||
|
CacheStatus::from(&app_state).await.into()
|
||||||
|
}
|
||||||
72
src/routes/schedule/group.rs
Normal file
72
src/routes/schedule/group.rs
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
use self::schema::*;
|
||||||
|
use crate::AppState;
|
||||||
|
use crate::extractors::base::AsyncExtractor;
|
||||||
|
use crate::routes::schedule::schema::ScheduleEntryResponse;
|
||||||
|
use crate::routes::schema::ResponseError;
|
||||||
|
use actix_web::{get, web};
|
||||||
|
use database::entity::User;
|
||||||
|
|
||||||
|
#[utoipa::path(responses(
|
||||||
|
(status = OK, body = ScheduleEntryResponse),
|
||||||
|
(
|
||||||
|
status = SERVICE_UNAVAILABLE,
|
||||||
|
body = ResponseError<ErrorCode>,
|
||||||
|
example = json!({
|
||||||
|
"code": "NO_SCHEDULE",
|
||||||
|
"message": "Schedule not parsed yet."
|
||||||
|
})
|
||||||
|
),
|
||||||
|
(
|
||||||
|
status = NOT_FOUND,
|
||||||
|
body = ResponseError<ErrorCode>,
|
||||||
|
example = json!({
|
||||||
|
"code": "NOT_FOUND",
|
||||||
|
"message": "Required group not found."
|
||||||
|
})
|
||||||
|
),
|
||||||
|
))]
|
||||||
|
#[get("/group")]
|
||||||
|
pub async fn group(user: AsyncExtractor<User>, app_state: web::Data<AppState>) -> ServiceResponse {
|
||||||
|
match &user.into_inner().group {
|
||||||
|
None => Err(ErrorCode::SignUpNotCompleted),
|
||||||
|
|
||||||
|
Some(group) => match app_state
|
||||||
|
.get_schedule_snapshot("eng_polytechnic")
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.data
|
||||||
|
.groups
|
||||||
|
.get(group)
|
||||||
|
{
|
||||||
|
None => Err(ErrorCode::NotFound),
|
||||||
|
|
||||||
|
Some(entry) => Ok(entry.clone().into()),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
.into()
|
||||||
|
}
|
||||||
|
|
||||||
|
mod schema {
|
||||||
|
use crate::routes::schedule::schema::ScheduleEntryResponse;
|
||||||
|
use actix_macros::ErrResponse;
|
||||||
|
use derive_more::Display;
|
||||||
|
use serde::Serialize;
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
|
||||||
|
pub type ServiceResponse = crate::routes::schema::Response<ScheduleEntryResponse, ErrorCode>;
|
||||||
|
|
||||||
|
#[derive(Clone, Serialize, Display, ToSchema, ErrResponse)]
|
||||||
|
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
|
||||||
|
#[schema(as = GroupSchedule::ErrorCode)]
|
||||||
|
pub enum ErrorCode {
|
||||||
|
/// The user tried to access the API without completing singing up.
|
||||||
|
#[status_code = "actix_web::http::StatusCode::FORBIDDEN"]
|
||||||
|
#[display("You have not completed signing up.")]
|
||||||
|
SignUpNotCompleted,
|
||||||
|
|
||||||
|
/// Group not found.
|
||||||
|
#[status_code = "actix_web::http::StatusCode::NOT_FOUND"]
|
||||||
|
#[display("Required group not found.")]
|
||||||
|
NotFound,
|
||||||
|
}
|
||||||
|
}
|
||||||
35
src/routes/schedule/group_names.rs
Normal file
35
src/routes/schedule/group_names.rs
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
use self::schema::*;
|
||||||
|
use crate::AppState;
|
||||||
|
use actix_web::{get, web};
|
||||||
|
|
||||||
|
#[utoipa::path(responses((status = OK, body = Response)))]
|
||||||
|
#[get("/group-names")]
|
||||||
|
pub async fn group_names(app_state: web::Data<AppState>) -> Response {
|
||||||
|
let mut names: Vec<String> = app_state
|
||||||
|
.get_schedule_snapshot("eng_polytechnic")
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.data
|
||||||
|
.groups
|
||||||
|
.keys()
|
||||||
|
.cloned()
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
names.sort();
|
||||||
|
|
||||||
|
Response { names }
|
||||||
|
}
|
||||||
|
|
||||||
|
mod schema {
|
||||||
|
use actix_macros::ResponderJson;
|
||||||
|
use serde::Serialize;
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
|
||||||
|
#[derive(Serialize, ToSchema, ResponderJson)]
|
||||||
|
#[schema(as = GetGroupNames::Response)]
|
||||||
|
pub struct Response {
|
||||||
|
/// List of group names sorted in alphabetical order.
|
||||||
|
#[schema(examples(json!(["ИС-214/23"])))]
|
||||||
|
pub names: Vec<String>,
|
||||||
|
}
|
||||||
|
}
|
||||||
14
src/routes/schedule/mod.rs
Normal file
14
src/routes/schedule/mod.rs
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
mod cache_status;
|
||||||
|
mod group;
|
||||||
|
mod group_names;
|
||||||
|
mod schedule;
|
||||||
|
mod schema;
|
||||||
|
mod teacher;
|
||||||
|
mod teacher_names;
|
||||||
|
|
||||||
|
pub use cache_status::*;
|
||||||
|
pub use group::*;
|
||||||
|
pub use group_names::*;
|
||||||
|
pub use schedule::*;
|
||||||
|
pub use teacher::*;
|
||||||
|
pub use teacher_names::*;
|
||||||
9
src/routes/schedule/schedule.rs
Normal file
9
src/routes/schedule/schedule.rs
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
use crate::routes::schedule::schema::ScheduleView;
|
||||||
|
use crate::state::AppState;
|
||||||
|
use actix_web::{get, web};
|
||||||
|
|
||||||
|
#[utoipa::path(responses((status = OK, body = ScheduleView)))]
|
||||||
|
#[get("/")]
|
||||||
|
pub async fn schedule(app_state: web::Data<AppState>) -> ScheduleView {
|
||||||
|
ScheduleView::from(&app_state).await
|
||||||
|
}
|
||||||
86
src/routes/schedule/schema.rs
Normal file
86
src/routes/schedule/schema.rs
Normal file
@@ -0,0 +1,86 @@
|
|||||||
|
use crate::state::AppState;
|
||||||
|
use actix_macros::{OkResponse, ResponderJson};
|
||||||
|
use actix_web::web;
|
||||||
|
use providers::base::{ScheduleEntry, ScheduleSnapshot};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::ops::Deref;
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
|
||||||
|
/// Response from schedule server.
|
||||||
|
#[derive(Serialize, ToSchema, OkResponse, ResponderJson)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct ScheduleView {
|
||||||
|
/// Url to xls file.
|
||||||
|
url: String,
|
||||||
|
|
||||||
|
/// Groups schedule.
|
||||||
|
groups: HashMap<String, ScheduleEntry>,
|
||||||
|
|
||||||
|
/// Teachers schedule.
|
||||||
|
teachers: HashMap<String, ScheduleEntry>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, ToSchema, OkResponse)]
|
||||||
|
pub struct ScheduleEntryResponse(ScheduleEntry);
|
||||||
|
|
||||||
|
impl From<ScheduleEntry> for ScheduleEntryResponse {
|
||||||
|
fn from(value: ScheduleEntry) -> Self {
|
||||||
|
Self(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ScheduleView {
|
||||||
|
pub async fn from(app_state: &web::Data<AppState>) -> Self {
|
||||||
|
let schedule = app_state
|
||||||
|
.get_schedule_snapshot("eng_polytechnic")
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.deref()
|
||||||
|
.clone();
|
||||||
|
|
||||||
|
Self {
|
||||||
|
url: schedule.url,
|
||||||
|
groups: schedule.data.groups,
|
||||||
|
teachers: schedule.data.teachers,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Cached schedule status.
|
||||||
|
#[derive(Serialize, Deserialize, ToSchema, ResponderJson, OkResponse)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct CacheStatus {
|
||||||
|
/// Schedule hash.
|
||||||
|
pub hash: String,
|
||||||
|
|
||||||
|
/// Last cache update date.
|
||||||
|
pub fetched_at: i64,
|
||||||
|
|
||||||
|
/// Cached schedule update date.
|
||||||
|
///
|
||||||
|
/// Determined by the polytechnic's server.
|
||||||
|
pub updated_at: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl CacheStatus {
|
||||||
|
pub async fn from(value: &web::Data<AppState>) -> Self {
|
||||||
|
From::<&ScheduleSnapshot>::from(
|
||||||
|
value
|
||||||
|
.get_schedule_snapshot("eng_polytechnic")
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.deref(),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<&ScheduleSnapshot> for CacheStatus {
|
||||||
|
fn from(value: &ScheduleSnapshot) -> Self {
|
||||||
|
Self {
|
||||||
|
hash: value.hash(),
|
||||||
|
fetched_at: value.fetched_at.timestamp(),
|
||||||
|
updated_at: value.updated_at.timestamp(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
53
src/routes/schedule/teacher.rs
Normal file
53
src/routes/schedule/teacher.rs
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
use self::schema::*;
|
||||||
|
use crate::AppState;
|
||||||
|
use crate::routes::schema::ResponseError;
|
||||||
|
use actix_web::{get, web};
|
||||||
|
use providers::base::ScheduleEntry;
|
||||||
|
|
||||||
|
#[utoipa::path(responses(
|
||||||
|
(status = OK, body = ScheduleEntry),
|
||||||
|
(
|
||||||
|
status = NOT_FOUND,
|
||||||
|
body = ResponseError<ErrorCode>,
|
||||||
|
example = json!({
|
||||||
|
"code": "NOT_FOUND",
|
||||||
|
"message": "Required teacher not found."
|
||||||
|
})
|
||||||
|
),
|
||||||
|
))]
|
||||||
|
#[get("/teacher/{name}")]
|
||||||
|
pub async fn teacher(name: web::Path<String>, app_state: web::Data<AppState>) -> ServiceResponse {
|
||||||
|
match app_state
|
||||||
|
.get_schedule_snapshot("eng_polytechnic")
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.data
|
||||||
|
.teachers
|
||||||
|
.get(&name.into_inner())
|
||||||
|
{
|
||||||
|
None => Err(ErrorCode::NotFound),
|
||||||
|
|
||||||
|
Some(entry) => Ok(entry.clone().into()),
|
||||||
|
}
|
||||||
|
.into()
|
||||||
|
}
|
||||||
|
|
||||||
|
mod schema {
|
||||||
|
use crate::routes::schedule::schema::ScheduleEntryResponse;
|
||||||
|
use actix_macros::ErrResponse;
|
||||||
|
use derive_more::Display;
|
||||||
|
use serde::Serialize;
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
|
||||||
|
pub type ServiceResponse = crate::routes::schema::Response<ScheduleEntryResponse, ErrorCode>;
|
||||||
|
|
||||||
|
#[derive(Clone, Serialize, Display, ToSchema, ErrResponse)]
|
||||||
|
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
|
||||||
|
#[schema(as = TeacherSchedule::ErrorCode)]
|
||||||
|
pub enum ErrorCode {
|
||||||
|
/// Teacher not found.
|
||||||
|
#[status_code = "actix_web::http::StatusCode::NOT_FOUND"]
|
||||||
|
#[display("Required teacher not found.")]
|
||||||
|
NotFound,
|
||||||
|
}
|
||||||
|
}
|
||||||
35
src/routes/schedule/teacher_names.rs
Normal file
35
src/routes/schedule/teacher_names.rs
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
use self::schema::*;
|
||||||
|
use crate::AppState;
|
||||||
|
use actix_web::{get, web};
|
||||||
|
|
||||||
|
#[utoipa::path(responses((status = OK, body = Response)))]
|
||||||
|
#[get("/teacher-names")]
|
||||||
|
pub async fn teacher_names(app_state: web::Data<AppState>) -> Response {
|
||||||
|
let mut names: Vec<String> = app_state
|
||||||
|
.get_schedule_snapshot("eng_polytechnic")
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.data
|
||||||
|
.teachers
|
||||||
|
.keys()
|
||||||
|
.cloned()
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
names.sort();
|
||||||
|
|
||||||
|
Response { names }
|
||||||
|
}
|
||||||
|
|
||||||
|
mod schema {
|
||||||
|
use actix_macros::ResponderJson;
|
||||||
|
use serde::Serialize;
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
|
||||||
|
#[derive(Serialize, ToSchema, ResponderJson)]
|
||||||
|
#[schema(as = GetTeacherNames::Response)]
|
||||||
|
pub struct Response {
|
||||||
|
/// List of teacher names sorted alphabetically.
|
||||||
|
#[schema(examples(json!(["Хомченко Н.Е."])))]
|
||||||
|
pub names: Vec<String>,
|
||||||
|
}
|
||||||
|
}
|
||||||
212
src/routes/schema.rs
Normal file
212
src/routes/schema.rs
Normal file
@@ -0,0 +1,212 @@
|
|||||||
|
use actix_web::body::EitherBody;
|
||||||
|
use actix_web::error::JsonPayloadError;
|
||||||
|
use actix_web::http::StatusCode;
|
||||||
|
use actix_web::{HttpRequest, HttpResponse, Responder};
|
||||||
|
use serde::{Serialize, Serializer};
|
||||||
|
use std::convert::Into;
|
||||||
|
use std::fmt::Display;
|
||||||
|
use utoipa::PartialSchema;
|
||||||
|
|
||||||
|
pub struct Response<T, E>(pub Result<T, E>)
|
||||||
|
where
|
||||||
|
T: Serialize + PartialSchema + PartialOkResponse,
|
||||||
|
E: Serialize + PartialSchema + Display + PartialErrResponse;
|
||||||
|
|
||||||
|
/// Transform Response<T, E> into Result<T, E>
|
||||||
|
impl<T, E> Into<Result<T, E>> for Response<T, E>
|
||||||
|
where
|
||||||
|
T: Serialize + PartialSchema + PartialOkResponse,
|
||||||
|
E: Serialize + PartialSchema + Display + PartialErrResponse,
|
||||||
|
{
|
||||||
|
fn into(self) -> Result<T, E> {
|
||||||
|
self.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Transform T into Response<T, E>
|
||||||
|
impl<T, E> From<Result<T, E>> for Response<T, E>
|
||||||
|
where
|
||||||
|
T: Serialize + PartialSchema + PartialOkResponse,
|
||||||
|
E: Serialize + PartialSchema + Display + PartialErrResponse,
|
||||||
|
{
|
||||||
|
fn from(value: Result<T, E>) -> Self {
|
||||||
|
Response(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Serialize Response<T, E>
|
||||||
|
impl<T, E> Serialize for Response<T, E>
|
||||||
|
where
|
||||||
|
T: Serialize + PartialSchema + PartialOkResponse,
|
||||||
|
E: Serialize + PartialSchema + Display + PartialErrResponse + Clone + Into<ResponseError<E>>,
|
||||||
|
{
|
||||||
|
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
||||||
|
where
|
||||||
|
S: Serializer,
|
||||||
|
{
|
||||||
|
match &self.0 {
|
||||||
|
Ok(ok) => serializer.serialize_some(&ok),
|
||||||
|
Err(err) => serializer.serialize_some(&ResponseError::<E>::from(err.clone().into())),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Transform Response<T, E> to HttpResponse<String>
|
||||||
|
impl<T, E> Responder for Response<T, E>
|
||||||
|
where
|
||||||
|
T: Serialize + PartialSchema + PartialOkResponse,
|
||||||
|
E: Serialize + PartialSchema + Display + PartialErrResponse + Clone + Into<ResponseError<E>>,
|
||||||
|
{
|
||||||
|
type Body = EitherBody<String>;
|
||||||
|
|
||||||
|
fn respond_to(mut self, request: &HttpRequest) -> HttpResponse<Self::Body> {
|
||||||
|
match serde_json::to_string(&self) {
|
||||||
|
Ok(body) => {
|
||||||
|
let code = match &self.0 {
|
||||||
|
Ok(_) => StatusCode::OK,
|
||||||
|
Err(e) => e.status_code(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut response = match HttpResponse::build(code)
|
||||||
|
.content_type(mime::APPLICATION_JSON)
|
||||||
|
.message_body(body)
|
||||||
|
{
|
||||||
|
Ok(res) => res.map_into_left_body(),
|
||||||
|
Err(err) => HttpResponse::from_error(err).map_into_right_body(),
|
||||||
|
};
|
||||||
|
|
||||||
|
if let Ok(ok) = &mut self.0 {
|
||||||
|
ok.post_process(request, &mut response);
|
||||||
|
}
|
||||||
|
|
||||||
|
response
|
||||||
|
}
|
||||||
|
|
||||||
|
Err(err) => {
|
||||||
|
HttpResponse::from_error(JsonPayloadError::Serialize(err)).map_into_right_body()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Трейт для всех положительных ответов от сервера
|
||||||
|
pub trait PartialOkResponse {
|
||||||
|
fn post_process(
|
||||||
|
&mut self,
|
||||||
|
_request: &HttpRequest,
|
||||||
|
_response: &mut HttpResponse<EitherBody<String>>,
|
||||||
|
) -> () {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PartialOkResponse for () {}
|
||||||
|
|
||||||
|
/// Трейт для всех отрицательных ответов от сервера
|
||||||
|
pub trait PartialErrResponse {
|
||||||
|
fn status_code(&self) -> StatusCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// ResponseError<T>
|
||||||
|
#[derive(Serialize, utoipa::ToSchema)]
|
||||||
|
pub struct ResponseError<T: Serialize + PartialSchema + Clone> {
|
||||||
|
pub code: T,
|
||||||
|
pub message: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T> From<T> for ResponseError<T>
|
||||||
|
where
|
||||||
|
T: Serialize + PartialSchema + Display + Clone,
|
||||||
|
{
|
||||||
|
fn from(code: T) -> Self {
|
||||||
|
Self {
|
||||||
|
message: format!("{}", code),
|
||||||
|
code,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub mod user {
|
||||||
|
use actix_macros::{OkResponse, ResponderJson};
|
||||||
|
use database::entity::sea_orm_active_enums::UserRole;
|
||||||
|
use database::entity::User;
|
||||||
|
use serde::Serialize;
|
||||||
|
|
||||||
|
//noinspection SpellCheckingInspection
|
||||||
|
/// Используется для скрытия чувствительных полей, таких как хеш пароля
|
||||||
|
#[derive(Serialize, utoipa::ToSchema, ResponderJson, OkResponse)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct UserResponse {
|
||||||
|
/// UUID
|
||||||
|
#[schema(examples("67dcc9a9507b0000772744a2"))]
|
||||||
|
pub id: String,
|
||||||
|
|
||||||
|
/// Имя пользователя
|
||||||
|
#[schema(examples("n08i40k"))]
|
||||||
|
pub username: String,
|
||||||
|
|
||||||
|
/// Группа
|
||||||
|
#[schema(examples("ИС-214/23"))]
|
||||||
|
pub group: Option<String>,
|
||||||
|
|
||||||
|
/// Роль
|
||||||
|
pub role: UserRole,
|
||||||
|
|
||||||
|
/// Идентификатор привязанного аккаунта VK
|
||||||
|
#[schema(examples(498094647, json!(null)))]
|
||||||
|
pub vk_id: Option<i32>,
|
||||||
|
|
||||||
|
/// Идентификатор привязанного аккаунта Telegram
|
||||||
|
#[schema(examples(996004735, json!(null)))]
|
||||||
|
pub telegram_id: Option<i64>,
|
||||||
|
|
||||||
|
/// JWT токен доступа
|
||||||
|
#[schema(examples(
|
||||||
|
"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpZCI6IjY3ZGNjOWE5NTA3YjAwMDA3NzI3NDRhMiIsImlhdCI6IjE3NDMxMDgwOTkiLCJleHAiOiIxODY5MjUyMDk5In0.rMgXRb3JbT9AvLK4eiY9HMB5LxgUudkpQyoWKOypZFY"
|
||||||
|
))]
|
||||||
|
pub access_token: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl UserResponse {
|
||||||
|
pub fn from_user_with_token(user: User, access_token: String) -> Self {
|
||||||
|
Self {
|
||||||
|
id: user.id.clone(),
|
||||||
|
username: user.username.clone(),
|
||||||
|
group: user.group.clone(),
|
||||||
|
role: user.role.clone(),
|
||||||
|
vk_id: user.vk_id.clone(),
|
||||||
|
telegram_id: user.telegram_id.clone(),
|
||||||
|
access_token: Some(access_token),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Create UserResponse from User ref.
|
||||||
|
impl From<&User> for UserResponse {
|
||||||
|
fn from(user: &User) -> Self {
|
||||||
|
Self {
|
||||||
|
id: user.id.clone(),
|
||||||
|
username: user.username.clone(),
|
||||||
|
group: user.group.clone(),
|
||||||
|
role: user.role.clone(),
|
||||||
|
vk_id: user.vk_id.clone(),
|
||||||
|
telegram_id: user.telegram_id.clone(),
|
||||||
|
access_token: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Transform User to UserResponse.
|
||||||
|
impl From<User> for UserResponse {
|
||||||
|
fn from(user: User) -> Self {
|
||||||
|
Self {
|
||||||
|
id: user.id,
|
||||||
|
username: user.username,
|
||||||
|
group: user.group,
|
||||||
|
role: user.role,
|
||||||
|
vk_id: user.vk_id,
|
||||||
|
telegram_id: user.telegram_id,
|
||||||
|
access_token: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
70
src/routes/users/change_group.rs
Normal file
70
src/routes/users/change_group.rs
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
use self::schema::*;
|
||||||
|
use crate::extractors::base::AsyncExtractor;
|
||||||
|
use crate::state::AppState;
|
||||||
|
use actix_web::{post, web};
|
||||||
|
use database::entity::User;
|
||||||
|
use database::sea_orm::{ActiveModelTrait, IntoActiveModel, Set};
|
||||||
|
use std::ops::Deref;
|
||||||
|
|
||||||
|
#[utoipa::path(responses((status = OK)))]
|
||||||
|
#[post("/change-group")]
|
||||||
|
pub async fn change_group(
|
||||||
|
app_state: web::Data<AppState>,
|
||||||
|
user: AsyncExtractor<User>,
|
||||||
|
data: web::Json<Request>,
|
||||||
|
) -> ServiceResponse {
|
||||||
|
let user = user.into_inner();
|
||||||
|
|
||||||
|
if user
|
||||||
|
.group
|
||||||
|
.as_ref()
|
||||||
|
.is_some_and(|group| group.eq(&data.group))
|
||||||
|
{
|
||||||
|
return Ok(()).into();
|
||||||
|
}
|
||||||
|
|
||||||
|
if !app_state
|
||||||
|
.get_schedule_snapshot("eng_polytechnic")
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.data
|
||||||
|
.groups
|
||||||
|
.contains_key(&data.group)
|
||||||
|
{
|
||||||
|
return Err(ErrorCode::NotFound).into();
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut active_user = user.clone().into_active_model();
|
||||||
|
active_user.group = Set(Some(data.into_inner().group));
|
||||||
|
|
||||||
|
active_user.update(app_state.get_database()).await.unwrap();
|
||||||
|
|
||||||
|
Ok(()).into()
|
||||||
|
}
|
||||||
|
|
||||||
|
mod schema {
|
||||||
|
use actix_macros::ErrResponse;
|
||||||
|
use derive_more::Display;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
|
||||||
|
pub type ServiceResponse = crate::routes::schema::Response<(), ErrorCode>;
|
||||||
|
|
||||||
|
#[derive(Deserialize, ToSchema)]
|
||||||
|
#[schema(as = ChangeGroup::Request)]
|
||||||
|
pub struct Request {
|
||||||
|
// Group.
|
||||||
|
pub group: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Serialize, Display, ToSchema, ErrResponse)]
|
||||||
|
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
|
||||||
|
#[schema(as = ChangeGroup::ErrorCode)]
|
||||||
|
#[status_code = "actix_web::http::StatusCode::CONFLICT"]
|
||||||
|
pub enum ErrorCode {
|
||||||
|
/// The required group does not exist.
|
||||||
|
#[display("The required group does not exist.")]
|
||||||
|
#[status_code = "actix_web::http::StatusCode::NOT_FOUND"]
|
||||||
|
NotFound,
|
||||||
|
}
|
||||||
|
}
|
||||||
63
src/routes/users/change_username.rs
Normal file
63
src/routes/users/change_username.rs
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
use self::schema::*;
|
||||||
|
use crate::extractors::base::AsyncExtractor;
|
||||||
|
use crate::state::AppState;
|
||||||
|
use actix_web::{post, web};
|
||||||
|
use database::entity::User;
|
||||||
|
use database::query::Query;
|
||||||
|
use database::sea_orm::{ActiveModelTrait, IntoActiveModel, Set};
|
||||||
|
use std::ops::Deref;
|
||||||
|
|
||||||
|
#[utoipa::path(responses((status = OK)))]
|
||||||
|
#[post("/change-username")]
|
||||||
|
pub async fn change_username(
|
||||||
|
app_state: web::Data<AppState>,
|
||||||
|
user: AsyncExtractor<User>,
|
||||||
|
data: web::Json<Request>,
|
||||||
|
) -> ServiceResponse {
|
||||||
|
let user = user.into_inner();
|
||||||
|
|
||||||
|
if user.username == data.username {
|
||||||
|
return Ok(()).into();
|
||||||
|
}
|
||||||
|
|
||||||
|
let db = app_state.get_database();
|
||||||
|
|
||||||
|
if Query::is_user_exists_by_username(db, &data.username)
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
{
|
||||||
|
return Err(ErrorCode::AlreadyExists).into();
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut active_user = user.into_active_model();
|
||||||
|
active_user.username = Set(data.into_inner().username);
|
||||||
|
active_user.update(db).await.unwrap();
|
||||||
|
|
||||||
|
Ok(()).into()
|
||||||
|
}
|
||||||
|
|
||||||
|
mod schema {
|
||||||
|
use actix_macros::ErrResponse;
|
||||||
|
use derive_more::Display;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
|
||||||
|
pub type ServiceResponse = crate::routes::schema::Response<(), ErrorCode>;
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, ToSchema)]
|
||||||
|
#[schema(as = ChangeUsername::Request)]
|
||||||
|
pub struct Request {
|
||||||
|
/// User name.
|
||||||
|
pub username: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Serialize, Display, ToSchema, ErrResponse)]
|
||||||
|
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
|
||||||
|
#[schema(as = ChangeUsername::ErrorCode)]
|
||||||
|
#[status_code = "actix_web::http::StatusCode::CONFLICT"]
|
||||||
|
pub enum ErrorCode {
|
||||||
|
/// A user with this name already exists.
|
||||||
|
#[display("A user with this name already exists.")]
|
||||||
|
AlreadyExists,
|
||||||
|
}
|
||||||
|
}
|
||||||
10
src/routes/users/me.rs
Normal file
10
src/routes/users/me.rs
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
use crate::extractors::base::AsyncExtractor;
|
||||||
|
use crate::routes::schema::user::UserResponse;
|
||||||
|
use actix_web::get;
|
||||||
|
use database::entity::User;
|
||||||
|
|
||||||
|
#[utoipa::path(responses((status = OK, body = UserResponse)))]
|
||||||
|
#[get("/me")]
|
||||||
|
pub async fn me(user: AsyncExtractor<User>) -> UserResponse {
|
||||||
|
user.into_inner().into()
|
||||||
|
}
|
||||||
7
src/routes/users/mod.rs
Normal file
7
src/routes/users/mod.rs
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
mod change_group;
|
||||||
|
mod change_username;
|
||||||
|
mod me;
|
||||||
|
|
||||||
|
pub use change_group::*;
|
||||||
|
pub use change_username::*;
|
||||||
|
pub use me::*;
|
||||||
3
src/routes/vk_id/mod.rs
Normal file
3
src/routes/vk_id/mod.rs
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
mod oauth;
|
||||||
|
|
||||||
|
pub use oauth::*;
|
||||||
117
src/routes/vk_id/oauth.rs
Normal file
117
src/routes/vk_id/oauth.rs
Normal file
@@ -0,0 +1,117 @@
|
|||||||
|
use self::schema::*;
|
||||||
|
use crate::routes::schema::ResponseError;
|
||||||
|
use crate::state::AppState;
|
||||||
|
use actix_web::{post, web};
|
||||||
|
use serde::Deserialize;
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct VkIdAuthResponse {
|
||||||
|
refresh_token: String,
|
||||||
|
access_token: String,
|
||||||
|
id_token: String,
|
||||||
|
token_type: String,
|
||||||
|
expires_in: i32,
|
||||||
|
user_id: i32,
|
||||||
|
state: String,
|
||||||
|
scope: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(responses(
|
||||||
|
(status = OK, body = Response),
|
||||||
|
(
|
||||||
|
status = NOT_ACCEPTABLE,
|
||||||
|
body = ResponseError<ErrorCode>,
|
||||||
|
example = json!({
|
||||||
|
"code": "VK_ID_ERROR",
|
||||||
|
"message": "VK server returned an error"
|
||||||
|
})
|
||||||
|
),
|
||||||
|
))]
|
||||||
|
#[post("/oauth")]
|
||||||
|
async fn oauth(data: web::Json<Request>, app_state: web::Data<AppState>) -> ServiceResponse {
|
||||||
|
let data = data.into_inner();
|
||||||
|
let state = Uuid::new_v4().simple().to_string();
|
||||||
|
|
||||||
|
let vk_id = &app_state.get_env().vk_id;
|
||||||
|
let client_id = vk_id.client_id.clone().to_string();
|
||||||
|
|
||||||
|
let mut params = HashMap::new();
|
||||||
|
params.insert("grant_type", "authorization_code");
|
||||||
|
params.insert("client_id", client_id.as_str());
|
||||||
|
params.insert("state", state.as_str());
|
||||||
|
params.insert("code_verifier", data.code_verifier.as_str());
|
||||||
|
params.insert("code", data.code.as_str());
|
||||||
|
params.insert("device_id", data.device_id.as_str());
|
||||||
|
params.insert("redirect_uri", vk_id.redirect_url.as_str());
|
||||||
|
|
||||||
|
let client = reqwest::Client::new();
|
||||||
|
match client
|
||||||
|
.post("https://id.vk.com/oauth2/auth")
|
||||||
|
.form(¶ms)
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
Ok(res) => {
|
||||||
|
if !res.status().is_success() {
|
||||||
|
return Err(ErrorCode::VkIdError).into();
|
||||||
|
}
|
||||||
|
|
||||||
|
match res.json::<VkIdAuthResponse>().await {
|
||||||
|
Ok(auth_data) => Ok(Response {
|
||||||
|
access_token: auth_data.id_token,
|
||||||
|
}),
|
||||||
|
Err(error) => {
|
||||||
|
sentry::capture_error(&error);
|
||||||
|
|
||||||
|
Err(ErrorCode::VkIdError)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(_) => Err(ErrorCode::VkIdError),
|
||||||
|
}
|
||||||
|
.into()
|
||||||
|
}
|
||||||
|
|
||||||
|
mod schema {
|
||||||
|
use actix_macros::{ErrResponse, OkResponse};
|
||||||
|
use derive_more::Display;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
|
||||||
|
pub type ServiceResponse = crate::routes::schema::Response<Response, ErrorCode>;
|
||||||
|
|
||||||
|
#[derive(Deserialize, ToSchema)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
#[schema(as = VkIdOAuth::Request)]
|
||||||
|
pub struct Request {
|
||||||
|
/// Код подтверждения authorization_code.
|
||||||
|
pub code: String,
|
||||||
|
|
||||||
|
/// Parameter to protect transmitted data.
|
||||||
|
pub code_verifier: String,
|
||||||
|
|
||||||
|
/// Device ID.
|
||||||
|
pub device_id: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, ToSchema, OkResponse)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
#[schema(as = VkIdOAuth::Response)]
|
||||||
|
pub struct Response {
|
||||||
|
/// ID token.
|
||||||
|
pub access_token: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Serialize, Display, ToSchema, ErrResponse)]
|
||||||
|
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
|
||||||
|
#[schema(as = VkIdOAuth::ErrorCode)]
|
||||||
|
#[status_code = "actix_web::http::StatusCode::NOT_ACCEPTABLE"]
|
||||||
|
pub enum ErrorCode {
|
||||||
|
/// VK server returned an error.
|
||||||
|
#[display("VK server returned an error")]
|
||||||
|
VkIdError,
|
||||||
|
}
|
||||||
|
}
|
||||||
23
src/state/env/mod.rs
vendored
Normal file
23
src/state/env/mod.rs
vendored
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
pub mod schedule;
|
||||||
|
pub mod telegram;
|
||||||
|
pub mod vk_id;
|
||||||
|
|
||||||
|
#[cfg(not(test))]
|
||||||
|
pub mod yandex_cloud;
|
||||||
|
|
||||||
|
pub use self::schedule::ScheduleEnvData;
|
||||||
|
pub use self::telegram::TelegramEnvData;
|
||||||
|
pub use self::vk_id::VkIdEnvData;
|
||||||
|
|
||||||
|
#[cfg(not(test))]
|
||||||
|
pub use self::yandex_cloud::YandexCloudEnvData;
|
||||||
|
|
||||||
|
#[derive(Default)]
|
||||||
|
pub struct AppEnv {
|
||||||
|
pub schedule: ScheduleEnvData,
|
||||||
|
pub telegram: TelegramEnvData,
|
||||||
|
pub vk_id: VkIdEnvData,
|
||||||
|
|
||||||
|
#[cfg(not(test))]
|
||||||
|
pub yandex_cloud: YandexCloudEnvData,
|
||||||
|
}
|
||||||
19
src/state/env/schedule.rs
vendored
Normal file
19
src/state/env/schedule.rs
vendored
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
use std::env;
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct ScheduleEnvData {
|
||||||
|
#[cfg(not(test))]
|
||||||
|
pub url: Option<String>,
|
||||||
|
pub auto_update: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for ScheduleEnvData {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
#[cfg(not(test))]
|
||||||
|
url: env::var("SCHEDULE_INIT_URL").ok(),
|
||||||
|
auto_update: !env::var("SCHEDULE_DISABLE_AUTO_UPDATE")
|
||||||
|
.is_ok_and(|v| v.eq("1") || v.eq("true")),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
28
src/state/env/telegram.rs
vendored
Normal file
28
src/state/env/telegram.rs
vendored
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
use std::env;
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct TelegramEnvData {
|
||||||
|
pub bot_id: i64,
|
||||||
|
pub mini_app_host: String,
|
||||||
|
pub test_dc: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for TelegramEnvData {
|
||||||
|
fn default() -> Self {
|
||||||
|
let _self = Self {
|
||||||
|
bot_id: env::var("TELEGRAM_BOT_ID")
|
||||||
|
.expect("TELEGRAM_BOT_ID must be set")
|
||||||
|
.parse()
|
||||||
|
.expect("TELEGRAM_BOT_ID must be integer"),
|
||||||
|
mini_app_host: env::var("TELEGRAM_MINI_APP_HOST")
|
||||||
|
.expect("TELEGRAM_MINI_APP_HOST must be set"),
|
||||||
|
test_dc: env::var("TELEGRAM_TEST_DC").is_ok_and(|v| v.eq("1") || v.eq("true")),
|
||||||
|
};
|
||||||
|
|
||||||
|
if _self.test_dc {
|
||||||
|
log::warn!("Using test data-center of telegram!");
|
||||||
|
}
|
||||||
|
|
||||||
|
_self
|
||||||
|
}
|
||||||
|
}
|
||||||
19
src/state/env/vk_id.rs
vendored
Normal file
19
src/state/env/vk_id.rs
vendored
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
use std::env;
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct VkIdEnvData {
|
||||||
|
pub client_id: i32,
|
||||||
|
pub redirect_url: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for VkIdEnvData {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
client_id: env::var("VK_ID_CLIENT_ID")
|
||||||
|
.expect("VK_ID_CLIENT_ID must be set")
|
||||||
|
.parse()
|
||||||
|
.expect("VK_ID_CLIENT_ID must be integer"),
|
||||||
|
redirect_url: env::var("VK_ID_REDIRECT_URI").expect("VK_ID_REDIRECT_URI must be set"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
16
src/state/env/yandex_cloud.rs
vendored
Normal file
16
src/state/env/yandex_cloud.rs
vendored
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
use std::env;
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct YandexCloudEnvData {
|
||||||
|
pub api_key: String,
|
||||||
|
pub func_id: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for YandexCloudEnvData {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
api_key: env::var("YANDEX_CLOUD_API_KEY").expect("YANDEX_CLOUD_API_KEY must be set"),
|
||||||
|
func_id: env::var("YANDEX_CLOUD_FUNC_ID").expect("YANDEX_CLOUD_FUNC_ID must be set"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
98
src/state/mod.rs
Normal file
98
src/state/mod.rs
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
mod env;
|
||||||
|
|
||||||
|
pub use crate::state::env::AppEnv;
|
||||||
|
use actix_web::web;
|
||||||
|
use database::sea_orm::{Database, DatabaseConnection};
|
||||||
|
use providers::base::{ScheduleProvider, ScheduleSnapshot};
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::sync::Arc;
|
||||||
|
use tokio_util::sync::CancellationToken;
|
||||||
|
|
||||||
|
/// Common data provided to endpoints.
|
||||||
|
pub struct AppState {
|
||||||
|
cancel_token: CancellationToken,
|
||||||
|
database: DatabaseConnection,
|
||||||
|
providers: HashMap<String, Arc<dyn ScheduleProvider>>,
|
||||||
|
env: AppEnv,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl AppState {
|
||||||
|
pub async fn new(
|
||||||
|
database: Option<DatabaseConnection>,
|
||||||
|
) -> Result<Self, Box<dyn std::error::Error>> {
|
||||||
|
let env = AppEnv::default();
|
||||||
|
let providers: HashMap<String, Arc<dyn ScheduleProvider>> = HashMap::from([(
|
||||||
|
"eng_polytechnic".to_string(),
|
||||||
|
providers::EngelsPolytechnicProvider::new({
|
||||||
|
#[cfg(test)]
|
||||||
|
{
|
||||||
|
providers::EngelsPolytechnicUpdateSource::Prepared(ScheduleSnapshot {
|
||||||
|
url: "".to_string(),
|
||||||
|
fetched_at: chrono::DateTime::default(),
|
||||||
|
updated_at: chrono::DateTime::default(),
|
||||||
|
data: providers::test_utils::engels_polytechnic::test_result().unwrap(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(test))]
|
||||||
|
{
|
||||||
|
if let Some(url) = &env.schedule.url {
|
||||||
|
providers::EngelsPolytechnicUpdateSource::Url(url.clone())
|
||||||
|
} else {
|
||||||
|
providers::EngelsPolytechnicUpdateSource::GrabFromSite {
|
||||||
|
yandex_api_key: env.yandex_cloud.api_key.clone(),
|
||||||
|
yandex_func_id: env.yandex_cloud.func_id.clone(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.await?,
|
||||||
|
)]);
|
||||||
|
|
||||||
|
let this = Self {
|
||||||
|
cancel_token: CancellationToken::new(),
|
||||||
|
database: if let Some(database) = database {
|
||||||
|
database
|
||||||
|
} else {
|
||||||
|
let database_url = std::env::var("DATABASE_URL").expect("DATABASE_URL must be set");
|
||||||
|
Database::connect(&database_url)
|
||||||
|
.await
|
||||||
|
.unwrap_or_else(|_| panic!("Error connecting to {}", database_url))
|
||||||
|
},
|
||||||
|
env,
|
||||||
|
providers,
|
||||||
|
};
|
||||||
|
|
||||||
|
if this.env.schedule.auto_update {
|
||||||
|
for (_, provider) in &this.providers {
|
||||||
|
let provider = provider.clone();
|
||||||
|
let cancel_token = this.cancel_token.clone();
|
||||||
|
|
||||||
|
tokio::spawn(async move { provider.start_auto_update_task(cancel_token).await });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(this)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_schedule_snapshot(&'_ self, provider: &str) -> Option<Arc<ScheduleSnapshot>> {
|
||||||
|
if let Some(provider) = self.providers.get(provider) {
|
||||||
|
return Some(provider.get_schedule().await);
|
||||||
|
}
|
||||||
|
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_database(&'_ self) -> &DatabaseConnection {
|
||||||
|
&self.database
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_env(&self) -> &AppEnv {
|
||||||
|
&self.env
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Create a new object web::Data<AppState>.
|
||||||
|
pub async fn new_app_state(database: Option<DatabaseConnection>) -> Result<web::Data<AppState>, Box<dyn std::error::Error>> {
|
||||||
|
Ok(web::Data::new(AppState::new(database).await?))
|
||||||
|
}
|
||||||
37
src/test_env.rs
Normal file
37
src/test_env.rs
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
#[cfg(test)]
|
||||||
|
pub(crate) mod tests {
|
||||||
|
use crate::state::{new_app_state, AppState};
|
||||||
|
use actix_web::web;
|
||||||
|
use log::info;
|
||||||
|
use tokio::sync::OnceCell;
|
||||||
|
|
||||||
|
pub fn test_env() {
|
||||||
|
info!("Loading test environment file...");
|
||||||
|
|
||||||
|
dotenvy::from_filename(".env.test.local")
|
||||||
|
.or_else(|_| dotenvy::from_filename(".env.test"))
|
||||||
|
.expect("Failed to load test environment file");
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn test_app_state() -> web::Data<AppState> {
|
||||||
|
let state = new_app_state(Some(static_app_state().await.get_database().clone()))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
state.clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn static_app_state() -> web::Data<AppState> {
|
||||||
|
static STATE: OnceCell<web::Data<AppState>> = OnceCell::const_new();
|
||||||
|
|
||||||
|
STATE
|
||||||
|
.get_or_init(async || -> web::Data<AppState> {
|
||||||
|
#[cfg(feature = "trace")]
|
||||||
|
console_subscriber::init();
|
||||||
|
|
||||||
|
new_app_state(None).await.unwrap()
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.clone()
|
||||||
|
}
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user