Skip to content
This repository has been archived by the owner on Jun 10, 2024. It is now read-only.

feat(ratings): Migrado rating de event a user, corregido los modelos … #62

Merged
merged 4 commits into from
Mar 28, 2024
Merged

feat(ratings): Migrado rating de event a user, corregido los modelos … #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e9e2e4
feat(ratings): Migrado rating de event a user, corregido los modelos …
lDrakohh Mar 20, 2024
f184e23
feat(ratings): Completado el migrado de ratings
lDrakohh Mar 25, 2024
03a1ca1
fix(rating): El usuario ahora va por el token.
lDrakohh Mar 26, 2024
2799da6
fix:migrations
adrrf Mar 28, 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
24 changes: 9 additions & 15 deletions chat/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 4.2.10 on 2024-03-26 18:52
# Generated by Django 4.2.10 on 2024-03-28 10:09

from django.db import migrations, models
import django.db.models.deletion
Expand All @@ -8,28 +8,22 @@ class Migration(migrations.Migration):

initial = True

dependencies = []
dependencies = [
]

operations = [
migrations.CreateModel(
name="Chat",
name='Chat',
fields=[
("id", models.AutoField(primary_key=True, serialize=False)),
('id', models.AutoField(primary_key=True, serialize=False)),
],
),
migrations.CreateModel(
name="Message",
name='Message',
fields=[
("id", models.AutoField(primary_key=True, serialize=False)),
("content", models.CharField(max_length=255)),
(
"chatId",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="Messages",
to="chat.chat",
),
),
('id', models.AutoField(primary_key=True, serialize=False)),
('content', models.CharField(max_length=255)),
('chatId', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='Messages', to='chat.chat')),
],
),
]
3 changes: 2 additions & 1 deletion event/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

# Register your models here.

from .models import Event, Rating, Like
from .models import Event, Like
from user.models import Rating

# Register your models here.
admin.site.register(Event)
Expand Down
132 changes: 20 additions & 112 deletions event/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Generated by Django 4.2.10 on 2024-03-26 18:52
# Generated by Django 4.2.10 on 2024-03-28 10:09

import django.core.validators
from django.db import migrations, models
import django.db.models.deletion

Expand All @@ -10,125 +9,34 @@ class Migration(migrations.Migration):
initial = True

dependencies = [
("user", "0001_initial"),
("images", "0001_initial"),
('images', '0001_initial'),
('user', '0001_initial'),
]

operations = [
migrations.CreateModel(
name="Event",
name='Event',
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.TextField()),
("place", models.TextField()),
("event", models.TextField()),
("timeStart", models.DateTimeField(default="1030-01-01 09:00:00")),
("timeEnd", models.DateTimeField(default="1030-01-01 10:00:00")),
("capacity", models.PositiveIntegerField(default=0)),
(
"category",
models.TextField(
choices=[
("Sports", "SPORTS"),
("Music", "MUSIC"),
("Markets", "MARKETS"),
("Relax activities", "RELAX_ACTIVITIES"),
("Live concert", "LIVE_CONCERT"),
],
default="Sports",
),
),
("latitude", models.FloatField()),
("longitude", models.FloatField()),
(
"image",
models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name="EventImage",
to="images.image",
),
),
(
"ocialClient",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="OcialClient",
to="user.ocialclient",
),
),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.TextField()),
('place', models.TextField()),
('event', models.TextField()),
('timeStart', models.DateTimeField(default='1030-01-01 09:00:00')),
('timeEnd', models.DateTimeField(default='1030-01-01 10:00:00')),
('capacity', models.PositiveIntegerField(default=0)),
('category', models.TextField(choices=[('Sports', 'SPORTS'), ('Music', 'MUSIC'), ('Markets', 'MARKETS'), ('Relax activities', 'RELAX_ACTIVITIES'), ('Live concert', 'LIVE_CONCERT')], default='Sports')),
('latitude', models.FloatField()),
('longitude', models.FloatField()),
('image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='EventImage', to='images.image')),
('ocialClient', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='OcialClient', to='user.ocialclient')),
],
),
migrations.CreateModel(
name="Rating",
name='Like',
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"score",
models.PositiveIntegerField(
default=0,
validators=[
django.core.validators.MaxValueValidator(5),
django.core.validators.MinValueValidator(0),
],
),
),
("comment", models.TextField(blank=True, null=True)),
(
"event",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="Rating",
to="event.event",
),
),
],
),
migrations.CreateModel(
name="Like",
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"event",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="Like",
to="event.event",
),
),
(
"user",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="Like",
to="user.ocialuser",
),
),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='Like', to='event.event')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='Like', to='user.ocialuser')),
],
),
]
20 changes: 0 additions & 20 deletions event/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,26 +53,6 @@ def save(self, *args, **kwargs):
self.ocialClient


class Rating(models.Model):
score = models.PositiveIntegerField(
default=0, validators=[MaxValueValidator(5), MinValueValidator(0)]
)
comment = models.TextField(blank=True, null=True)
event = models.ForeignKey(Event, related_name="Rating", on_delete=models.CASCADE)

def __str__(self):
return "{}: {}".format(self.score, self.comment)

def save(self, *args, **kwargs):
is_new = not self.pk
super().save(*args, **kwargs)

if is_new:
self.score
self.comment
self.event


class Like(models.Model):
event = models.ForeignKey(Event, related_name="Like", on_delete=models.CASCADE)
user = models.ForeignKey(OcialUser, related_name="Like", on_delete=models.CASCADE)
Expand Down
14 changes: 1 addition & 13 deletions event/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
from rest_framework import serializers
from images.serializers import ImageSerializer
from .models import Event, Rating, OcialClient, Like


class RatingSerializer(serializers.ModelSerializer):
class Meta:
model = Rating
fields = "__all__"


class RatingCreateSerializer(serializers.ModelSerializer):
class Meta:
model = Rating
fields = "__all__"
from .models import Event, OcialClient, Like


class OcialClientSerializer(serializers.ModelSerializer):
Expand Down
Loading
Loading