Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add Households to Mealie #3970

Merged
Merged
Changes from 1 commit
Commits
Show all changes
198 commits
Select commit Hold shift + click to select a range
65d624c
start household def and move everything around
michael-genson Jul 11, 2024
a343355
add db model defs
michael-genson Jul 11, 2024
4551a03
added preferences
michael-genson Jul 11, 2024
900360d
fix migrations
michael-genson Jul 11, 2024
31b75f6
move schema
michael-genson Jul 11, 2024
7aeb732
typo
michael-genson Jul 11, 2024
382baa3
fix inits
michael-genson Jul 11, 2024
54dcd27
fix import
michael-genson Jul 11, 2024
79f5136
replace pydantic-to-typescript with fork
michael-genson Jul 11, 2024
ebe6900
generate types
michael-genson Jul 11, 2024
4d5a20c
require setting group/household/user id during repo instantiation
michael-genson Jul 11, 2024
65a919f
do household filter
michael-genson Jul 11, 2024
407e7c0
added missing model defs
michael-genson Jul 11, 2024
83ad294
updated schema to include household fields
michael-genson Jul 11, 2024
9e27fd7
added migration
michael-genson Jul 12, 2024
dc12304
auto-inject group/household id from user
michael-genson Jul 12, 2024
0e50924
fix missing hybrid prop
michael-genson Jul 12, 2024
6abb2a9
fix instances of get_repositories
michael-genson Jul 12, 2024
40a1ec1
add household to init users
michael-genson Jul 12, 2024
6c5affc
add public household route
michael-genson Jul 13, 2024
fb1461e
simplified logic
michael-genson Jul 19, 2024
66e5f91
remove redundant/confusing by_group calls
michael-genson Jul 19, 2024
ee16c7b
modify group/household reqs
michael-genson Jul 19, 2024
452b28c
adjust db saves to include household id
michael-genson Jul 20, 2024
fcdb855
use household_id in recipe service
michael-genson Jul 20, 2024
7a95881
remove deprecated analytics routes
michael-genson Jul 21, 2024
ea64368
added household statistics
michael-genson Jul 21, 2024
4798136
removed group/household filter from admin routes
michael-genson Jul 21, 2024
0556658
moved shopping list services to household services
michael-genson Jul 21, 2024
fd339cf
added admin household routes
michael-genson Jul 21, 2024
67f88c1
added household to user init
michael-genson Jul 21, 2024
0e5600b
fix missing household exclusion
michael-genson Jul 21, 2024
5afea1d
removed faulty group_id attr
michael-genson Jul 21, 2024
89ee1aa
create household self service and migrated some group services
michael-genson Jul 21, 2024
fd6f7b9
fixed missing household_id in factory
michael-genson Jul 21, 2024
a31133f
fixed group storage calc
michael-genson Jul 21, 2024
5fba1d9
add household to event workflows
michael-genson Jul 22, 2024
6ba6629
force kwargs in repo instatiation and remove by_xxx methods
michael-genson Jul 22, 2024
6318754
copy deprecated group prefs into household prefs during migration
michael-genson Jul 22, 2024
5caaa0c
add missing timestamps to migration
michael-genson Jul 22, 2024
0684f7e
replace update_at/updateAt with aliased updated_at/updatedAt
michael-genson Jul 22, 2024
ffe46e0
add household to init db
michael-genson Jul 22, 2024
ec55272
add household to registration
michael-genson Jul 22, 2024
edf3e9a
add households to invite workflow
michael-genson Jul 23, 2024
d962e5e
Merge branch 'mealie-next' into feat/households
michael-genson Jul 23, 2024
097a558
moved routes from /groups -> /households
michael-genson Jul 23, 2024
e7313b5
dev:generate
michael-genson Jul 23, 2024
885618b
fix imports
michael-genson Jul 23, 2024
3aa7c2a
update codegen to stop murdering __init__ files
michael-genson Jul 23, 2024
19e43d7
fixed a ton of tests
michael-genson Jul 23, 2024
b38bd2e
fixed ...this?
michael-genson Jul 23, 2024
5353a74
fixed session scope and attr typo
michael-genson Jul 23, 2024
df72ca0
more fixture fixes
michael-genson Jul 24, 2024
605e01b
fix migration types
michael-genson Jul 24, 2024
deb5b78
added missing mapped models
michael-genson Jul 24, 2024
0f1373f
test fixes
michael-genson Jul 24, 2024
05304ae
test fixes
michael-genson Jul 24, 2024
2956e7f
test fixes
michael-genson Jul 24, 2024
39dbccc
allow optional group_id during household creation
michael-genson Jul 24, 2024
e339f31
test fixes
michael-genson Jul 24, 2024
80002fe
added missing proxies
michael-genson Jul 24, 2024
f206ebb
removed irrelevant user test and fixed existing user test
michael-genson Jul 24, 2024
a508559
removed bad prop
michael-genson Jul 24, 2024
d99d3c9
test fixes
michael-genson Jul 24, 2024
75b0d68
test fixes
michael-genson Jul 24, 2024
5e7aed2
added missing alias
michael-genson Jul 24, 2024
b16b4a9
added missing proxies
michael-genson Jul 24, 2024
c32b131
fix missing pytest routes
michael-genson Jul 24, 2024
6b4df1a
regen code
michael-genson Jul 24, 2024
4c082db
test fixes
michael-genson Jul 24, 2024
1291ab5
fixed wrong repo pk
michael-genson Jul 24, 2024
4e69ea4
changed public routes to include household
michael-genson Jul 24, 2024
ebff4c6
test fixes
michael-genson Jul 24, 2024
495e8d4
fixed pagination route generation
michael-genson Jul 24, 2024
370ef03
re-parametrized tests to use households
michael-genson Jul 24, 2024
29bb0c5
fixed deprecation warning
michael-genson Jul 24, 2024
c82137c
fixed missing household_id in cast
michael-genson Jul 24, 2024
3daddce
fix labels service to get all shopping lists
michael-genson Jul 24, 2024
04a6116
fix fault constructor param
michael-genson Jul 24, 2024
da92fff
test fixes
michael-genson Jul 24, 2024
7b77845
added proxies
michael-genson Jul 25, 2024
bc7acaa
test fixes
michael-genson Jul 25, 2024
3f0b29f
test fixes
michael-genson Jul 25, 2024
998ef6d
forbid managing users in other households
michael-genson Jul 25, 2024
03adac3
migrated group perms tests to household perms
michael-genson Jul 25, 2024
047a599
moved group tests to household tests
michael-genson Jul 25, 2024
77a47a0
split preferences tests into group/household
michael-genson Jul 25, 2024
6acde32
fixed update household admin
michael-genson Jul 25, 2024
725f629
added household admin tests
michael-genson Jul 25, 2024
52b32e5
added cross-household labels test
michael-genson Jul 25, 2024
2577175
added tests for new repo factory behavior
michael-genson Jul 25, 2024
01c5cc2
removed unused routes
michael-genson Jul 25, 2024
31446f9
hid development-only routes
michael-genson Jul 25, 2024
2bfea6e
fixed leaky test
michael-genson Jul 25, 2024
3e9e99b
improved recipe service checks
michael-genson Jul 25, 2024
7462e43
codegen and schema fix
michael-genson Jul 25, 2024
7b3197d
moved household pages to /household
michael-genson Jul 26, 2024
b613f9a
made cookbook slugs unique across group
michael-genson Jul 26, 2024
c2ad2f9
moved household components
michael-genson Jul 26, 2024
a20ab2d
fixed type import paths
michael-genson Jul 26, 2024
fe1e097
added back group members API with user summary
michael-genson Jul 26, 2024
7f520fb
added households api defs and fixed old group refs
michael-genson Jul 26, 2024
37fbd6a
removed public household dependency from explore routes
michael-genson Jul 27, 2024
ba864d7
updated/added explore tests
michael-genson Jul 27, 2024
cb91958
remove deprecated getGroupUsers
michael-genson Jul 27, 2024
84a58f2
show household statistics on user page
michael-genson Jul 27, 2024
a365ec6
fix broken recipe link
michael-genson Jul 27, 2024
0294412
Merge branch 'mealie-next' into feat/households
michael-genson Jul 28, 2024
915bb22
added auto-redirects for new paths
michael-genson Jul 28, 2024
e308bd8
fix bad household queries
michael-genson Jul 28, 2024
ff3ed4e
fixed sqlalchemy warnings
michael-genson Jul 28, 2024
f0450bb
added group members tests
michael-genson Jul 28, 2024
03b912a
disable changing a user's group
michael-genson Jul 28, 2024
52539bd
fixed missing household filter on user APIs
michael-genson Jul 28, 2024
b8c97e9
lint
michael-genson Jul 28, 2024
e3e837a
convert recipe, shopping list, and mealplan household to proxy
michael-genson Jul 29, 2024
137d81e
removed unused mealplan models
michael-genson Jul 29, 2024
f8143d6
fixed models to respect proxies
michael-genson Jul 29, 2024
fb7c459
updated tests
michael-genson Jul 29, 2024
0f99486
dev:generate
michael-genson Jul 29, 2024
8453af3
add joinedloads to load proxied household ids
michael-genson Jul 29, 2024
943049d
removed some unused methods
michael-genson Jul 29, 2024
bf43830
unused import
michael-genson Jul 29, 2024
a1c92a3
added missing filters
michael-genson Jul 29, 2024
c4145e6
fixed bad fixture creation
michael-genson Jul 29, 2024
ec26516
added repo filter with proxy tests
michael-genson Jul 29, 2024
8b1d8f0
add proxy test for changing user/proxied household
michael-genson Jul 29, 2024
dd050c6
added tests
michael-genson Jul 29, 2024
3165964
add frontend fetchHouseholds method
michael-genson Jul 29, 2024
c6161ea
added household composable
michael-genson Jul 29, 2024
da1a535
added households to user management pages
michael-genson Jul 29, 2024
145a96a
refactored households to have webhook/user data
michael-genson Jul 29, 2024
9c47b55
fixed frontend schemas
michael-genson Jul 29, 2024
5d8ca6e
removed webhooks from group management
michael-genson Jul 29, 2024
149ea59
added joinedload for tokens
michael-genson Jul 30, 2024
1b729a7
fix some colors
michael-genson Jul 30, 2024
6666d3a
added group name to householdout
michael-genson Jul 30, 2024
7606111
added admin household management pages
michael-genson Jul 30, 2024
7623b59
created household preferences and migrated group prefs over
michael-genson Jul 30, 2024
986d1d1
added household to general about
michael-genson Jul 30, 2024
385bad4
added household count to group management
michael-genson Jul 30, 2024
1e0cff8
create household with group service
michael-genson Jul 30, 2024
8c1be1d
fix color
michael-genson Jul 30, 2024
4355a79
reorganize user profile page and update household strings
michael-genson Jul 30, 2024
3226c17
added test
michael-genson Jul 30, 2024
77f20e9
Merge remote-tracking branch 'upstream/mealie-next' into feat/households
michael-genson Jul 30, 2024
86f36fb
fix first day of week refs
michael-genson Jul 30, 2024
f1d9ffa
fix prefs in setup
michael-genson Jul 30, 2024
ca28f46
fix registration to work with auto-create default household
michael-genson Jul 30, 2024
f37b61a
fix fastapi router order
michael-genson Jul 30, 2024
8366d9b
fix group/household filters
michael-genson Jul 30, 2024
0189d50
fix string order-by bug
michael-genson Jul 30, 2024
889257d
change group/household sort
michael-genson Jul 30, 2024
e680608
fix prefs link
michael-genson Jul 30, 2024
5d6e74a
fix explore routes
michael-genson Jul 30, 2024
3aa015a
fix query filter builder with proxies
michael-genson Jul 30, 2024
427fd77
fix public cookbooks not filtering recipes by household_id
michael-genson Jul 30, 2024
2e33b93
simplify session access
michael-genson Jul 30, 2024
e1080c9
added test for recipe filter
michael-genson Jul 30, 2024
1e560a3
default new household prefs to match group prefs
michael-genson Jul 30, 2024
de85623
add household name to new cookbooks
michael-genson Jul 31, 2024
5c5827d
make events fire based on source record rather than actor
michael-genson Jul 31, 2024
2313c48
Merge remote-tracking branch 'upstream/mealie-next' into feat/households
michael-genson Jul 31, 2024
71fd807
regen lockfile
michael-genson Jul 31, 2024
6fcc2b4
dev:generate
michael-genson Jul 31, 2024
1181206
docs:gen
michael-genson Jul 31, 2024
1f7b48e
lint
michael-genson Jul 31, 2024
788e44c
ts fixes
michael-genson Jul 31, 2024
2533d25
updateAt -> updatedAt
michael-genson Jul 31, 2024
8784383
lint
michael-genson Jul 31, 2024
f8c7d13
lint
michael-genson Jul 31, 2024
eda2341
added missing group and household ids
michael-genson Jul 31, 2024
35ffcdf
simplified admin deletion tests
michael-genson Jul 31, 2024
beabb9d
some pytest fixes
michael-genson Jul 31, 2024
9960322
fix household update
michael-genson Jul 31, 2024
da04760
fix bad test types
michael-genson Jul 31, 2024
c4450ea
fix types
michael-genson Aug 1, 2024
7dcbfc8
fix this stupid test
michael-genson Aug 1, 2024
61b126d
fixed sqlalchemy warnings
michael-genson Aug 1, 2024
0f54627
more test fixes
michael-genson Aug 1, 2024
290a1d7
fix publisher in auto-delete shopping list items
michael-genson Aug 1, 2024
b630c5d
fixed test
michael-genson Aug 1, 2024
1def23d
fix test types
michael-genson Aug 1, 2024
73b14cb
fix household ref
michael-genson Aug 1, 2024
b141c4b
fix user fixture scope
michael-genson Aug 1, 2024
d153a0d
remove warning
michael-genson Aug 1, 2024
8ceaf84
make test session local to module
michael-genson Aug 1, 2024
5b99ec6
fix leaky transaction error
michael-genson Aug 1, 2024
390c8bb
Merge branch 'mealie-next' into feat/households
michael-genson Aug 12, 2024
f26edbb
Merge branch 'mealie-next' into feat/households
michael-genson Aug 12, 2024
a1ed6cc
add group and household ids to timeline event schema and add missing …
michael-genson Aug 12, 2024
2c68db7
filter out timeline events for recipes we can't fetch
michael-genson Aug 12, 2024
2fdfb67
Merge remote-tracking branch 'upstream/mealie-next' into feat/households
michael-genson Aug 20, 2024
166a3a7
Merge remote-tracking branch 'upstream/mealie-next' into feat/households
michael-genson Aug 21, 2024
2fbcd56
fix bad groupSlug ref
michael-genson Aug 21, 2024
61454ba
fixed wrong text in snackbar
michael-genson Aug 22, 2024
b7b22f9
added missing ref update
michael-genson Aug 22, 2024
75911d5
Merge remote-tracking branch 'upstream/mealie-next' into feat/households
michael-genson Aug 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
removed group/household filter from admin routes
michael-genson committed Jul 21, 2024
commit 47981369e61c8c9d72ed6d369a5493cb0d39046e
7 changes: 7 additions & 0 deletions mealie/routes/_base/base_controllers.py
Original file line number Diff line number Diff line change
@@ -147,6 +147,13 @@ class BaseAdminController(BaseUserController):

user: PrivateUser = Depends(get_admin_user)

@property
def repos(self):
if not self._repos:
# Admins have access to all groups and households, so we don't want to filter by group_id or household_id
self._repos = AllRepositories(self.session, None, None)
return self._repos


class BaseCrudController(BaseUserController):
"""