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

Commit

Permalink
feat: like event
Browse files Browse the repository at this point in the history
  • Loading branch information
adrrf committed Mar 23, 2024
1 parent 7d32090 commit c4dd583
Show file tree
Hide file tree
Showing 17 changed files with 160 additions and 353 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,4 @@ cython_debug/
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/
media
24 changes: 9 additions & 15 deletions chat/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 4.2.10 on 2024-02-29 18:04
# Generated by Django 4.2.10 on 2024-03-23 15:45

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)),
(
"chat",
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')),
],
),
]
18 changes: 0 additions & 18 deletions chat/migrations/0002_rename_chat_message_chatid.py

This file was deleted.

3 changes: 2 additions & 1 deletion event/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@

# Register your models here.

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

# Register your models here.
admin.site.register(Event)
admin.site.register(Rating)
admin.site.register(Like)
97 changes: 27 additions & 70 deletions event/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 4.2.10 on 2024-02-29 18:04
# Generated by Django 4.2.10 on 2024-03-23 15:45

import django.core.validators
from django.db import migrations, models
Expand All @@ -10,84 +10,41 @@ class Migration(migrations.Migration):
initial = True

dependencies = [
("user", "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()),
("date", models.DateField()),
("hour", models.TimeField()),
("capacity", models.PositiveIntegerField(default=0)),
(
"category",
models.TextField(
choices=[
("0", "Sports"),
("1", "Music"),
("2", "Markets"),
("3", "Relax activities"),
("4", "Live concert"),
],
default="0",
),
),
("latitude", models.FloatField()),
("longitude", models.FloatField()),
(
"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()),
('description', models.TextField()),
('date', models.DateField()),
('hour', models.TimeField()),
('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()),
('ocialClient', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='OcialClient', to='user.ocialclient')),
],
),
migrations.CreateModel(
name="Rating",
name='Rating',
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",
),
),
('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')),
],
),
]
27 changes: 0 additions & 27 deletions event/migrations/0002_alter_event_category.py

This file was deleted.

18 changes: 0 additions & 18 deletions event/migrations/0002_rename_event_event_description.py

This file was deleted.

13 changes: 0 additions & 13 deletions event/migrations/0003_merge_20240313_1134.py

This file was deleted.

27 changes: 0 additions & 27 deletions event/migrations/0004_alter_event_category.py

This file was deleted.

18 changes: 17 additions & 1 deletion event/models.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.db import models
from django.core.validators import MaxValueValidator, MinValueValidator
from user.models import OcialClient
from user.models import OcialClient, OcialUser
from django.forms import ModelForm
from ocial.models import *

Expand Down Expand Up @@ -65,6 +65,22 @@ def save(self, *args, **kwargs):
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)

def __str__(self):
return "{}: {}".format(self.event, self.user)

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

if is_new:
self.event
self.user


class OcialEventForm(ModelForm):
class Meta:
model = Event
Expand Down
7 changes: 6 additions & 1 deletion event/serializers.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from rest_framework import serializers
from .models import Event, Rating, OcialClient
from .models import Event, Rating, OcialClient, Like


class RatingSerializer(serializers.ModelSerializer):
Expand Down Expand Up @@ -33,3 +33,8 @@ class EventNearbySerializer(serializers.Serializer):
latitude = serializers.FloatField()
longitude = serializers.FloatField()
radius = serializers.FloatField()

class LikeSerializer(serializers.ModelSerializer):
class Meta:
model = Like
fields = "__all__"
3 changes: 1 addition & 2 deletions event/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
name="event_list_by_client",
),
path("create/", views.EventCreate.as_view(), name="event_create"),
# path('<int:event_id>/', views.RatingCreate.as_view(), name='rating_create'),
path("<int:pk>/update/", views.EventUpdate.as_view(), name="event_update"),
path("<int:pk>/delete/", views.EventDelete.as_view(), name="event_delete"),
# path("rating/<int:pk>/", views.RatingDelete.as_view(), name="rating_delete"),
path("<int:pk>/like/", views.EventLike.as_view(), name="event_like"),
path("nearby/", views.EventNearby.as_view(), name="event_nearby"),
]
Loading

0 comments on commit c4dd583

Please sign in to comment.