mirror of
https://github.com/StefBuwalda/cal_counter.git
synced 2025-10-29 19:00:00 +00:00
Stef
e00bfee948
Standardized field names for nutritional values in FoodItem model and throughout the codebase, changing 'fats_100g' to 'fat_100', 'saturated_fats_100g' to 'saturated_fat_100', and similar updates for other fields. Updated all references in models, templates, routes, and seed data to match the new naming convention for improved clarity and consistency.
101 lines
3.3 KiB
Python
101 lines
3.3 KiB
Python
from flask_login import UserMixin # type: ignore
|
|
from werkzeug.security import generate_password_hash, check_password_hash
|
|
from application import db
|
|
from typing import Optional
|
|
from forms import FoodItemForm
|
|
|
|
|
|
class User(UserMixin, db.Model):
|
|
__tablename__ = "user"
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
username = db.Column(db.String(150), unique=True, nullable=False)
|
|
password = db.Column(db.String, nullable=False)
|
|
is_admin = db.Column(db.Boolean, nullable=False, default=False)
|
|
|
|
food_items = db.relationship("FoodItem", lazy="dynamic")
|
|
|
|
def __init__(
|
|
self, username: str, password: str, is_admin: bool = False
|
|
) -> None:
|
|
super().__init__()
|
|
self.username = username
|
|
self.password = generate_password_hash(password=password)
|
|
self.is_admin = is_admin
|
|
|
|
def check_password(self, password: str) -> bool:
|
|
return check_password_hash(pwhash=self.password, password=password)
|
|
|
|
def change_password(self, password: str) -> None:
|
|
self.password = generate_password_hash(password=password)
|
|
|
|
|
|
class Unit(db.Model):
|
|
__tablename__ = "unit"
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
symbol = db.Column(db.String(10), unique=True, nullable=False)
|
|
name = db.Column(db.String(50), unique=True, nullable=False)
|
|
|
|
|
|
class FoodItem(db.Model):
|
|
__tablename__ = "food_item"
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
barcode = db.Column(db.Integer, nullable=False)
|
|
owner_id = db.Column(db.Integer, db.ForeignKey("user.id"), nullable=False)
|
|
name = db.Column(db.String(150), nullable=False)
|
|
|
|
energy_100 = db.Column(db.Integer, nullable=False)
|
|
protein_100 = db.Column(db.Float, nullable=False)
|
|
carbs_100 = db.Column(db.Float, nullable=False)
|
|
sugar_100 = db.Column(db.Float)
|
|
fat_100 = db.Column(db.Float, nullable=False)
|
|
saturated_fat_100 = db.Column(db.Float)
|
|
|
|
__table_args__ = (
|
|
db.UniqueConstraint("barcode", "owner_id", name="barcode_owner_key"),
|
|
)
|
|
|
|
def __init__(
|
|
self,
|
|
name: str,
|
|
owner_id: int,
|
|
energy: int,
|
|
protein: float,
|
|
carbs: float,
|
|
fat: float,
|
|
barcode: int,
|
|
sugar: Optional[float] = None,
|
|
saturated_fat: Optional[float] = None,
|
|
):
|
|
self.name = name
|
|
self.owner_id = owner_id
|
|
self.energy_100 = energy
|
|
self.protein_100 = protein
|
|
self.carbs_100 = carbs
|
|
self.sugar_100 = sugar
|
|
self.fat_100 = fat
|
|
self.saturated_fat_100 = saturated_fat
|
|
self.barcode = barcode
|
|
|
|
def updateFromForm(self, form: FoodItemForm):
|
|
self.name = form.name.data
|
|
self.energy_100 = form.energy.data
|
|
self.protein_100 = form.protein.data
|
|
self.carbs_100 = form.carbs.data
|
|
self.sugar_100 = form.sugar.data
|
|
self.fat_100 = form.fat.data
|
|
self.saturated_fat_100 = form.saturated_fat.data
|
|
|
|
def to_dict(self):
|
|
return {
|
|
"id": self.id,
|
|
"barcode": self.barcode,
|
|
"name": self.name,
|
|
"owner_id": self.owner_id,
|
|
"energy_100": self.energy_100,
|
|
"protein_100": self.protein_100,
|
|
"carbs_100": self.carbs_100,
|
|
"sugar_100": self.sugar_100,
|
|
"fat_100": self.fat_100,
|
|
"saturated_fat_100": self.saturated_fat_100,
|
|
}
|