forked from eatvio/eatvio_app
Compare commits
15 Commits
issue-1122
...
issue-1141
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b05d3b891b | ||
| 87d383152d | |||
| dbe0369d4d | |||
| 4f0ba5c864 | |||
| f9b862f4ad | |||
| 2ea711844f | |||
| 3519595ebf | |||
| 30932d9f28 | |||
| b30bf037db | |||
| bfb43104d8 | |||
| 4aadc8a9d8 | |||
| 7308e3e972 | |||
| 76c26457fc | |||
| 1255c9658c | |||
| 85cfcc519e |
64
.gitea/workflows/contract-sync.yml
Normal file
64
.gitea/workflows/contract-sync.yml
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
name: "Contract sync: flutter manifest -> eatvio (backend)"
|
||||||
|
|
||||||
|
# Автоматический перенос манифеста API-контракта из eatvio_app в eatvio-web.
|
||||||
|
# Триггер: push в main с изменениями api_contract/**.
|
||||||
|
# Результат: PR в eatvio-web с обновлённым tests/Fixtures/Contract/flutter_model_contract.json.
|
||||||
|
# Далее CI eatvio-web сам прогонит FlutterApiContractTest и покажет,
|
||||||
|
# выполняет ли бэкенд требования новых моделей.
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
paths:
|
||||||
|
- "api_contract/**"
|
||||||
|
workflow_dispatch: # ручной запуск для проверки секрета/прав: Actions → Contract sync → Run workflow
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
sync-manifest:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
|
- name: Open PR in eatvio-web with updated manifest
|
||||||
|
env:
|
||||||
|
TOKEN: ${{ secrets.CONTRACT_SYNC_TOKEN }} # PAT с write на eatvio/eatvio
|
||||||
|
API: http://gitea.office.local:3000/api/v1
|
||||||
|
BACKEND_REPO: eatvio/eatvio
|
||||||
|
SRC: api_contract/flutter_model_contract.json
|
||||||
|
DST: tests/Fixtures/Contract/flutter_model_contract.json
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
SHORT_SHA="${GITHUB_SHA::8}"
|
||||||
|
BRANCH="contract-sync/manifest-${SHORT_SHA}"
|
||||||
|
auth="Authorization: token ${TOKEN}"
|
||||||
|
|
||||||
|
DEFAULT_BRANCH=$(curl -sf -H "$auth" "${API}/repos/${BACKEND_REPO}" | grep -o '"default_branch":"[^"]*"' | head -1 | cut -d'"' -f4)
|
||||||
|
|
||||||
|
# Файл не изменился относительно предыдущего синка — выходим тихо.
|
||||||
|
REMOTE_SHA=$(curl -sf -H "$auth" "${API}/repos/${BACKEND_REPO}/contents/${DST}?ref=${DEFAULT_BRANCH}" | grep -o '"sha":"[^"]*"' | head -1 | cut -d'"' -f4)
|
||||||
|
LOCAL_SHA=$(git hash-object -- "${SRC}")
|
||||||
|
if [ "${REMOTE_SHA}" = "${LOCAL_SHA}" ]; then
|
||||||
|
echo "Manifest already in sync with ${BACKEND_REPO}."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 1. Ветка от дефолтной (если уже существует — переиспользуем).
|
||||||
|
curl -sf -X POST -H "$auth" -H "Content-Type: application/json" \
|
||||||
|
-d "{\"new_branch_name\":\"${BRANCH}\",\"old_branch_name\":\"${DEFAULT_BRANCH}\"}" \
|
||||||
|
"${API}/repos/${BACKEND_REPO}/branches" || echo "branch ${BRANCH} already exists"
|
||||||
|
|
||||||
|
# 2. Обновить файл (contents API требует sha текущего файла).
|
||||||
|
CONTENT_B64=$(base64 -w0 "${SRC}")
|
||||||
|
curl -sf -X PUT -H "$auth" -H "Content-Type: application/json" \
|
||||||
|
-d "{\"content\":\"${CONTENT_B64}\",\"message\":\"chore(contract): sync flutter manifest (${SHORT_SHA})\",\"sha\":\"${REMOTE_SHA}\",\"branch\":\"${BRANCH}\"}" \
|
||||||
|
"${API}/repos/${BACKEND_REPO}/contents/${DST}" > /dev/null
|
||||||
|
|
||||||
|
# 3. PR (если уже открыт — пропускаем).
|
||||||
|
curl -sf -X POST -H "$auth" -H "Content-Type: application/json" \
|
||||||
|
-d "{\"title\":\"[contract-sync] flutter manifest ${SHORT_SHA}\",\"head\":\"${BRANCH}\",\"base\":\"${DEFAULT_BRANCH}\",\"body\":\"Автоматический синк манифеста из eatvio_app@${GITHUB_SHA}.\\n\\nCI бэкенда прогонит FlutterApiContractTest — если бэкенд не выполняет новые требования моделей, тест упадёт на этом PR.\"}" \
|
||||||
|
"${API}/repos/${BACKEND_REPO}/pulls" > /dev/null \
|
||||||
|
|| echo "PR already exists for ${BRANCH}"
|
||||||
|
|
||||||
|
echo "Sync PR opened: ${BACKEND_REPO} <- ${BRANCH}"
|
||||||
@@ -182,6 +182,15 @@ jobs:
|
|||||||
flutter pub get
|
flutter pub get
|
||||||
dart run build_runner build --delete-conflicting-outputs
|
dart run build_runner build --delete-conflicting-outputs
|
||||||
|
|
||||||
|
# Контракт манифеста API: манифест обязан быть регенерирован из исходников freezed-моделей.
|
||||||
|
# Diff после регенерации = PR менял модели, но не обновил api_contract/flutter_model_contract.json.
|
||||||
|
# Обновлённый манифест нужно также синхронизировать в eatvio-web: tests/Fixtures/Contract/.
|
||||||
|
- name: API contract manifest check
|
||||||
|
run: |
|
||||||
|
dart run tool/export_api_contract.dart api_contract/flutter_model_contract.json
|
||||||
|
git diff --exit-code api_contract/flutter_model_contract.json \
|
||||||
|
|| (echo "::error::api_contract/flutter_model_contract.json устарел. Регенерируй манифест (make export-api-contract) и синхронизируй его в eatvio-web: tests/Fixtures/Contract/flutter_model_contract.json" && exit 1)
|
||||||
|
|
||||||
- name: Native Analyze
|
- name: Native Analyze
|
||||||
run: flutter analyze
|
run: flutter analyze
|
||||||
|
|
||||||
|
|||||||
76
AGENTS.md
Normal file
76
AGENTS.md
Normal file
@@ -0,0 +1,76 @@
|
|||||||
|
# AGENTS.md
|
||||||
|
|
||||||
|
Flutter/Dart mobile app (iOS + Android, Russian-market nutrition/consulting product).
|
||||||
|
Gitea-hosted; CI is Gitea Actions in `.gitea/workflows/` (not GitHub Actions, though it references `github.com/actions/*`).
|
||||||
|
|
||||||
|
## Toolchain (trust these over README — README version numbers are stale)
|
||||||
|
|
||||||
|
- CI runs **Flutter 3.41.2 stable**, **Java/JDK 21** (`.gitea/workflows/test.yml`).
|
||||||
|
- `pubspec.yaml` requires **Dart SDK ^3.10.4**; app version is `1.3.23+105` (README claims 1.3.0+79 — wrong).
|
||||||
|
- Build/test/lint via Flutter directly or the `Makefile`. The repo has a `package.json` **only** to wire a git pre-push hook via `simple-git-hooks`; it is not a Node project.
|
||||||
|
|
||||||
|
## CRITICAL: generated code is NOT committed
|
||||||
|
|
||||||
|
`.gitignore` excludes `*.g.dart`, `*.freezed.dart`, `*.gr.dart`, `*.mocks.dart`. After any checkout / pull / model change you **must regenerate** before `flutter analyze`, `flutter test`, or any build, or they fail on missing files:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
dart run build_runner build --delete-conflicting-outputs
|
||||||
|
# or: make build-generated-files
|
||||||
|
```
|
||||||
|
|
||||||
|
Generators in use: `freezed`, `json_serializable`, `retrofit_generator`, `mockito` (`build_runner`).
|
||||||
|
Exception: `lib/generated/` (l10n output from `intl_utils` / `flutter_intl`) **is** committed — don't regenerate-and-clobber it casually.
|
||||||
|
|
||||||
|
## `.env` (required for running the app, NOT for unit tests)
|
||||||
|
|
||||||
|
- The app loads `.env` at startup (`lib/core/app_initializer.dart` → `dotenv.load`) and ships it as a Flutter asset (`pubspec.yaml` assets).
|
||||||
|
- There is **no `env.example` in the repo** despite README/`ENV_SETUP.md` saying `cp env.example .env`. Locally you must obtain `.env` from the team. In CI it is checked out from a **private `eatvio/eatvio_app_env` repo**.
|
||||||
|
- `flutter test` does **not** need `.env`: tests seed env via `dotenv.loadFromString(...)` (see `test/core/app_config_test.dart`). Access values only through `lib/core/env_config.dart` (`EnvConfig`).
|
||||||
|
- Build types: `AppBuildType { prod, tests, dev }` (`lib/core/app_initializer.dart`). `prod` → `BASE_URL`; `tests`/`dev` → `DEV_BASE_URL`. `main.dart` hardcodes `prod`.
|
||||||
|
|
||||||
|
## Commands
|
||||||
|
|
||||||
|
```bash
|
||||||
|
make run-analyse # flutter analyze
|
||||||
|
make run-tests # flutter test
|
||||||
|
make run-checks # analyze THEN test (also the pre-push hook)
|
||||||
|
make build-generated-files # build_runner --delete-conflicting-outputs
|
||||||
|
make clean-coverage # strips generated files from coverage/lcov.info
|
||||||
|
```
|
||||||
|
|
||||||
|
Run a single test file / single test:
|
||||||
|
```bash
|
||||||
|
flutter test test/core/app_config_test.dart
|
||||||
|
flutter test test/core/app_config_test.dart --plain-name "creates config with prod build type"
|
||||||
|
```
|
||||||
|
|
||||||
|
Coverage (must be run with the flag): `flutter test --coverage`, then `make clean-coverage`. `analyze_coverage.py` / `analyze_coverage_by_uncovered.py` summarize `coverage/lcov.info`.
|
||||||
|
|
||||||
|
## CI gate (binding constraint on PRs)
|
||||||
|
|
||||||
|
`.gitea/workflows/test.yml` runs on every PR, in order:
|
||||||
|
1. `flutter clean` → `flutter pub get` → `dart run build_runner build --delete-conflicting-outputs`
|
||||||
|
2. `flutter analyze`
|
||||||
|
3. `flutter test --coverage`
|
||||||
|
4. **Coverage must be ≥ 70%** (generated files excluded) or the job fails — keep this in mind when adding untested code.
|
||||||
|
5. `flutter build apk --release --dart-define=HIDE_PLANS=false --dart-define=BUILD_DATE=...`
|
||||||
|
|
||||||
|
Note: other workflow files (`build.yml`, `docker-run-tests.yml`) are simpler/older and do **not** run `build_runner`; `test.yml` is the authoritative one.
|
||||||
|
|
||||||
|
## Architecture map
|
||||||
|
|
||||||
|
- Entry: `lib/main.dart` → `AppInitializer.initialize` (env → DI → Sentry → Firebase → analytics) → runs app under Sentry.
|
||||||
|
- DI: `get_it` (`sl` global), registered in `lib/core/locator_service.dart` via `lib/core/di/*_registrations.dart` (app_config, external, service, repository, cubit).
|
||||||
|
- State: `flutter_bloc` (Cubits/Blocs). Global providers declared in `lib/core/app_config.dart` (`globalBlocProviders`).
|
||||||
|
- Routing: `go_router` (`lib/core/app_router.dart`), with deep-link/push handling in `lib/core/notifications/`.
|
||||||
|
- Networking: `dio` + `retrofit` (→ `.gr.dart`); auth token interceptor in `lib/core/interceptors/`.
|
||||||
|
- Models: `freezed` + `json_serializable` (→ `.freezed.dart` / `.g.dart`).
|
||||||
|
- Realtime: Pusher channels via `lib/core/websockets/` (`WsManager`).
|
||||||
|
- Features: ~40 self-contained folders under `lib/features/<feature>/`, conventionally `.../presentation/bloc/<name>_cubit/<name>_cubit.dart`. Tests mirror `lib/` under `test/` with fixtures in `test/fixtures/`.
|
||||||
|
- Localization: Russian only (`ru`); strings via generated `S` class from `lib/generated/l10n.dart`.
|
||||||
|
|
||||||
|
## Conventions / gotchas
|
||||||
|
|
||||||
|
- `analysis_options.yaml` enables `flutter_lints` + extra `prefer_const_*` rules and **excludes generated + l10n files** from analysis. `dart_code_metrics` is also configured (cyclomatic ≤20, ≤50 lines executable, ≤4 params, nesting ≤5) but metrics exclude `test/**`.
|
||||||
|
- Don't commit secrets: `.env`, `android/key.properties`, `*.jks` keystores are all gitignored.
|
||||||
|
- Comments and many code identifiers are in Russian (UI strings, doc comments like `/// Загрузка переменных окружения`); match surrounding style.
|
||||||
11
Makefile
11
Makefile
@@ -11,3 +11,14 @@ build-generated-files:
|
|||||||
|
|
||||||
clean-coverage:
|
clean-coverage:
|
||||||
@./scripts/remove_generated_from_coverage.sh
|
@./scripts/remove_generated_from_coverage.sh
|
||||||
|
|
||||||
|
# Регенерация манифеста API-контракта из исходников freezed-моделей.
|
||||||
|
# Манифест — источник требований мобильных моделей для eatvio-web
|
||||||
|
# (tests/Fixtures/Contract/flutter_model_contract.json).
|
||||||
|
export-api-contract:
|
||||||
|
dart run tool/export_api_contract.dart api_contract/flutter_model_contract.json
|
||||||
|
|
||||||
|
# Проверка актуальности манифеста (для CI): регенерирует и диффает с закоммиченным.
|
||||||
|
check-api-contract: export-api-contract
|
||||||
|
@git diff --exit-code api_contract/flutter_model_contract.json \
|
||||||
|
|| (echo "api_contract/flutter_model_contract.json устарел: регенерируй (make export-api-contract) и синхронизируй в eatvio-web tests/Fixtures/Contract/" && exit 1)
|
||||||
|
|||||||
91
api_contract/README.md
Normal file
91
api_contract/README.md
Normal file
@@ -0,0 +1,91 @@
|
|||||||
|
# Регламент синхронизации API-контракта (eatvio/eatvio ↔ eatvio/eatvio_app)
|
||||||
|
|
||||||
|
> В тексте «eatvio-web» — локальное имя бэкенд-репозитория **eatvio/eatvio** (не slug!).
|
||||||
|
|
||||||
|
## Стороны и артефакты
|
||||||
|
|
||||||
|
| Репозиторий | Артефакт | Роль |
|
||||||
|
|---|---|---|
|
||||||
|
| eatvio_app | `tool/export_api_contract.dart` | генератор: парсит freezed-декларации из **исходников** (не из `*.g.dart`) |
|
||||||
|
| eatvio_app | `api_contract/flutter_model_contract.json` | **источник истины**: требования мобильных моделей к JSON (required/optional ключи) |
|
||||||
|
| eatvio-web | `tests/Fixtures/Contract/flutter_model_contract.json` | синхронизированная копия, по ней CI бэка валидирует API-ресурсы |
|
||||||
|
| eatvio-web | `tests/Feature/Contract/FlutterApiContractTest.php` | контрактные тесты: worst-case сериализация ресурса ↔ манифест |
|
||||||
|
|
||||||
|
Контракт односторонний по данным: бэкенд отдаёт JSON → flutter читает (`fromJson`). Экстремальный случай — nullable-колонка на бэке при required-поле во flutter: ровно он дал продовой баг FLUTTER-1BX (`satiety: null` → `TypeError` в `_$MealModelFromJson`, дневник мобильных клиентов не работал, КБЖУ-информер показал нули).
|
||||||
|
|
||||||
|
## Направление 1: backend → frontend (бэк меняет ответ API)
|
||||||
|
|
||||||
|
1. Дев меняет API-ресурс в eatvio-web (например, делает поле nullable / удаляет ключ).
|
||||||
|
2. `FlutterApiContractTest` падает, если новое поведение нарушает манифест — **это и есть фильтр обратной несовместимости**.
|
||||||
|
3. Дальше два осознанных пути:
|
||||||
|
- **Сохранить совместимость** (предпочтительно): вернуть значение/дефолт на бэке (`?? 0`, как с `time` → `'00:00:00'`). Манифест не меняется.
|
||||||
|
- **Ломать сознательно**: мержится mobile-first — сначала в eatvio_app поле становится nullable/опциональным, выходит релиз приложения; затем PR в eatvio-web меняет ресурс и копию манифеста. Пока старые версии приложения в рынке — бэк держит старый формат.
|
||||||
|
4. Коммит копии манифеста в eatvio-web без изменения ресурса бессмысленен и не проходит ревью: манифест меняется только вместе с ресурсом.
|
||||||
|
|
||||||
|
## Направление 2: frontend → backend (фронт ужесточает требования)
|
||||||
|
|
||||||
|
1. Дев меняет freezed-модель в eatvio_app (например, добавляет `required int nutrition`).
|
||||||
|
2. CI eatvio_app (`test.yml`, шаг `API contract manifest check`) регенерирует манифест и диффает: устарел → PR не проходит.
|
||||||
|
3. Дев обновляет манифест (`make export-api-contract`) и **в том же PR** синхронизирует копию в eatvio-web (`tests/Fixtures/Contract/`).
|
||||||
|
4. CI eatvio-web прогоняет `FlutterApiContractTest` против новой копии: если бэк не выдаёт новые required-ключи — падает уже там, и бэк добавляет гарантии **до** релиза приложения.
|
||||||
|
5. Порядок релизов: бэк докручивается первым (он назад-совместим), затем выходит приложение.
|
||||||
|
|
||||||
|
## Правила совместимости (шпаргалка)
|
||||||
|
|
||||||
|
| Изменение на бэке | Ломает приложение? | Действие |
|
||||||
|
|---|---|---|
|
||||||
|
| Поле остаётся non-null | нет | ничего |
|
||||||
|
| Добавлен новый ключ | нет (flutter игнорирует лишнее) | ничего; добавить в модель отдельно при необходимости |
|
||||||
|
| non-null → nullable / ключ удалён | **да** | mobile-first: релиз приложения, потом бэк |
|
||||||
|
| flutter: `int` → `int?` | нет | `make export-api-contract` + синк манифеста |
|
||||||
|
| flutter: добавлен `required`-ключ | **бэк может не выполнять** | синк манифеста → бэк добавляет ключ/дефолт до релиза |
|
||||||
|
|
||||||
|
## Автоматика
|
||||||
|
|
||||||
|
| Где | Что | Когда срабатывает |
|
||||||
|
|---|---|---|
|
||||||
|
| eatvio_app, CI | шаг `API contract manifest check` (test.yml) | каждый PR: манифест обязан быть регенерирован из исходников |
|
||||||
|
| eatvio_app, CI | `contract-sync.yml` | push в main с изменениями `api_contract/**` → авто-PR в eatvio (бэкенд) с новой копией манифеста |
|
||||||
|
| eatvio_app, локально | `make export-api-contract` / `make check-api-contract` | руками при работе над моделями |
|
||||||
|
| eatvio-web, CI | `FlutterApiContractTest` (12 тестов) | каждый PR: worst-case сериализация ресурсов ↔ манифест |
|
||||||
|
| eatvio-web, CI | `contract-drift-check.yaml` | еженощно: сравнение локальной копии манифеста с eatvio_app@main, при дрейфе — issue |
|
||||||
|
| eatvio-web, локально | `make sync-flutter-contract` | руками, если авто-PR не пришёл |
|
||||||
|
|
||||||
|
Секреты: `CONTRACT_SYNC_TOKEN` — PAT с write на eatvio/eatvio (для contract-sync) и read eatvio/eatvio_app + issues на eatvio/eatvio (для drift-check).
|
||||||
|
|
||||||
|
## Как команды держат друг друга в рабочем состоянии (три слоя)
|
||||||
|
|
||||||
|
1. **Предотвращение (до мержа).** Контрактные тесты на обеих сторонах: flutter не смержит модели без регенерации манифеста; бэкенд не смержит ресурс, отдающий null/не тот тип там, где приложение требует non-null.
|
||||||
|
2. **Синхронизация (при мерже).** Авто-PR из `contract-sync.yml` приносит новую копию манифеста в бэкенд; CI бэкенда на этом PR показывает, выполняет ли сервер новые требования. Ночной drift-check ловит всё, что проскочило мимо автоматики.
|
||||||
|
3. **Обнаружение (после релиза).** Sentry: группа `TypeError ... in _$XxxFromJson` (проект flutter) = нарушение контракта в проде. Такой issue должен ссылаться на контрактную пару и закрываться фиксом ресурса + контрак тестом.
|
||||||
|
|
||||||
|
Ритуалы:
|
||||||
|
- Меняешь модель в приложении → `make export-api-contract` в том же PR; манифест уедет в бэкенд автоматически.
|
||||||
|
- Меняешь API-ресурс → прогоняй контрактный тест; красный = либо делай совместимо (дефолты), либо mobile-first релиз.
|
||||||
|
- WARNING генератора о коллизии имён моделей (`Step`, `Users`, ...) — повод переименовать Dart-классы: под одним именем могут скрываться разные контракты.
|
||||||
|
|
||||||
|
## Формат манифеста
|
||||||
|
|
||||||
|
Каждая модель: `required` / `optional` (JSON-ключи), `types` (Dart-тип поля) и `kinds`
|
||||||
|
(JSON-вид значения, по которому бэкенд-чекер валидирует payload):
|
||||||
|
|
||||||
|
| kind | Dart-типы | Ожидание в JSON |
|
||||||
|
|---|---|---|
|
||||||
|
| `number` | `int`, `double`, `num` | число (int или float) |
|
||||||
|
| `string` | `String` | строка |
|
||||||
|
| `boolean` | `bool` | строго true/false (int 0/1 — нарушение) |
|
||||||
|
| `list` | `List<...>` | массив |
|
||||||
|
| `map` | `Map<...>` | объект |
|
||||||
|
| `model` | вложенная freezed-модель | объект |
|
||||||
|
| `enum` | Dart enum | строка-имя или int |
|
||||||
|
| `any` / `unknown` | `dynamic` и прочее | не проверяется |
|
||||||
|
|
||||||
|
Это закрывает второй класс мобильных крашей: жёсткие касты (`json['from_diet'] as bool`,
|
||||||
|
`json['quantity'] as num`) роняют приложение даже на non-null значениях — например,
|
||||||
|
если PHP отдаст tinyint `0/1` вместо bool или строку `"150"` вместо числа.
|
||||||
|
|
||||||
|
## Границы подхода
|
||||||
|
|
||||||
|
- Манифест покрывает **ответы** API (fromJson). Контракт запросов (retrofit → FormRequest) пока не формализован.
|
||||||
|
- Новый ключ бэкенда не требует изменения манифеста — flutter молча игнорирует лишнее; расширять модели — добровольно.
|
||||||
|
- `kinds: unknown` не проверяется (неклассифицированные типы), чтобы не давать ложных срабатываний.
|
||||||
4383
api_contract/flutter_model_contract.json
Normal file
4383
api_contract/flutter_model_contract.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -30,6 +30,7 @@ import 'package:eatvio_app/features/chat/utils/chat_counterpart_utils.dart';
|
|||||||
import 'package:eatvio_app/features/consultations/utils/consultation_progress_mapper.dart';
|
import 'package:eatvio_app/features/consultations/utils/consultation_progress_mapper.dart';
|
||||||
import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
|
import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
|
||||||
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
|
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
|
||||||
|
import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
|
||||||
import 'package:eatvio_app/features/user_details/presentation/user_details_screen.dart';
|
import 'package:eatvio_app/features/user_details/presentation/user_details_screen.dart';
|
||||||
import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart';
|
import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart';
|
||||||
import 'package:eatvio_app/features/video_calls/presentation/pages/video_call_screen.dart';
|
import 'package:eatvio_app/features/video_calls/presentation/pages/video_call_screen.dart';
|
||||||
@@ -72,6 +73,10 @@ class _ChatScreenState extends State<ChatScreen> {
|
|||||||
|
|
||||||
String? get conversationUuid => _effectiveUuid ?? widget.uuid;
|
String? get conversationUuid => _effectiveUuid ?? widget.uuid;
|
||||||
|
|
||||||
|
bool _canStartVideoCall(ChosenPlanModel? chosenPlan) {
|
||||||
|
return chosenPlan?.chosenPlanState.allowsVideoCall ?? false;
|
||||||
|
}
|
||||||
|
|
||||||
void _onHide() {
|
void _onHide() {
|
||||||
chatRoomCubit.cancelTimer();
|
chatRoomCubit.cancelTimer();
|
||||||
}
|
}
|
||||||
@@ -205,6 +210,7 @@ class _ChatScreenState extends State<ChatScreen> {
|
|||||||
chosenPlan != null &&
|
chosenPlan != null &&
|
||||||
chosenPlan.chosenPlanState !=
|
chosenPlan.chosenPlanState !=
|
||||||
ChosenPlanStateEnum.stateCanceledByTheInitiator;
|
ChosenPlanStateEnum.stateCanceledByTheInitiator;
|
||||||
|
final showVideoCallButton = _canStartVideoCall(chosenPlan);
|
||||||
|
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
resizeToAvoidBottomInset: true,
|
resizeToAvoidBottomInset: true,
|
||||||
@@ -300,12 +306,14 @@ class _ChatScreenState extends State<ChatScreen> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
actions: [
|
actions: [
|
||||||
Padding(
|
if (showVideoCallButton)
|
||||||
padding: const EdgeInsetsDirectional.only(end: 8),
|
Padding(
|
||||||
child: _ChatHeaderVideoCallButton(
|
padding: const EdgeInsetsDirectional.only(end: 8),
|
||||||
onPressed: () => _openVideoCall(context, state, chatCounterpart),
|
child: _ChatHeaderVideoCallButton(
|
||||||
|
onPressed: () =>
|
||||||
|
_openVideoCall(context, state, chatCounterpart),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
body: SafeArea(
|
body: SafeArea(
|
||||||
@@ -324,8 +332,7 @@ class _ChatScreenState extends State<ChatScreen> {
|
|||||||
InfoByOrderScreen.path,
|
InfoByOrderScreen.path,
|
||||||
extra: {
|
extra: {
|
||||||
'planId': chosenPlan?.id,
|
'planId': chosenPlan?.id,
|
||||||
'customerSlug':
|
'customerSlug': state.chatRoom.users.receiver.slug,
|
||||||
state.chatRoom.users.receiver.slug,
|
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
@@ -1018,7 +1025,8 @@ class _ChatScreenState extends State<ChatScreen> {
|
|||||||
required bool? amIConsultant,
|
required bool? amIConsultant,
|
||||||
}) {
|
}) {
|
||||||
if (message.type == ChatMessageType.videoCallStarted &&
|
if (message.type == ChatMessageType.videoCallStarted &&
|
||||||
!isCurrentUserAuthor) {
|
!isCurrentUserAuthor &&
|
||||||
|
_canStartVideoCall(state.chatRoom.chosenPlan)) {
|
||||||
return VideoCallChatMessageWidget(
|
return VideoCallChatMessageWidget(
|
||||||
text: message.data.trim(),
|
text: message.data.trim(),
|
||||||
sendTime: message.updatedAt,
|
sendTime: message.updatedAt,
|
||||||
|
|||||||
@@ -102,9 +102,9 @@ class DiaryCubit extends Cubit<DiaryState> {
|
|||||||
setDiary(diaryDay: diaryEntity, diaryId: diaryId);
|
setDiary(diaryDay: diaryEntity, diaryId: diaryId);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (diaryDay.typeOfDiary.hasChosenDiet == true && diaryDay.typeOfDiary.diaryState == null) {
|
|
||||||
setDiaryForDietOnly(diaryDay.toDiaryFutureDayEntity());
|
if (_isUnsavedDietPreview(diaryDay)) {
|
||||||
return true;
|
return await setDiaryForDietOnly(diaryDay.toDiaryFutureDayEntity());
|
||||||
}
|
}
|
||||||
emit(currentState);
|
emit(currentState);
|
||||||
return false;
|
return false;
|
||||||
@@ -157,84 +157,50 @@ class DiaryCubit extends Cubit<DiaryState> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool _isUnsavedDietPreview(DiaryDayModel diaryDay) {
|
||||||
|
final diaryState = diaryDay.typeOfDiary.diaryState;
|
||||||
|
final dayNotStarted = diaryState == null || diaryState == DiaryStateEnum.init;
|
||||||
|
return diaryDay.typeOfDiary.hasChosenDiet && dayNotStarted;
|
||||||
|
}
|
||||||
|
|
||||||
Future<bool> setDiaryForDietOnly(DiaryFutureDietDayEntity diaryDay) async {
|
Future<bool> setDiaryForDietOnly(DiaryFutureDietDayEntity diaryDay) async {
|
||||||
if (!diaryDay.typeOfDiary.hasChosenDiet) {
|
final dietId = diaryDay.diet?.id;
|
||||||
|
final dayOfChosenDiet = diaryDay.dayOfChosenDiet;
|
||||||
|
if (!diaryDay.typeOfDiary.hasChosenDiet || dietId == null || dayOfChosenDiet == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
emit(const DiaryState.loading());
|
emit(const DiaryState.loading());
|
||||||
try {
|
try {
|
||||||
if (diaryDay.diet?.id != null && diaryDay.dayOfChosenDiet != null) {
|
final diet = await dietRepository.getDiet(dietId);
|
||||||
final diet = await dietRepository.getDiet((diaryDay.diet?.id)!);
|
final meals = diet.dailySchedule[dayOfChosenDiet];
|
||||||
final meals = diet.dailySchedule[diaryDay.dayOfChosenDiet];
|
List<PortionModel> portionsOfMeal(int mealNumber) {
|
||||||
final firstMealPortions = meals?[1]?.values.map((elem) {
|
return meals?[mealNumber]?.values
|
||||||
return PortionModel(
|
.map(
|
||||||
id: 0,
|
(elem) => PortionModel(
|
||||||
productName: elem.name,
|
id: 0,
|
||||||
quantity: elem.quantity,
|
productName: elem.name,
|
||||||
portion: elem.portion.getValue(),
|
quantity: elem.quantity,
|
||||||
fromDiet: true,
|
portion: elem.portion.getValue(),
|
||||||
portionState: PortionState.filledDiet,
|
fromDiet: true,
|
||||||
);
|
portionState: PortionState.filledDiet,
|
||||||
}).toList();
|
),
|
||||||
|
)
|
||||||
|
.toList() ??
|
||||||
|
[];
|
||||||
|
}
|
||||||
|
|
||||||
final secondMealPortions = meals?[2]?.values.map((elem) {
|
MealModel meal(int mealNumber) {
|
||||||
return PortionModel(
|
return MealModel(id: 0, time: '0', typeNumber: mealNumber, satiety: 0, mood: 0, portions: portionsOfMeal(mealNumber), photos: []);
|
||||||
id: 0,
|
}
|
||||||
productName: elem.name,
|
|
||||||
quantity: elem.quantity,
|
|
||||||
portion: elem.portion.getValue(),
|
|
||||||
fromDiet: true,
|
|
||||||
portionState: PortionState.filledDiet,
|
|
||||||
);
|
|
||||||
}).toList();
|
|
||||||
|
|
||||||
final thirdMealPortions = meals?[3]?.values.map((elem) {
|
|
||||||
return PortionModel(
|
|
||||||
id: 0,
|
|
||||||
productName: elem.name,
|
|
||||||
quantity: elem.quantity,
|
|
||||||
portion: elem.portion.getValue(),
|
|
||||||
fromDiet: true,
|
|
||||||
portionState: PortionState.filledDiet,
|
|
||||||
);
|
|
||||||
}).toList();
|
|
||||||
|
|
||||||
final fourthMealPortions = meals?[4]?.values.map((elem) {
|
|
||||||
return PortionModel(
|
|
||||||
id: 0,
|
|
||||||
productName: elem.name,
|
|
||||||
quantity: elem.quantity,
|
|
||||||
portion: elem.portion.getValue(),
|
|
||||||
fromDiet: true,
|
|
||||||
portionState: PortionState.filledDiet,
|
|
||||||
);
|
|
||||||
}).toList();
|
|
||||||
|
|
||||||
final fifthMealPortions = meals?[5]?.values.map((elem) {
|
|
||||||
return PortionModel(
|
|
||||||
id: 0,
|
|
||||||
productName: elem.name,
|
|
||||||
quantity: elem.quantity,
|
|
||||||
portion: elem.portion.getValue(),
|
|
||||||
fromDiet: true,
|
|
||||||
portionState: PortionState.filledDiet,
|
|
||||||
);
|
|
||||||
}).toList();
|
|
||||||
final firstMeal = MealModel(id: 0, time: '0', typeNumber: 1, satiety: 0, mood: 0, portions: firstMealPortions ?? [], photos: []);
|
|
||||||
final secondMeal = MealModel(id: 0, time: '0', typeNumber: 2, satiety: 0, mood: 0, portions: secondMealPortions ?? [], photos: []);
|
|
||||||
final thirdMeal = MealModel(id: 0, time: '0', typeNumber: 3, satiety: 0, mood: 0, portions: thirdMealPortions ?? [], photos: []);
|
|
||||||
final fourthMeal = MealModel(id: 0, time: '0', typeNumber: 4, satiety: 0, mood: 0, portions: fourthMealPortions ?? [], photos: []);
|
|
||||||
final fifthMeal = MealModel(id: 0, time: '0', typeNumber: 5, satiety: 0, mood: 0, portions: fifthMealPortions ?? [], photos: []);
|
|
||||||
emit(
|
emit(
|
||||||
DiaryState.loadedTomorrowWithDiet(
|
DiaryState.loadedTomorrowWithDiet(
|
||||||
diary: diaryDay.copyWith(meals: [firstMeal, secondMeal, thirdMeal, fourthMeal, fifthMeal]),
|
diary: diaryDay.copyWith(meals: [meal(1), meal(2), meal(3), meal(4), meal(5)]),
|
||||||
selectedDay: selectedDay,
|
selectedDay: selectedDay,
|
||||||
selectedMeal: selectedMeal,
|
selectedMeal: selectedMeal,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
|
||||||
return false;
|
|
||||||
} catch (e, st) {
|
} catch (e, st) {
|
||||||
await reportFrom(e, st, this);
|
await reportFrom(e, st, this);
|
||||||
emit(DiaryState.error(errorMessage: e.toString()));
|
emit(DiaryState.error(errorMessage: e.toString()));
|
||||||
|
|||||||
@@ -88,6 +88,18 @@ enum ChosenPlanStateEnum {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool get allowsVideoCall {
|
||||||
|
switch (this) {
|
||||||
|
case ChosenPlanStateEnum.stateCanceledByTheInitiator:
|
||||||
|
case ChosenPlanStateEnum.statePaymentFailed:
|
||||||
|
case ChosenPlanStateEnum.stateDone:
|
||||||
|
case ChosenPlanStateEnum.stateChargeWasCollected:
|
||||||
|
return false;
|
||||||
|
default:
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static List<ChosenPlanStateEnum> getActiveStates() {
|
static List<ChosenPlanStateEnum> getActiveStates() {
|
||||||
return [
|
return [
|
||||||
ChosenPlanStateEnum.statePaid,
|
ChosenPlanStateEnum.statePaid,
|
||||||
|
|||||||
@@ -170,14 +170,29 @@ class _VideoCallRecordingsViewState extends State<_VideoCallRecordingsView> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (state.recordings.isEmpty) {
|
if (state.recordings.isEmpty) {
|
||||||
return Center(
|
return RefreshIndicator(
|
||||||
child: Padding(
|
onRefresh: () => context.read<VideoCallRecordingsCubit>().load(refresh: true),
|
||||||
padding: const EdgeInsets.all(24),
|
child: LayoutBuilder(
|
||||||
child: Text(
|
builder: (context, constraints) {
|
||||||
s.video_call_recordings_empty,
|
return ListView(
|
||||||
textAlign: TextAlign.center,
|
physics: const AlwaysScrollableScrollPhysics(),
|
||||||
style: TextStyles.textMMedium.copyWith(color: appTheme.blueGray400),
|
children: [
|
||||||
),
|
SizedBox(
|
||||||
|
height: constraints.maxHeight,
|
||||||
|
child: Center(
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(24),
|
||||||
|
child: Text(
|
||||||
|
s.video_call_recordings_empty,
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: TextStyles.textMMedium.copyWith(color: appTheme.blueGray400),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
},
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -186,6 +201,7 @@ class _VideoCallRecordingsViewState extends State<_VideoCallRecordingsView> {
|
|||||||
onRefresh: () => context.read<VideoCallRecordingsCubit>().load(refresh: true),
|
onRefresh: () => context.read<VideoCallRecordingsCubit>().load(refresh: true),
|
||||||
child: ListView.separated(
|
child: ListView.separated(
|
||||||
controller: _scrollController,
|
controller: _scrollController,
|
||||||
|
physics: const AlwaysScrollableScrollPhysics(),
|
||||||
padding: const EdgeInsets.fromLTRB(16, 0, 16, 24),
|
padding: const EdgeInsets.fromLTRB(16, 0, 16, 24),
|
||||||
itemCount: state.recordings.length + (state.isLoadingMore ? 1 : 0),
|
itemCount: state.recordings.length + (state.isLoadingMore ? 1 : 0),
|
||||||
separatorBuilder: (_, _) => const SizedBox(height: 16),
|
separatorBuilder: (_, _) => const SizedBox(height: 16),
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ class PublicDownloadsSaver {
|
|||||||
const PublicDownloadsSaver();
|
const PublicDownloadsSaver();
|
||||||
|
|
||||||
/// Имя папки приложения в Загрузках / Files.
|
/// Имя папки приложения в Загрузках / Files.
|
||||||
static const appFolderName = 'Itvio';
|
static const appFolderName = 'Eatvio';
|
||||||
|
|
||||||
Future<String> saveToDownloads({
|
Future<String> saveToDownloads({
|
||||||
required String sourcePath,
|
required String sourcePath,
|
||||||
|
|||||||
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
|
|
||||||
import 'package:flutter/foundation.dart';
|
|
||||||
import 'package:intl/intl.dart';
|
import 'package:intl/intl.dart';
|
||||||
import 'package:intl/message_lookup_by_library.dart';
|
import 'package:intl/message_lookup_by_library.dart';
|
||||||
import 'package:intl/src/intl_helpers.dart';
|
import 'package:intl/src/intl_helpers.dart';
|
||||||
@@ -21,8 +20,8 @@ import 'messages_ru.dart' as messages_ru;
|
|||||||
|
|
||||||
typedef Future<dynamic> LibraryLoader();
|
typedef Future<dynamic> LibraryLoader();
|
||||||
Map<String, LibraryLoader> _deferredLibraries = {
|
Map<String, LibraryLoader> _deferredLibraries = {
|
||||||
'en': () => new SynchronousFuture(null),
|
'en': () => new Future.value(null),
|
||||||
'ru': () => new SynchronousFuture(null),
|
'ru': () => new Future.value(null),
|
||||||
};
|
};
|
||||||
|
|
||||||
MessageLookupByLibrary? _findExact(String localeName) {
|
MessageLookupByLibrary? _findExact(String localeName) {
|
||||||
@@ -37,20 +36,18 @@ MessageLookupByLibrary? _findExact(String localeName) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// User programs should call this before using [localeName] for messages.
|
/// User programs should call this before using [localeName] for messages.
|
||||||
Future<bool> initializeMessages(String localeName) {
|
Future<bool> initializeMessages(String localeName) async {
|
||||||
var availableLocale = Intl.verifiedLocale(
|
var availableLocale = Intl.verifiedLocale(
|
||||||
localeName,
|
localeName, (locale) => _deferredLibraries[locale] != null,
|
||||||
(locale) => _deferredLibraries[locale] != null,
|
onFailure: (_) => null);
|
||||||
onFailure: (_) => null,
|
|
||||||
);
|
|
||||||
if (availableLocale == null) {
|
if (availableLocale == null) {
|
||||||
return new SynchronousFuture(false);
|
return new Future.value(false);
|
||||||
}
|
}
|
||||||
var lib = _deferredLibraries[availableLocale];
|
var lib = _deferredLibraries[availableLocale];
|
||||||
lib == null ? new SynchronousFuture(false) : lib();
|
await (lib == null ? new Future.value(false) : lib());
|
||||||
initializeInternalMessageLookup(() => new CompositeMessageLookup());
|
initializeInternalMessageLookup(() => new CompositeMessageLookup());
|
||||||
messageLookup.addLocale(availableLocale, _findGeneratedMessagesFor);
|
messageLookup.addLocale(availableLocale, _findGeneratedMessagesFor);
|
||||||
return new SynchronousFuture(true);
|
return new Future.value(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool _messagesExistFor(String locale) {
|
bool _messagesExistFor(String locale) {
|
||||||
@@ -62,11 +59,8 @@ bool _messagesExistFor(String locale) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
MessageLookupByLibrary? _findGeneratedMessagesFor(String locale) {
|
MessageLookupByLibrary? _findGeneratedMessagesFor(String locale) {
|
||||||
var actualLocale = Intl.verifiedLocale(
|
var actualLocale =
|
||||||
locale,
|
Intl.verifiedLocale(locale, _messagesExistFor, onFailure: (_) => null);
|
||||||
_messagesExistFor,
|
|
||||||
onFailure: (_) => null,
|
|
||||||
);
|
|
||||||
if (actualLocale == null) return null;
|
if (actualLocale == null) return null;
|
||||||
return _findExact(actualLocale);
|
return _findExact(actualLocale);
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
|||||||
name: eatvio_app
|
name: eatvio_app
|
||||||
description: A new Flutter project.
|
description: A new Flutter project.
|
||||||
version: 1.3.72+161
|
version: 1.3.73+162
|
||||||
publish_to: 'none'
|
publish_to: 'none'
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
|
|||||||
@@ -12,6 +12,12 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_
|
|||||||
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
|
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
|
||||||
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_state.dart';
|
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_state.dart';
|
||||||
import 'package:eatvio_app/features/chat/presentation/pages/chat_screen.dart';
|
import 'package:eatvio_app/features/chat/presentation/pages/chat_screen.dart';
|
||||||
|
import 'package:eatvio_app/features/chat/presentation/widgets/video_call_chat_message_widget.dart';
|
||||||
|
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
|
||||||
|
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
|
||||||
|
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
|
||||||
|
import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
|
||||||
|
import 'package:eatvio_app/generated/l10n.dart';
|
||||||
import 'package:material_ui/material_ui.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:flutter_dotenv/flutter_dotenv.dart';
|
import 'package:flutter_dotenv/flutter_dotenv.dart';
|
||||||
@@ -55,13 +61,57 @@ void main() {
|
|||||||
|
|
||||||
final fakeBundle = _FakeAssetBundle({
|
final fakeBundle = _FakeAssetBundle({
|
||||||
'assets/icons/error_icon.svg': fakeSvg,
|
'assets/icons/error_icon.svg': fakeSvg,
|
||||||
|
'assets/icons/video_call/vc_control_enter.svg': fakeSvg,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const plan = PlanModel(
|
||||||
|
id: 1,
|
||||||
|
slug: 'test-plan',
|
||||||
|
name: 'Test Plan',
|
||||||
|
image: 'https://example.com/image.jpg',
|
||||||
|
duration: 30,
|
||||||
|
state: 'active',
|
||||||
|
type: PlanType(fit: true, slim: false, behavior: false, wellness: false),
|
||||||
|
details: 'Test details',
|
||||||
|
packetsCount: 3,
|
||||||
|
author: Author(
|
||||||
|
authorSlug: 'author',
|
||||||
|
authorName: 'Author Name',
|
||||||
|
authorProfileIcon: 'https://example.com/icon.jpg',
|
||||||
|
authorIsMe: false,
|
||||||
|
),
|
||||||
|
totalLikes: 10,
|
||||||
|
totalViews: 100,
|
||||||
|
totalComments: 5,
|
||||||
|
isFavorite: false,
|
||||||
|
minPriceOfOptions: 1000,
|
||||||
|
maxPriceOfOptions: 2000,
|
||||||
|
wasLikedByMe: false,
|
||||||
|
);
|
||||||
|
|
||||||
|
ChosenPlanModel chosenPlan(ChosenPlanStateEnum state) {
|
||||||
|
return ChosenPlanModel(
|
||||||
|
id: 7,
|
||||||
|
optionType: 'options1',
|
||||||
|
startDate: DateTime(2025, 1, 1),
|
||||||
|
chosenPlanState: state,
|
||||||
|
chatId: '1',
|
||||||
|
consultantId: 2,
|
||||||
|
plan: plan,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
Widget wrap(Widget child, ChatsCubit chatsCubit) {
|
Widget wrap(Widget child, ChatsCubit chatsCubit) {
|
||||||
return DefaultAssetBundle(
|
return DefaultAssetBundle(
|
||||||
bundle: fakeBundle,
|
bundle: fakeBundle,
|
||||||
child: MaterialApp(
|
child: MaterialApp(
|
||||||
theme: ThemeHelper().themeData(),
|
theme: ThemeHelper().themeData(),
|
||||||
|
locale: const Locale('ru'),
|
||||||
|
localizationsDelegates: const [
|
||||||
|
S.delegate,
|
||||||
|
...GlobalMaterialLocalizations.delegates,
|
||||||
|
],
|
||||||
|
supportedLocales: S.delegate.supportedLocales,
|
||||||
home: BlocProvider<ChatsCubit>.value(value: chatsCubit, child: child),
|
home: BlocProvider<ChatsCubit>.value(value: chatsCubit, child: child),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@@ -202,9 +252,133 @@ void main() {
|
|||||||
expect(find.text('sending...'), findsOneWidget);
|
expect(find.text('sending...'), findsOneWidget);
|
||||||
expect(find.text('tap to retry'), findsOneWidget);
|
expect(find.text('tap to retry'), findsOneWidget);
|
||||||
expect(find.text('file.pdf'), findsOneWidget);
|
expect(find.text('file.pdf'), findsOneWidget);
|
||||||
|
expect(find.byIcon(Icons.videocam_rounded), findsNothing);
|
||||||
VisibilityDetectorController.instance.notifyNow();
|
VisibilityDetectorController.instance.notifyNow();
|
||||||
await tester.pump();
|
await tester.pump();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Future<void> pumpLoadedChat(
|
||||||
|
WidgetTester tester, {
|
||||||
|
ChosenPlanModel? plan,
|
||||||
|
List<ChatMessageModel> messages = const [],
|
||||||
|
}) async {
|
||||||
|
final chatRoomCubit = MockChatRoomCubit();
|
||||||
|
final chatsCubit = MockChatsCubit();
|
||||||
|
const chatRoom = ChatRoomModel(
|
||||||
|
id: '1',
|
||||||
|
chatRoomSettings: ChatRoomSettingsModel(name: 'room', state: 'active'),
|
||||||
|
users: Users(
|
||||||
|
sender: ChatUserModel(
|
||||||
|
id: 1,
|
||||||
|
name: 'Me',
|
||||||
|
slug: 'me',
|
||||||
|
profilePhotoUrl: null,
|
||||||
|
),
|
||||||
|
receiver: ChatUserModel(
|
||||||
|
id: 2,
|
||||||
|
name: 'User Two',
|
||||||
|
slug: 'user-two',
|
||||||
|
profilePhotoUrl: null,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
chosenPlanId: 7,
|
||||||
|
chosenPlan: null,
|
||||||
|
);
|
||||||
|
final state = ChatRoomState.loaded(
|
||||||
|
chatRoom: chatRoom.copyWith(chosenPlan: plan),
|
||||||
|
chatMessages: messages,
|
||||||
|
hasCard: false,
|
||||||
|
isTyping: false,
|
||||||
|
isLoading: false,
|
||||||
|
);
|
||||||
|
|
||||||
|
when(chatRoomCubit.state).thenReturn(state);
|
||||||
|
when(
|
||||||
|
chatRoomCubit.stream,
|
||||||
|
).thenAnswer((_) => const Stream<ChatRoomState>.empty());
|
||||||
|
when(chatRoomCubit.close()).thenAnswer((_) async => Future<void>.value());
|
||||||
|
when(
|
||||||
|
chatRoomCubit.initChat(
|
||||||
|
any,
|
||||||
|
sendInitialMessage: anyNamed('sendInitialMessage'),
|
||||||
|
orderId: anyNamed('orderId'),
|
||||||
|
),
|
||||||
|
).thenAnswer((_) async => 'uuid');
|
||||||
|
when(chatRoomCubit.setTimer()).thenReturn(null);
|
||||||
|
when(chatRoomCubit.refreshChat()).thenAnswer((_) async {});
|
||||||
|
|
||||||
|
if (sl.isRegistered<ChatRoomCubit>()) {
|
||||||
|
sl.unregister<ChatRoomCubit>();
|
||||||
|
}
|
||||||
|
sl.registerFactory<ChatRoomCubit>(() => chatRoomCubit);
|
||||||
|
|
||||||
|
when(chatsCubit.state).thenReturn(ChatsState());
|
||||||
|
when(chatsCubit.stream).thenAnswer((_) => const Stream.empty());
|
||||||
|
when(chatsCubit.close()).thenAnswer((_) async => Future<void>.value());
|
||||||
|
|
||||||
|
await tester.pumpWidget(
|
||||||
|
wrap(
|
||||||
|
const ChatScreen(uuid: 'uuid', sendInitialMessage: false),
|
||||||
|
chatsCubit,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
await tester.pump();
|
||||||
|
await tester.pump(const Duration(milliseconds: 200));
|
||||||
|
}
|
||||||
|
|
||||||
|
ChatMessageModel incomingCallMessage() {
|
||||||
|
return ChatMessageModel(
|
||||||
|
id: 9,
|
||||||
|
data: 'Видеозвонок',
|
||||||
|
mediaData: const [],
|
||||||
|
authorId: 2,
|
||||||
|
updatedAt: DateTime(2025, 1, 2, 11),
|
||||||
|
isRead: true,
|
||||||
|
isCurrentUserAuthor: false,
|
||||||
|
roomId: '1',
|
||||||
|
type: ChatMessageType.videoCallStarted,
|
||||||
|
messageState: MessageState.sent,
|
||||||
|
uuid: 'call',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
testWidgets('shows the call button for an active consultation', (
|
||||||
|
tester,
|
||||||
|
) async {
|
||||||
|
await pumpLoadedChat(
|
||||||
|
tester,
|
||||||
|
plan: chosenPlan(ChosenPlanStateEnum.stateInProgress),
|
||||||
|
messages: [incomingCallMessage()],
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(find.byIcon(Icons.videocam_rounded), findsOneWidget);
|
||||||
|
expect(find.byType(VideoCallChatMessageWidget), findsOneWidget);
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('hides the call button for a finished consultation', (
|
||||||
|
tester,
|
||||||
|
) async {
|
||||||
|
await pumpLoadedChat(
|
||||||
|
tester,
|
||||||
|
plan: chosenPlan(ChosenPlanStateEnum.stateDone),
|
||||||
|
messages: [incomingCallMessage()],
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(find.byIcon(Icons.videocam_rounded), findsNothing);
|
||||||
|
expect(find.byType(VideoCallChatMessageWidget), findsNothing);
|
||||||
|
expect(find.text('Видеозвонок'), findsOneWidget);
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('hides the call button for a canceled consultation', (
|
||||||
|
tester,
|
||||||
|
) async {
|
||||||
|
await pumpLoadedChat(
|
||||||
|
tester,
|
||||||
|
plan: chosenPlan(ChosenPlanStateEnum.stateCanceledByTheInitiator),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(find.byIcon(Icons.videocam_rounded), findsNothing);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -5,22 +5,70 @@ void main() {
|
|||||||
group('ChosenPlanStateEnum', () {
|
group('ChosenPlanStateEnum', () {
|
||||||
test('has all expected values', () {
|
test('has all expected values', () {
|
||||||
expect(ChosenPlanStateEnum.values.length, 16);
|
expect(ChosenPlanStateEnum.values.length, 16);
|
||||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateInited));
|
expect(
|
||||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateStartDateHasBeenSet));
|
ChosenPlanStateEnum.values,
|
||||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateInCoordination));
|
contains(ChosenPlanStateEnum.stateInited),
|
||||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateStarted));
|
);
|
||||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateInProgress));
|
expect(
|
||||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.statePendingPayment));
|
ChosenPlanStateEnum.values,
|
||||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateConfirmedByConsultant));
|
contains(ChosenPlanStateEnum.stateStartDateHasBeenSet),
|
||||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.statePaid));
|
);
|
||||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateCanceledByTheInitiator));
|
expect(
|
||||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateLastDayStarted));
|
ChosenPlanStateEnum.values,
|
||||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateLastDayFinished));
|
contains(ChosenPlanStateEnum.stateInCoordination),
|
||||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateComplained));
|
);
|
||||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateDone));
|
expect(
|
||||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.personalDietSet));
|
ChosenPlanStateEnum.values,
|
||||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateChargeWasCollected));
|
contains(ChosenPlanStateEnum.stateStarted),
|
||||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.statePaymentFailed));
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.values,
|
||||||
|
contains(ChosenPlanStateEnum.stateInProgress),
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.values,
|
||||||
|
contains(ChosenPlanStateEnum.statePendingPayment),
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.values,
|
||||||
|
contains(ChosenPlanStateEnum.stateConfirmedByConsultant),
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.values,
|
||||||
|
contains(ChosenPlanStateEnum.statePaid),
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.values,
|
||||||
|
contains(ChosenPlanStateEnum.stateCanceledByTheInitiator),
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.values,
|
||||||
|
contains(ChosenPlanStateEnum.stateLastDayStarted),
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.values,
|
||||||
|
contains(ChosenPlanStateEnum.stateLastDayFinished),
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.values,
|
||||||
|
contains(ChosenPlanStateEnum.stateComplained),
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.values,
|
||||||
|
contains(ChosenPlanStateEnum.stateDone),
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.values,
|
||||||
|
contains(ChosenPlanStateEnum.personalDietSet),
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.values,
|
||||||
|
contains(ChosenPlanStateEnum.stateChargeWasCollected),
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.values,
|
||||||
|
contains(ChosenPlanStateEnum.statePaymentFailed),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('getShowableChatBadgeStates returns correct states', () {
|
test('getShowableChatBadgeStates returns correct states', () {
|
||||||
@@ -40,32 +88,77 @@ void main() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('isStateAfterPaidState returns false for states before paid', () {
|
test('isStateAfterPaidState returns false for states before paid', () {
|
||||||
expect(ChosenPlanStateEnum.stateCanceledByTheInitiator.isStateAfterPaidState(), isFalse);
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateCanceledByTheInitiator.isStateAfterPaidState(),
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
expect(ChosenPlanStateEnum.stateInited.isStateAfterPaidState(), isFalse);
|
expect(ChosenPlanStateEnum.stateInited.isStateAfterPaidState(), isFalse);
|
||||||
expect(ChosenPlanStateEnum.stateInCoordination.isStateAfterPaidState(), isFalse);
|
expect(
|
||||||
expect(ChosenPlanStateEnum.stateStartDateHasBeenSet.isStateAfterPaidState(), isFalse);
|
ChosenPlanStateEnum.stateInCoordination.isStateAfterPaidState(),
|
||||||
expect(ChosenPlanStateEnum.statePendingPayment.isStateAfterPaidState(), isFalse);
|
isFalse,
|
||||||
expect(ChosenPlanStateEnum.statePaymentFailed.isStateAfterPaidState(), isFalse);
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateStartDateHasBeenSet.isStateAfterPaidState(),
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.statePendingPayment.isStateAfterPaidState(),
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.statePaymentFailed.isStateAfterPaidState(),
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('isStateAfterPaidState returns true for states after paid', () {
|
test('isStateAfterPaidState returns true for states after paid', () {
|
||||||
expect(ChosenPlanStateEnum.statePaid.isStateAfterPaidState(), isTrue);
|
expect(ChosenPlanStateEnum.statePaid.isStateAfterPaidState(), isTrue);
|
||||||
expect(ChosenPlanStateEnum.stateStarted.isStateAfterPaidState(), isTrue);
|
expect(ChosenPlanStateEnum.stateStarted.isStateAfterPaidState(), isTrue);
|
||||||
expect(ChosenPlanStateEnum.stateInProgress.isStateAfterPaidState(), isTrue);
|
expect(
|
||||||
expect(ChosenPlanStateEnum.stateLastDayStarted.isStateAfterPaidState(), isTrue);
|
ChosenPlanStateEnum.stateInProgress.isStateAfterPaidState(),
|
||||||
expect(ChosenPlanStateEnum.stateLastDayFinished.isStateAfterPaidState(), isTrue);
|
isTrue,
|
||||||
expect(ChosenPlanStateEnum.stateComplained.isStateAfterPaidState(), isTrue);
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateLastDayStarted.isStateAfterPaidState(),
|
||||||
|
isTrue,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateLastDayFinished.isStateAfterPaidState(),
|
||||||
|
isTrue,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateComplained.isStateAfterPaidState(),
|
||||||
|
isTrue,
|
||||||
|
);
|
||||||
expect(ChosenPlanStateEnum.stateDone.isStateAfterPaidState(), isTrue);
|
expect(ChosenPlanStateEnum.stateDone.isStateAfterPaidState(), isTrue);
|
||||||
expect(ChosenPlanStateEnum.personalDietSet.isStateAfterPaidState(), isTrue);
|
expect(
|
||||||
expect(ChosenPlanStateEnum.stateChargeWasCollected.isStateAfterPaidState(), isTrue);
|
ChosenPlanStateEnum.personalDietSet.isStateAfterPaidState(),
|
||||||
expect(ChosenPlanStateEnum.stateConfirmedByConsultant.isStateAfterPaidState(), isTrue);
|
isTrue,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateChargeWasCollected.isStateAfterPaidState(),
|
||||||
|
isTrue,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateConfirmedByConsultant.isStateAfterPaidState(),
|
||||||
|
isTrue,
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('canShowCancelAction returns true for cancellable states', () {
|
test('canShowCancelAction returns true for cancellable states', () {
|
||||||
expect(ChosenPlanStateEnum.stateInited.canShowCancelAction, isTrue);
|
expect(ChosenPlanStateEnum.stateInited.canShowCancelAction, isTrue);
|
||||||
expect(ChosenPlanStateEnum.stateInCoordination.canShowCancelAction, isTrue);
|
expect(
|
||||||
expect(ChosenPlanStateEnum.stateStartDateHasBeenSet.canShowCancelAction, isTrue);
|
ChosenPlanStateEnum.stateInCoordination.canShowCancelAction,
|
||||||
expect(ChosenPlanStateEnum.statePendingPayment.canShowCancelAction, isTrue);
|
isTrue,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateStartDateHasBeenSet.canShowCancelAction,
|
||||||
|
isTrue,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.statePendingPayment.canShowCancelAction,
|
||||||
|
isTrue,
|
||||||
|
);
|
||||||
expect(ChosenPlanStateEnum.statePaid.canShowCancelAction, isTrue);
|
expect(ChosenPlanStateEnum.statePaid.canShowCancelAction, isTrue);
|
||||||
expect(ChosenPlanStateEnum.stateStarted.canShowCancelAction, isTrue);
|
expect(ChosenPlanStateEnum.stateStarted.canShowCancelAction, isTrue);
|
||||||
expect(ChosenPlanStateEnum.stateInProgress.canShowCancelAction, isTrue);
|
expect(ChosenPlanStateEnum.stateInProgress.canShowCancelAction, isTrue);
|
||||||
@@ -73,33 +166,129 @@ void main() {
|
|||||||
|
|
||||||
test('canShowCancelAction returns false for non-cancellable states', () {
|
test('canShowCancelAction returns false for non-cancellable states', () {
|
||||||
expect(ChosenPlanStateEnum.personalDietSet.canShowCancelAction, isFalse);
|
expect(ChosenPlanStateEnum.personalDietSet.canShowCancelAction, isFalse);
|
||||||
expect(ChosenPlanStateEnum.stateLastDayStarted.canShowCancelAction, isFalse);
|
expect(
|
||||||
expect(ChosenPlanStateEnum.stateLastDayFinished.canShowCancelAction, isFalse);
|
ChosenPlanStateEnum.stateLastDayStarted.canShowCancelAction,
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateLastDayFinished.canShowCancelAction,
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
expect(ChosenPlanStateEnum.stateComplained.canShowCancelAction, isFalse);
|
expect(ChosenPlanStateEnum.stateComplained.canShowCancelAction, isFalse);
|
||||||
expect(ChosenPlanStateEnum.stateDone.canShowCancelAction, isFalse);
|
expect(ChosenPlanStateEnum.stateDone.canShowCancelAction, isFalse);
|
||||||
expect(ChosenPlanStateEnum.stateChargeWasCollected.canShowCancelAction, isFalse);
|
expect(
|
||||||
expect(ChosenPlanStateEnum.stateCanceledByTheInitiator.canShowCancelAction, isFalse);
|
ChosenPlanStateEnum.stateChargeWasCollected.canShowCancelAction,
|
||||||
expect(ChosenPlanStateEnum.statePaymentFailed.canShowCancelAction, isFalse);
|
isFalse,
|
||||||
expect(ChosenPlanStateEnum.stateConfirmedByConsultant.canShowCancelAction, isFalse);
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateCanceledByTheInitiator.canShowCancelAction,
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.statePaymentFailed.canShowCancelAction,
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateConfirmedByConsultant.canShowCancelAction,
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('isCancelAfterPaidState returns true only for post-paid cancellable states', () {
|
test(
|
||||||
expect(ChosenPlanStateEnum.statePaid.isCancelAfterPaidState, isTrue);
|
'isCancelAfterPaidState returns true only for post-paid cancellable states',
|
||||||
expect(ChosenPlanStateEnum.stateStarted.isCancelAfterPaidState, isTrue);
|
() {
|
||||||
expect(ChosenPlanStateEnum.stateInProgress.isCancelAfterPaidState, isTrue);
|
expect(ChosenPlanStateEnum.statePaid.isCancelAfterPaidState, isTrue);
|
||||||
expect(ChosenPlanStateEnum.stateInited.isCancelAfterPaidState, isFalse);
|
expect(ChosenPlanStateEnum.stateStarted.isCancelAfterPaidState, isTrue);
|
||||||
expect(ChosenPlanStateEnum.stateInCoordination.isCancelAfterPaidState, isFalse);
|
expect(
|
||||||
expect(ChosenPlanStateEnum.stateStartDateHasBeenSet.isCancelAfterPaidState, isFalse);
|
ChosenPlanStateEnum.stateInProgress.isCancelAfterPaidState,
|
||||||
expect(ChosenPlanStateEnum.statePendingPayment.isCancelAfterPaidState, isFalse);
|
isTrue,
|
||||||
expect(ChosenPlanStateEnum.statePaymentFailed.isCancelAfterPaidState, isFalse);
|
);
|
||||||
expect(ChosenPlanStateEnum.stateConfirmedByConsultant.isCancelAfterPaidState, isFalse);
|
expect(ChosenPlanStateEnum.stateInited.isCancelAfterPaidState, isFalse);
|
||||||
expect(ChosenPlanStateEnum.personalDietSet.isCancelAfterPaidState, isFalse);
|
expect(
|
||||||
expect(ChosenPlanStateEnum.stateLastDayStarted.isCancelAfterPaidState, isFalse);
|
ChosenPlanStateEnum.stateInCoordination.isCancelAfterPaidState,
|
||||||
expect(ChosenPlanStateEnum.stateLastDayFinished.isCancelAfterPaidState, isFalse);
|
isFalse,
|
||||||
expect(ChosenPlanStateEnum.stateComplained.isCancelAfterPaidState, isFalse);
|
);
|
||||||
expect(ChosenPlanStateEnum.stateDone.isCancelAfterPaidState, isFalse);
|
expect(
|
||||||
expect(ChosenPlanStateEnum.stateChargeWasCollected.isCancelAfterPaidState, isFalse);
|
ChosenPlanStateEnum.stateStartDateHasBeenSet.isCancelAfterPaidState,
|
||||||
expect(ChosenPlanStateEnum.stateCanceledByTheInitiator.isCancelAfterPaidState, isFalse);
|
isFalse,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.statePendingPayment.isCancelAfterPaidState,
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.statePaymentFailed.isCancelAfterPaidState,
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateConfirmedByConsultant.isCancelAfterPaidState,
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.personalDietSet.isCancelAfterPaidState,
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateLastDayStarted.isCancelAfterPaidState,
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateLastDayFinished.isCancelAfterPaidState,
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateComplained.isCancelAfterPaidState,
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
|
expect(ChosenPlanStateEnum.stateDone.isCancelAfterPaidState, isFalse);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateChargeWasCollected.isCancelAfterPaidState,
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum
|
||||||
|
.stateCanceledByTheInitiator
|
||||||
|
.isCancelAfterPaidState,
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'allowsVideoCall is false for finished and canceled consultations',
|
||||||
|
() {
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateCanceledByTheInitiator.allowsVideoCall,
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
|
expect(ChosenPlanStateEnum.statePaymentFailed.allowsVideoCall, isFalse);
|
||||||
|
expect(ChosenPlanStateEnum.stateDone.allowsVideoCall, isFalse);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateChargeWasCollected.allowsVideoCall,
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
test('allowsVideoCall is true while the consultation is not finished', () {
|
||||||
|
expect(ChosenPlanStateEnum.stateInited.allowsVideoCall, isTrue);
|
||||||
|
expect(ChosenPlanStateEnum.stateInCoordination.allowsVideoCall, isTrue);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateStartDateHasBeenSet.allowsVideoCall,
|
||||||
|
isTrue,
|
||||||
|
);
|
||||||
|
expect(ChosenPlanStateEnum.statePendingPayment.allowsVideoCall, isTrue);
|
||||||
|
expect(
|
||||||
|
ChosenPlanStateEnum.stateConfirmedByConsultant.allowsVideoCall,
|
||||||
|
isTrue,
|
||||||
|
);
|
||||||
|
expect(ChosenPlanStateEnum.statePaid.allowsVideoCall, isTrue);
|
||||||
|
expect(ChosenPlanStateEnum.personalDietSet.allowsVideoCall, isTrue);
|
||||||
|
expect(ChosenPlanStateEnum.stateStarted.allowsVideoCall, isTrue);
|
||||||
|
expect(ChosenPlanStateEnum.stateInProgress.allowsVideoCall, isTrue);
|
||||||
|
expect(ChosenPlanStateEnum.stateLastDayStarted.allowsVideoCall, isTrue);
|
||||||
|
expect(ChosenPlanStateEnum.stateLastDayFinished.allowsVideoCall, isTrue);
|
||||||
|
expect(ChosenPlanStateEnum.stateComplained.allowsVideoCall, isTrue);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('getActiveStates returns correct states', () {
|
test('getActiveStates returns correct states', () {
|
||||||
@@ -114,8 +303,10 @@ void main() {
|
|||||||
expect(activeStates, contains(ChosenPlanStateEnum.stateComplained));
|
expect(activeStates, contains(ChosenPlanStateEnum.stateComplained));
|
||||||
expect(activeStates, contains(ChosenPlanStateEnum.stateDone));
|
expect(activeStates, contains(ChosenPlanStateEnum.stateDone));
|
||||||
expect(activeStates, contains(ChosenPlanStateEnum.personalDietSet));
|
expect(activeStates, contains(ChosenPlanStateEnum.personalDietSet));
|
||||||
expect(activeStates, isNot(contains(ChosenPlanStateEnum.statePaymentFailed)));
|
expect(
|
||||||
|
activeStates,
|
||||||
|
isNot(contains(ChosenPlanStateEnum.statePaymentFailed)),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,114 @@
|
|||||||
|
import 'package:eatvio_app/core/locator_service.dart';
|
||||||
|
import 'package:eatvio_app/core/models/pagination_model.dart';
|
||||||
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
|
import 'package:eatvio_app/features/video_calls/recordings/models/recording_status.dart';
|
||||||
|
import 'package:eatvio_app/features/video_calls/recordings/models/video_call_recording_model.dart';
|
||||||
|
import 'package:eatvio_app/features/video_calls/recordings/presentation/cubit/video_call_recordings_cubit.dart';
|
||||||
|
import 'package:eatvio_app/features/video_calls/recordings/presentation/pages/video_call_recordings_screen.dart';
|
||||||
|
import 'package:eatvio_app/features/video_calls/recordings/repositories/video_call_recordings_repository.dart';
|
||||||
|
import 'package:eatvio_app/generated/l10n.dart';
|
||||||
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
|
import 'package:mocktail/mocktail.dart';
|
||||||
|
import 'package:network_image_mock/network_image_mock.dart';
|
||||||
|
|
||||||
|
class _MockRecordingsRepository extends Mock implements VideoCallRecordingsRepository {}
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
late _MockRecordingsRepository repository;
|
||||||
|
|
||||||
|
VideoCallRecordingsPagination page(List<VideoCallRecordingModel> data) {
|
||||||
|
return VideoCallRecordingsPagination(
|
||||||
|
data: data,
|
||||||
|
links: const Links(
|
||||||
|
first: 'https://example.com?page=1',
|
||||||
|
last: 'https://example.com?page=1',
|
||||||
|
prev: null,
|
||||||
|
next: null,
|
||||||
|
),
|
||||||
|
meta: Meta(
|
||||||
|
currentPage: 1,
|
||||||
|
from: data.isEmpty ? null : 1,
|
||||||
|
lastPage: 1,
|
||||||
|
links: const [],
|
||||||
|
perPage: 20,
|
||||||
|
to: data.isEmpty ? null : data.length,
|
||||||
|
total: data.length,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
VideoCallRecordingModel recording(int id) {
|
||||||
|
return VideoCallRecordingModel(
|
||||||
|
id: id,
|
||||||
|
status: RecordingStatus.ready,
|
||||||
|
durationSeconds: 60,
|
||||||
|
createdAt: DateTime.utc(2026, 9, 21, 10),
|
||||||
|
previewUrl: 'https://example.com/preview.jpg',
|
||||||
|
fileUrl: 'https://example.com/file.mp4',
|
||||||
|
counterpart: const VideoCallRecordingCounterpartModel(name: 'Сидни', slug: 'sydney'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
setUp(() async {
|
||||||
|
await sl.reset();
|
||||||
|
repository = _MockRecordingsRepository();
|
||||||
|
sl.registerFactory<VideoCallRecordingsCubit>(
|
||||||
|
() => VideoCallRecordingsCubit(repository: repository),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
tearDown(() async {
|
||||||
|
await sl.reset();
|
||||||
|
});
|
||||||
|
|
||||||
|
Widget wrap(Widget child) {
|
||||||
|
return MaterialApp(
|
||||||
|
theme: ThemeHelper().themeData(),
|
||||||
|
localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
|
||||||
|
supportedLocales: const [Locale('ru')],
|
||||||
|
home: child,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
testWidgets('short list can be pulled to refresh', (tester) async {
|
||||||
|
await mockNetworkImagesFor(() async {
|
||||||
|
when(() => repository.getRecordings(page: 1, period: null)).thenAnswer(
|
||||||
|
(_) async => page([recording(1)]),
|
||||||
|
);
|
||||||
|
|
||||||
|
await tester.pumpWidget(wrap(const VideoCallRecordingsScreen()));
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
final list = tester.widget<ListView>(find.byType(ListView));
|
||||||
|
expect(list.physics, isA<AlwaysScrollableScrollPhysics>());
|
||||||
|
|
||||||
|
await tester.fling(find.byType(ListView), const Offset(0, 400), 1200);
|
||||||
|
await tester.pump();
|
||||||
|
await tester.pump(const Duration(seconds: 1));
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
verify(() => repository.getRecordings(page: 1, period: null)).called(2);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('empty list can be pulled to refresh', (tester) async {
|
||||||
|
when(() => repository.getRecordings(page: 1, period: null)).thenAnswer(
|
||||||
|
(_) async => page(const []),
|
||||||
|
);
|
||||||
|
|
||||||
|
await tester.pumpWidget(wrap(const VideoCallRecordingsScreen()));
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
expect(find.text('Пока нет видеоконсультаций'), findsOneWidget);
|
||||||
|
final list = tester.widget<ListView>(find.byType(ListView));
|
||||||
|
expect(list.physics, isA<AlwaysScrollableScrollPhysics>());
|
||||||
|
|
||||||
|
await tester.fling(find.text('Пока нет видеоконсультаций'), const Offset(0, 400), 1200);
|
||||||
|
await tester.pump();
|
||||||
|
await tester.pump(const Duration(seconds: 1));
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
verify(() => repository.getRecordings(page: 1, period: null)).called(2);
|
||||||
|
});
|
||||||
|
}
|
||||||
242
tool/export_api_contract.dart
Normal file
242
tool/export_api_contract.dart
Normal file
@@ -0,0 +1,242 @@
|
|||||||
|
// FILE: tool/export_api_contract.dart
|
||||||
|
// VERSION: 1.0.0
|
||||||
|
// PURPOSE: Экспорт контракта мобильных моделей для бэкенд-репозитория (eatvio-web).
|
||||||
|
//
|
||||||
|
// Обходит lib/**/*.dart, находит @freezed фабрики (const factory XModel({...}))
|
||||||
|
// и извлекает JSON-контракт каждой модели: какие ключи обязательны (required),
|
||||||
|
// а какие допускают null/отсутствие.
|
||||||
|
//
|
||||||
|
// Источник истины — исходные декларации, НЕ сгенерированные *.g.dart:
|
||||||
|
// nullability = "?" в типе Dart; отсутствие ключа безопасно при @Default(...);
|
||||||
|
// JSON-имя = @JsonKey(name: "...") либо имя поля (дефолт json_serializable).
|
||||||
|
//
|
||||||
|
// USAGE:
|
||||||
|
// dart run tool/export_api_contract.dart # манифест в stdout
|
||||||
|
// dart run tool/export_api_contract.dart out.json # манифест в файл
|
||||||
|
//
|
||||||
|
// CI (flutter-репо): регенерить и сравнивать с закоммиченной копией;
|
||||||
|
// diff → fail с требованием обновить манифест и синхронизировать его
|
||||||
|
// в eatvio-web: tests/Fixtures/Contract/flutter_model_contract.json
|
||||||
|
|
||||||
|
import 'dart:convert';
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
void main(List<String> args) {
|
||||||
|
final root = Directory('lib');
|
||||||
|
if (!root.existsSync()) {
|
||||||
|
stderr.writeln('Run from the flutter app root (directory "lib" not found).');
|
||||||
|
exit(2);
|
||||||
|
}
|
||||||
|
|
||||||
|
final sources = <File, String>{};
|
||||||
|
final enumNames = <String>{};
|
||||||
|
|
||||||
|
final files = root.listSync(recursive: true).whereType<File>().toList();
|
||||||
|
// ДЕТЕРМИНИЗМ: сортируем по пути — порядок Directory.listSync зависит от файловой системы,
|
||||||
|
// а при коллизии имён моделей побеждает последняя обработанная. Без сортировки локально
|
||||||
|
// и на CI получаются разные манифесты (баг, из-за которого CI падал на чистом PR).
|
||||||
|
files.sort((a, b) => a.path.compareTo(b.path));
|
||||||
|
|
||||||
|
for (final file in files) {
|
||||||
|
if (!file.path.endsWith('.dart') || file.path.endsWith('.g.dart') || file.path.endsWith('.freezed.dart')) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
final source = file.readAsStringSync();
|
||||||
|
sources[file] = source;
|
||||||
|
enumNames.addAll(
|
||||||
|
RegExp(r'^\s*enum\s+(\w+)', multiLine: true)
|
||||||
|
.allMatches(source)
|
||||||
|
.map((m) => m.group(1)!),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
final contract = <String, Map<String, dynamic>>{};
|
||||||
|
// modelOrigin: имя модели -> файл, из которого она взята (для предупреждений о коллизиях).
|
||||||
|
final modelOrigin = <String, String>{};
|
||||||
|
for (final entry in sources.entries) {
|
||||||
|
final extracted = extractModels(entry.value);
|
||||||
|
for (final modelName in extracted.keys) {
|
||||||
|
if (contract.containsKey(modelName)) {
|
||||||
|
stderr.writeln(
|
||||||
|
'WARNING: model "$modelName" defined in both "${modelOrigin[modelName]}" '
|
||||||
|
'and "${entry.key.path}" — keeping the one from "${entry.key.path}" (sorted-order last wins). '
|
||||||
|
'Consider renaming the Dart classes to make the contract unambiguous.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
modelOrigin[modelName] = entry.key.path;
|
||||||
|
contract[modelName] = extracted[modelName]!;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// kinds считаются второй проходкой: нужны все имена моделей (contract.keys) и enum'ов.
|
||||||
|
final modelNames = contract.keys.toSet();
|
||||||
|
for (final entry in contract.entries) {
|
||||||
|
final types = (entry.value['types'] ?? <String, String>{}) as Map<String, String>;
|
||||||
|
entry.value['kinds'] = {
|
||||||
|
for (final e in types.entries) e.key: jsonKindFor(e.value, modelNames, enumNames),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
final sorted = <String, Map<String, dynamic>>{
|
||||||
|
for (final key in contract.keys.toList()..sort()) key: contract[key]!,
|
||||||
|
};
|
||||||
|
const encoder = JsonEncoder.withIndent(' ');
|
||||||
|
final output = encoder.convert(sorted);
|
||||||
|
|
||||||
|
if (args.isNotEmpty) {
|
||||||
|
File(args.first).writeAsStringSync('$output\n');
|
||||||
|
stdout.writeln('Contract written to ${args.first} (${sorted.length} models)');
|
||||||
|
} else {
|
||||||
|
stdout.writeln(output);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// JSON-вид значения для Dart-типа — по нему бэкенд-чекер валидирует payload:
|
||||||
|
/// number (int/double), string, boolean, list, map, model (JSON-объект),
|
||||||
|
/// enum (строка-имя или int), any (не проверяем).
|
||||||
|
String jsonKindFor(String dartType, Set<String> modelNames, Set<String> enumNames) {
|
||||||
|
final type = dartType.trim();
|
||||||
|
if (type == 'dynamic' || type == 'Object') {
|
||||||
|
return 'any';
|
||||||
|
}
|
||||||
|
if (type.startsWith('List<')) {
|
||||||
|
return 'list';
|
||||||
|
}
|
||||||
|
if (type.startsWith('Map<')) {
|
||||||
|
return 'map';
|
||||||
|
}
|
||||||
|
if (const {'int', 'double', 'num'}.contains(type)) {
|
||||||
|
return 'number';
|
||||||
|
}
|
||||||
|
if (type == 'String') {
|
||||||
|
return 'string';
|
||||||
|
}
|
||||||
|
if (type == 'bool') {
|
||||||
|
return 'boolean';
|
||||||
|
}
|
||||||
|
if (enumNames.contains(type)) {
|
||||||
|
return 'enum';
|
||||||
|
}
|
||||||
|
if (modelNames.contains(type)) {
|
||||||
|
return 'model';
|
||||||
|
}
|
||||||
|
return 'unknown';
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Извлекает все @freezed-модели из исходника.
|
||||||
|
/// Возвращает {ModelName: {required: [...], optional: [...]}}.
|
||||||
|
Map<String, Map<String, dynamic>> extractModels(String source) {
|
||||||
|
final result = <String, Map<String, dynamic>>{};
|
||||||
|
|
||||||
|
// Блоки "const factory ModelName({ ... }) = _ModelName[...];" (одно- и многострочные).
|
||||||
|
final factoryRe = RegExp(r'const\s+factory\s+(\w+)\(\s*\{(.*?)\}\s*\)\s*=', dotAll: true);
|
||||||
|
for (final match in factoryRe.allMatches(source)) {
|
||||||
|
final modelName = match.group(1)!;
|
||||||
|
final body = match.group(2)!;
|
||||||
|
|
||||||
|
final required = <String>[];
|
||||||
|
final optional = <String>[];
|
||||||
|
final types = <String, String>{};
|
||||||
|
|
||||||
|
for (final rawLine in _splitTopLevel(body)) {
|
||||||
|
final line = rawLine.trim();
|
||||||
|
if (line.isEmpty || line.startsWith('//')) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
final field = _parseField(line);
|
||||||
|
if (field == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
(field.required ? required : optional).add(field.jsonName);
|
||||||
|
types[field.jsonName] = field.dartType;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (required.isNotEmpty || optional.isNotEmpty) {
|
||||||
|
result[modelName] = {
|
||||||
|
'required': required,
|
||||||
|
'optional': optional,
|
||||||
|
'types': types,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Разбивает тело фабрики по запятым верхнего уровня,
|
||||||
|
/// не разрывая дженерики (`List<int, String>`) и вложенные скобки.
|
||||||
|
List<String> _splitTopLevel(String body) {
|
||||||
|
final parts = <String>[];
|
||||||
|
final current = StringBuffer();
|
||||||
|
var angleDepth = 0;
|
||||||
|
var parenDepth = 0;
|
||||||
|
var braceDepth = 0;
|
||||||
|
|
||||||
|
for (final char in body.runes) {
|
||||||
|
final ch = String.fromCharCode(char);
|
||||||
|
if (ch == '<') {
|
||||||
|
angleDepth++;
|
||||||
|
} else if (ch == '>') {
|
||||||
|
angleDepth = (angleDepth - 1).clamp(0, 1 << 30);
|
||||||
|
} else if (ch == '(') {
|
||||||
|
parenDepth++;
|
||||||
|
} else if (ch == ')') {
|
||||||
|
parenDepth = (parenDepth - 1).clamp(0, 1 << 30);
|
||||||
|
} else if (ch == '{') {
|
||||||
|
braceDepth++;
|
||||||
|
} else if (ch == '}') {
|
||||||
|
braceDepth = (braceDepth - 1).clamp(0, 1 << 30);
|
||||||
|
} else if (ch == ',' && angleDepth == 0 && parenDepth == 0 && braceDepth == 0) {
|
||||||
|
parts.add(current.toString());
|
||||||
|
current.clear();
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
current.write(ch);
|
||||||
|
}
|
||||||
|
parts.add(current.toString());
|
||||||
|
|
||||||
|
return parts;
|
||||||
|
}
|
||||||
|
|
||||||
|
class _Field {
|
||||||
|
_Field(this.jsonName, this.required, this.dartType);
|
||||||
|
|
||||||
|
final String jsonName;
|
||||||
|
final bool required;
|
||||||
|
final String dartType;
|
||||||
|
}
|
||||||
|
|
||||||
|
_Field? _parseField(String line) {
|
||||||
|
// Убираем комментарии в конце строки.
|
||||||
|
final code = line.split('//').first.trim();
|
||||||
|
if (code.isEmpty) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// JSON-имя: @JsonKey(name: "type_no") или имя поля (одинарные и двойные кавычки).
|
||||||
|
final jsonKeyMatch =
|
||||||
|
RegExp(r'''@JsonKey\([^)]*?\bname:\s*["']([^"']+)["']''').firstMatch(code);
|
||||||
|
// Убираем аннотации, оставляем "модификаторы тип поле".
|
||||||
|
final declaration = code.replaceAll(RegExp(r'@\w+\([^)]*\)'), '').trim();
|
||||||
|
|
||||||
|
final fieldMatch = RegExp(r'^(?:(?:required|final|const)\s+)*([\w<>?,\s]+?)\s+(\w+)$').firstMatch(declaration);
|
||||||
|
if (fieldMatch == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
final type = fieldMatch.group(1)!.trim();
|
||||||
|
final dartName = fieldMatch.group(2)!;
|
||||||
|
|
||||||
|
// Метаданные исходной строки.
|
||||||
|
final hasDefault = RegExp(r'@Default\(').hasMatch(line);
|
||||||
|
final isNullable = type.endsWith('?') || type == 'dynamic';
|
||||||
|
|
||||||
|
return _Field(
|
||||||
|
jsonKeyMatch?.group(1) ?? dartName,
|
||||||
|
!isNullable && !hasDefault,
|
||||||
|
type.endsWith('?') ? type.substring(0, type.length - 1) : type,
|
||||||
|
);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user