gcivil-nyu-org / INET-Wednesday-Spring2024-Team-1 / 339

Committed 30 Apr 2024 07:30PM UTC coverage: 83.513% (-1.1%) from 84.66%

Build # 339

Build Type

Pull #124

travis-pro

Committed by

web-flow

Commit Message

Merge d99bbf5d7 into a17d1ef69

Pull Request Pull Request #124: intake calories

Run Details

31 of 44 new or added lines in 6 files covered. (70.45%)

466 of 558 relevant lines covered (83.51%)

0.84 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

91.43

/users/models.py

from django.db import models

# Create your models here.


class CustomUser(models.Model):
    username = models.CharField(max_length=150)
    email = models.EmailField(max_length=150, primary_key=True)
    preferences = models.BooleanField(default=False)
    last_login = models.DateTimeField(null=True)


class Cuisine(models.Model):
    name = models.CharField(max_length=50)

    def __str__(self):
        return self.name


class Allergy(models.Model):
    name = models.CharField(max_length=50)

    def __str__(self):
        return self.name


class UserCalorie(models.Model):
    user = models.ForeignKey(CustomUser, on_delete=models.CASCADE)
    calories = models.FloatField()
    date = models.DateField()
    recipeId = models.CharField(max_length=255)

    def __str__(self):
        return f'{self.user.username} - {self.calories} calories on {self.date}'

class CartData(models.Model):
    user = models.OneToOneField(CustomUser, on_delete=models.CASCADE)
    data = models.JSONField(default=dict)


class UserPreferences(models.Model):
    user = models.OneToOneField(CustomUser, on_delete=models.CASCADE, primary_key=True)
    phone_number = models.CharField(
        max_length=15
    )  # Assuming the phone number format (including country code)
    address = models.CharField(max_length=255)
    DIET_CHOICES = [
        ("vegetarian", "Vegetarian"),
        ("non-vegetarian", "Non-vegetarian"),
        ("vegan", "Vegan"),
    ]
    diet = models.CharField(max_length=20, choices=DIET_CHOICES, null=True)
    cuisines = models.ManyToManyField(
        Cuisine, null=True
    )  # Allow multiple cuisine selections
    allergies = models.ManyToManyField(
        Allergy, null=True
    )  # Allow multiple allergy selections
    height = models.PositiveIntegerField()  # Assuming height is in cm
    weight = models.PositiveIntegerField()  # Assuming weight is in lbs
    target_weight = models.PositiveIntegerField()  # Assuming target weight is in lbs

1	from django.db import models	1✔
2
3	# Create your models here.
4
5
6	class CustomUser(models.Model):	1✔
7	username = models.CharField(max_length=150)	1✔
8	email = models.EmailField(max_length=150, primary_key=True)	1✔
9	preferences = models.BooleanField(default=False)	1✔
10	last_login = models.DateTimeField(null=True)	1✔
11
12
13	class Cuisine(models.Model):	1✔
14	name = models.CharField(max_length=50)	1✔
15
16	def __str__(self):	1✔
17	return self.name	×
18
19
20	class Allergy(models.Model):	1✔
21	name = models.CharField(max_length=50)	1✔
22
23	def __str__(self):	1✔
24	return self.name	×
25
26
27	class UserCalorie(models.Model):	1✔
28	user = models.ForeignKey(CustomUser, on_delete=models.CASCADE)	1✔
29	calories = models.FloatField()	1✔
30	date = models.DateField()	1✔
31	recipeId = models.CharField(max_length=255)	1✔
32
33	def __str__(self):	1✔
NEW 34	return f'{self.user.username} - {self.calories} calories on {self.date}'	×
35
36	class CartData(models.Model):
37	user = models.OneToOneField(CustomUser, on_delete=models.CASCADE)	1✔
38	data = models.JSONField(default=dict)	1✔
39		1✔
40
41	class UserPreferences(models.Model):
42	user = models.OneToOneField(CustomUser, on_delete=models.CASCADE, primary_key=True)	1✔
43	phone_number = models.CharField(	1✔
44	max_length=15	1✔
45	) # Assuming the phone number format (including country code)
46	address = models.CharField(max_length=255)
47	DIET_CHOICES = [	1✔
48	("vegetarian", "Vegetarian"),	1✔
49	("non-vegetarian", "Non-vegetarian"),
50	("vegan", "Vegan"),
51	]
52	diet = models.CharField(max_length=20, choices=DIET_CHOICES, null=True)
53	cuisines = models.ManyToManyField(	1✔
54	Cuisine, null=True	1✔
55	) # Allow multiple cuisine selections
56	allergies = models.ManyToManyField(
57	Allergy, null=True	1✔
58	) # Allow multiple allergy selections
59	height = models.PositiveIntegerField() # Assuming height is in cm
60	weight = models.PositiveIntegerField() # Assuming weight is in lbs	1✔
61	target_weight = models.PositiveIntegerField() # Assuming target weight is in lbs	1✔

gcivil-nyu-org / INET-Wednesday-Spring2024-Team-1 / 339

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous