feat: Eigene und zentrale Lebensmittel bearbeiten, mit Sichtbarkeit im Mapping
Nutzer können persönliche Foods anlegen und ändern; der Admin legt zentrale Einträge für alle an. Suche und Namens-Mapping berücksichtigen persönlich, zentral und BLS. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
d35087ad84
commit
8b1e1da5d8
30 files changed
+1195
-120
No files matched your search
@@ -1,5 +1,6 @@
|
||||
from data_layer.food_attributes import (
|
||||
create_extension_attribute,
|
||||
editor_payload_for_food,
|
||||
macros_and_attributes_to_values,
|
||||
normalize_attr_key,
|
||||
normalize_attr_unit,
|
||||
@@ -45,3 +46,41 @@ def test_norsan_label_epa_converts():
|
||||
assert abs(vals["FAT"] - 100) < 0.01
|
||||
assert abs(vals["EPA"] - 13.75) < 0.01
|
||||
assert abs(vals["ENERCC"] - 900) < 0.01
|
||||
|
||||
|
||||
def test_edit_payload_does_not_rescale_at_100g():
|
||||
vals = macros_and_attributes_to_values(
|
||||
{"kcal": 900, "protein_g": 0, "fat_g": 100, "carbs_g": 0},
|
||||
{"EPA": 13.75},
|
||||
serving_g=100,
|
||||
)
|
||||
assert vals["FAT"] == 100
|
||||
assert vals["EPA"] == 13.75
|
||||
assert vals["ENERCC"] == 900
|
||||
|
||||
|
||||
def test_editor_payload_splits_macros_and_extras():
|
||||
class _Cur:
|
||||
def execute(self, sql, params=None):
|
||||
pass
|
||||
|
||||
def fetchall(self):
|
||||
return [
|
||||
{"attr_key": "ENERCC", "name_de": "Energie", "name_en": None, "unit": "kcal", "category": "energy", "origin": "bls", "value_num": 900},
|
||||
{"attr_key": "FAT", "name_de": "Fett", "name_en": None, "unit": "g", "category": "macro", "origin": "bls", "value_num": 100},
|
||||
{"attr_key": "PROT625", "name_de": "Protein", "name_en": None, "unit": "g", "category": "macro", "origin": "bls", "value_num": 0},
|
||||
{"attr_key": "CHO", "name_de": "KH", "name_en": None, "unit": "g", "category": "macro", "origin": "bls", "value_num": 0},
|
||||
{"attr_key": "EPA", "name_de": "EPA", "name_en": None, "unit": "g", "category": "extension", "origin": "extension", "value_num": 13.75},
|
||||
]
|
||||
|
||||
payload = editor_payload_for_food(
|
||||
_Cur(),
|
||||
{"id": "abc", "name_de": "Omega-3", "name_en": None, "catalog_kind": "manual_user"},
|
||||
editable=True,
|
||||
)
|
||||
assert payload["editable"] is True
|
||||
assert payload["serving_g"] == 100
|
||||
assert payload["macros_per_100g"]["kcal"] == 900
|
||||
assert payload["macros_per_100g"]["fat_g"] == 100
|
||||
assert payload["attributes"][0]["attr"]["attr_key"] == "EPA"
|
||||
assert payload["attributes"][0]["value"] == 13.75
|
||||
@@ -105,3 +105,11 @@ def test_joghurt_10_ranks_above_35():
|
||||
packed = suggest_for_name(index, query, limit=3)
|
||||
assert packed["suggestions"][0]["name_de"] == full["name_de"], query
|
||||
assert packed["suggestions"][0]["score"] > score_name_match(query, light["name_de"])
|
||||
|
||||
|
||||
def test_personal_food_ranks_above_bls_on_tie():
|
||||
bls = {"id": "bls", "name_de": "Omega-3 Öl", "name_en": "", "bls_code": "X", "catalog_kind": "official_bls"}
|
||||
mine = {"id": "me", "name_de": "Omega-3 Öl", "name_en": "", "bls_code": None, "catalog_kind": "manual_user", "owner_profile_id": "u1"}
|
||||
packed = suggest_for_name(_index(bls, mine), "Omega-3 Öl", limit=2)
|
||||
assert packed["suggestions"][0]["id"] == "me"
|
||||
assert packed["suggestions"][0]["visibility"] == "personal"
|
||||
@@ -0,0 +1,90 @@
|
||||
from data_layer.food_visibility import (
|
||||
attach_visibility,
|
||||
is_global_mapping_target,
|
||||
is_visible_to,
|
||||
require_mapping_target,
|
||||
visibility_of,
|
||||
visibility_rank,
|
||||
)
|
||||
|
||||
|
||||
def test_visibility_scopes():
|
||||
assert visibility_of({"catalog_kind": "official_bls"}) == "bls"
|
||||
assert visibility_of({"catalog_kind": "manual_admin", "owner_profile_id": None}) == "global"
|
||||
assert visibility_of({"catalog_kind": "manual_user", "owner_profile_id": "u1"}) == "personal"
|
||||
assert visibility_rank({"catalog_kind": "manual_user"}) < visibility_rank({"catalog_kind": "manual_admin"})
|
||||
assert visibility_rank({"catalog_kind": "manual_admin"}) < visibility_rank({"catalog_kind": "official_bls"})
|
||||
|
||||
|
||||
def test_personal_food_not_visible_to_others():
|
||||
food = {"catalog_kind": "manual_user", "owner_profile_id": "alice", "is_active": True}
|
||||
assert is_visible_to(food, "alice") is True
|
||||
assert is_visible_to(food, "bob") is False
|
||||
assert is_global_mapping_target(food) is False
|
||||
|
||||
|
||||
def test_admin_and_bls_visible_to_everyone():
|
||||
admin = {"catalog_kind": "manual_admin", "owner_profile_id": None, "is_active": True}
|
||||
bls = {"catalog_kind": "official_bls", "owner_profile_id": None, "is_active": True}
|
||||
assert is_visible_to(admin, "bob") is True
|
||||
assert is_visible_to(bls, None) is True
|
||||
assert is_global_mapping_target(admin) is True
|
||||
assert is_global_mapping_target(bls) is True
|
||||
|
||||
|
||||
def test_attach_visibility():
|
||||
row = attach_visibility({"catalog_kind": "manual_admin"})
|
||||
assert row["visibility"] == "global"
|
||||
|
||||
|
||||
def test_require_global_mapping_rejects_personal():
|
||||
class _Cur:
|
||||
def execute(self, sql, params=None):
|
||||
self._row = {
|
||||
"id": params[0],
|
||||
"name_de": "Öl",
|
||||
"catalog_kind": "manual_user",
|
||||
"owner_profile_id": "alice",
|
||||
"is_active": True,
|
||||
"bls_code": None,
|
||||
}
|
||||
|
||||
def fetchone(self):
|
||||
return self._row
|
||||
|
||||
try:
|
||||
require_mapping_target(_Cur(), "fid", None)
|
||||
assert False, "expected PermissionError"
|
||||
except PermissionError:
|
||||
pass
|
||||
|
||||
|
||||
def test_require_user_mapping_allows_own_and_global():
|
||||
class _Cur:
|
||||
def __init__(self, food):
|
||||
self.food = food
|
||||
|
||||
def execute(self, sql, params=None):
|
||||
pass
|
||||
|
||||
def fetchone(self):
|
||||
return self.food
|
||||
|
||||
own = require_mapping_target(
|
||||
_Cur({
|
||||
"id": "1", "name_de": "X", "catalog_kind": "manual_user",
|
||||
"owner_profile_id": "alice", "is_active": True, "bls_code": None,
|
||||
}),
|
||||
"1",
|
||||
"alice",
|
||||
)
|
||||
assert own["catalog_kind"] == "manual_user"
|
||||
shared = require_mapping_target(
|
||||
_Cur({
|
||||
"id": "2", "name_de": "Y", "catalog_kind": "manual_admin",
|
||||
"owner_profile_id": None, "is_active": True, "bls_code": None,
|
||||
}),
|
||||
"2",
|
||||
"alice",
|
||||
)
|
||||
assert shared["catalog_kind"] == "manual_admin"
|
||||
Reference in new issue
Block a user