Skip to content

Consolidate duplicate Pet models — remove care/data/models/pet.dart#2

Draft
syed-reza98 wants to merge 5 commits into
mainfrom
claude/epic-williamson-9b09cc
Draft

Consolidate duplicate Pet models — remove care/data/models/pet.dart#2
syed-reza98 wants to merge 5 commits into
mainfrom
claude/epic-williamson-9b09cc

Conversation

@syed-reza98
Copy link
Copy Markdown
Member

Summary

  • The care/data/models/pet.dart Freezed model was completely unreferenced — no file outside its own generated files imported it. Deleted it along with its pet.freezed.dart and pet.g.dart artifacts.
  • Migrated the unique additions from the care model into the pet_profile Pet model (the single source of truth): dateOfBirth, activityLevel, ActivityLevel enum, and the computed ageInYears / ageLabel / _monthsSinceBirth getters.
  • Removed the Freezed dependency from the care pet model entirely — the pet_profile Pet model remains a plain Dart class with manual copyWith / fromJson / toJson.

What changed

File Change
lib/features/pet_profile/data/models/pet.dart Added dateOfBirth, activityLevel, ActivityLevel enum, age computed getters
lib/features/care/data/models/pet.dart Deleted
lib/features/care/data/models/pet.freezed.dart Deleted
lib/features/care/data/models/pet.g.dart Deleted

Test plan

  • flutter analyzeNo issues found
  • Smoke-test care screen and pet profile screens on device/emulator to confirm no runtime regressions

Remove the orphaned care/data/models/pet.dart (Freezed) and its generated
files — no file in the project imported them. Migrate their unique fields
(dateOfBirth, activityLevel, ageInYears/ageLabel getters, ActivityLevel
enum) into the plain-Dart pet_profile Pet model so the capability is
preserved. flutter analyze reports 0 issues.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@rezwana-karim rezwana-karim self-assigned this May 14, 2026
@rezwana-karim
Copy link
Copy Markdown
Collaborator

@claude[agent] resolve the merge conflicts in this pull request

@rezwana-karim
Copy link
Copy Markdown
Collaborator

@claude resolve the merge conflicts in this pull request

@syed-reza98
Copy link
Copy Markdown
Member Author

Resolved: merged origin/main into this branch, reconciling the weightKg: double? field added on main with the typed ActivityLevel enum introduced here — both are now present in the single pet_profile Pet model. flutter analyze reports no issues.

syed-reza98 and others added 3 commits May 16, 2026 00:39
…e Pet.

Co-authored-by: Cursor <cursoragent@cursor.com>
Refresh continual-learning hook state and update AGENTS.md. The .cursor/hooks/state/continual-learning-index.json was replaced with an updated transcript index containing new agent-transcript entries. .cursor/hooks/state/continual-learning.json updates lastRunAtMs, lastTranscriptMtimeMs, lastProcessedGenerationId and resets turnsSinceLastRun to 1 to reflect recently processed transcripts. AGENTS.md: add note about Shell Pets routing (PetProfileScreen mounted at /home and per-pet social profiles at /social/profile/:petId; AppHeader and pet switcher shortcuts use /home).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants