From 6e9d24e060cc435efb34b8968e253f38983be8d1 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Thu, 30 Apr 2026 16:12:19 +0200 Subject: [PATCH 001/100] refactor: improved header --- Templates/base.html | 2 -- static/css/base.css | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Templates/base.html b/Templates/base.html index c7f5a31..8530d62 100644 --- a/Templates/base.html +++ b/Templates/base.html @@ -32,8 +32,6 @@ {% if user.is_authenticated %} {% trans "Welcome" %} {{ user.username }} {% endif %} - -
{% csrf_token %} diff --git a/static/css/base.css b/static/css/base.css index fc2161c..4bfc86e 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -62,6 +62,8 @@ font-size: 13px !important; color: var(--text-muted) !important; font-weight: 300 !important; + margin-right: 20px !important; + align-self: center !important; } /* Selector de idioma */ From 7120b40f3d883274eead8393647b37c6313b2549 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Thu, 30 Apr 2026 16:19:21 +0200 Subject: [PATCH 002/100] refactor(css): small improvement at sidebar user profile part --- Templates/base.html | 2 +- static/css/global.css | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Templates/base.html b/Templates/base.html index 8530d62..d405f5a 100644 --- a/Templates/base.html +++ b/Templates/base.html @@ -109,7 +109,7 @@ {% if user.is_authenticated %}
- + +
+ + +
+
{% trans "Clear filters" %} diff --git a/Templates/part/card.html b/Templates/part/card.html index 038071f..7a1d0aa 100644 --- a/Templates/part/card.html +++ b/Templates/part/card.html @@ -28,5 +28,16 @@

{{ item.title }}

{% if item.synopsis %}

{{ item.synopsis|truncatewords:20 }}

{% endif %} + + {% if item.available_platforms %} +
+ {% trans "Available on" %}: +
+ {% for platform in item.available_platforms %} + {{ platform.name|default:platform.port }} + {% endfor %} +
+
+ {% endif %}
\ No newline at end of file diff --git a/locale/ca/LC_MESSAGES/django.mo b/locale/ca/LC_MESSAGES/django.mo index 13f41802563d53695b9019daad233b610e52737b..d0bf4cd7650fb5ee65fb090d5e75f5373ae7c7b0 100644 GIT binary patch delta 2081 zcmY+^TWnNC9LMoL>(X86F4fWkEp1s_utmzHV1X78y412(EK^bet)~8sgwNoGv}N+ zb7uZCvv0(XwR%4k`cD|8lPDvu`^-E%HJu;IYXP$$zK(kSHqO9{STfD*GTy=U&or8a zzu;W_8;h~{PO}g$#xSnIDr~{K^r@$*(1-P-I({B!;t?#s)3_4fLk;8xs-xeq1SfF< z3wc@XXXKlm#8T88K0x*VA^PzmYCxB;MpGT9@+LQKqh>hB(@OjZ)xq~zfj8W>zMjW* z9_oW()PT!TnW#lgWH}b%TCBk~?7%}Dz%c6l^H_&hQSE%}T=k#t zQPIdN@D?_rQdC!J_8CS|GtH-wmS`4gQW#T+)DMnBkxr&eAcka3-l6!vzYK9HY zn6m?mSn?kHO6R|yg=8b!HV(Zq(1m*O8T=HV#c_=Bx25}~3vvTk+uED+Mh!oj$nZA+o*dmhAh8bLuKSoHNYSX%z!OID8*}uCZd_p+Deeqp=-H~J>^GUGO zALvRZ(%p&lKx4Qvb3OEgFVGiH_ayi2&8#ly2!@(__otGHUcC^{ygKJ)f64ypJ@H6- nUvgJG9qEdvB6`0!vHL)Jz$+`s6qjxH1?eH4?V_jR#RiFg~w;v<}iy*LhskVhRG zF)B1*EXHyn1>-Os^U#ajYfY$u_F)Ph#h=)Ly1$KCwc~Zv+>2s@FR)UK~`VKfb{<%w_gN zSc|%^f`=1$ztzzx!(F%t@8MD$K&^Z}Z%aZia>^=^)Y(>4inn6|9&yi~M?H7hJ-&uM zj&CB#vO!cv{-UFSBG?cagCxTy;28Ec75h1!H$JrDD3+xyNJJK8GqDGA@D=`b&-YLW zJZf)I6ZwV{anL;U18MZofv_k)+(B5oC72gijR_wyrcnGgx z7cz#GFlsi|qV7L|Q?M1afLo{uK0vZ=FHtG~fGXDSs3LR*=%|SPUB-dJ=}|m{!R9|F;$N zmbyn|)k=so_gJaUaQiGE*wXpc3N;xPW9x`HgbGYeX;xFktJQ=EW_J~R6|PgjPXw`q z(Eh6}CX^A)dKytlC<9u(j~H%VI%^3Ps4}&ZP*XP4wC}@hBOOXCm?34Ym>|oJEu*6f z-azP+QL(8}=$1*WA^6H{Ju#P1TS!nIwwh4U4L227Hjzs#BB}^AN+a0xW$0gh4xu97 zq-C=`R!z(&)Rq%v!CvTx?Xn_5d#P4R%p}k$iTs|Tfze$<7!3*N|TRA P27Y_0!vl4x-BJGl#Rr^{ diff --git a/locale/ca/LC_MESSAGES/django.po b/locale/ca/LC_MESSAGES/django.po index 4eee51c..af2d88e 100644 --- a/locale/ca/LC_MESSAGES/django.po +++ b/locale/ca/LC_MESSAGES/django.po @@ -241,6 +241,10 @@ msgstr "Director" msgid "Age Rating" msgstr "Classificació" +#: Templates/home/home.html:57 +msgid "Platform" +msgstr "Plataforma" + #: Templates/home/home.html:58 msgid "Filter / Search" msgstr "Filtrar / Cercar" @@ -258,7 +262,14 @@ msgstr "Resultats" msgid "N/A" msgstr "N/A" -#: Templates/home/home.html:103 +#: Templates/home/home.html:82 +msgid "No content found matching those filters." +msgstr "No s'ha trobat cap contingut amb aquests filtres." + +#: Templates/part/card.html +msgid "Available on" +msgstr "Disponible a" + msgid "No movies found matching those filters." msgstr "No s'han trobat pel·lícules amb aquests filtres." diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 22ea94544ee42ee104d8000633298b1291a931c2..8e1cfa532785710ed08f4e2e63ae87ddf6cb1096 100644 GIT binary patch delta 1839 zcmZA2SxA&o7{>9VO^!{YrM69JPMg|dn`x`5X{)9|D^jF}M&&pV(nVcN(Va!KiV)ET zU6l$`R2M=;5>W~vktA4D7iCZoEf+!bf4=WX%fWYk-+Gq!yfdC&(OVqpPxhQMvZ^5!T>7elTiIFM7>vL z?{CI6obN!AWv*dFDQUM4+_H8ci#DC;XOEv@FX#Pi7>DL|lDh?ukj0qi*oAMf8{1jF zu16>cUNOgU3|_G3H&M0FnL_?G^BykbVxN65iRqUxa29F>A(q80a{!g%Cj5oxP^mvl z@4DZDD!%K;Ez^mbNFQpz_n3j-Q4>oWOa3*1+2m6l=b=(sgj(qaT!>YuiL{_Px{NBm zHhhbZQP1CC^k(cp)zBs$Qva2xOxIu*?#5$yGQt6qF{$I-;>$t3xCQCcY`5o)sNy?_ z8t4dWBBxLpxQJT7RaEh{q6WH;>u~@xanS?{8>>*yM=JPIt5_0Dt5I^!= zRLAY_O=__un%wHv7q~Y(Iof&dQ?U#tszwA4x?A!{}UW&rOl{;pJEKICe-qX zxz3R>OHpaeA?6TDt=?shPMv7WRAB$NVlD&;6{&t>787bojPLx&Fs4(Hvrw~TG0wJ- zeW$5L77WhfKn~H3(Y5%n)%9^&65-?@NU{e+%%lXj$sV#AFvQWzLRAQdJ zroB{~N$4x4VpLPHu5^x!;a`XI12*5DQ)5n>VJ*RYqJqdKrW>;Y+zMWRg@lT08c|LR zwkaH}Ayl!;?8UXHw*%2oTyu=S=s@+J`s$kc+F-aL8XKSB@$L#YG}bmWo(cIUM@RT~ r#Cq$i8|%XRL(#p71Kxk1-#F&w5MOyX_~(`MX!iI8e_q*{8uk1J-Yu_z delta 1703 zcmYk+Sx8h-9LMp0I;rK1rskBUsg>zemgUl_mYS7WPl8DVAq7DX)k{Q00|qUY6w*Rc zSoYA1(J}~87Eu;KB|!^D3qd3zSWrZ}^!?qrMu+*|&$-(<_x$hwPH#m^dGKwb=eW^o zh%{n%gxN-X?O{XP8f6xP+fe6s;%GdHDI?6}E<0Cyli>tLgSIxz+B;x~MQy8ihnvlI9MN8)Y z@GBlhUDwDe#$q#8GrzUdDaJu8!6}T+qO1YO;bzo?d)a73EvVGCq6WH*y8fPfz6Y1H z{{l&dW$@I>Kmc|BOxI!z@~~D)$IH8{#$NX8ctLb6KOvm*#mK|kYJ7}qu?GVzSI57j z-swmRz>j{^ejc(WD@9FQgGE@2x~?gS{8uvZISyzAeJqEreL|%wl4TBI94gg5?$Y@L zRFP$)GEs_}s1~PU1L^?|q9$%djn|GO#V(>2*yShxbLl+dfF8g@zBP~!Rb&(JJr<#E zNMY6!7(ms^ZPWz!Q7P`hTzra$@HaBF9bhokSR3lTJIIjsAm|==hbpo@)I@`*2l<0q zd2DKU1@WjNOT|@~hdHEZi*uF0qxOUGXrz;4Xu6Jy+<4bag_f1-*h zCd2F!CSxbwLk+MiGkktODg(z{FQD$fj(YG1s1-gz-4~T*Mv2)JqL@(A^-G9oegD(x zXj7P8FG&9-Kc;=d)XhdbfIQYRZmkVg{iaP%9v6)M0*G zK&&9Dh(3+ZGMWX>rbu-V$sc-=OKV3E#hm!e*SYM_MBs~c{mbSmAQLR>^> ze&>H(pB0&QKC3cRiYF8E3AOAn|F)`X{rQv=yg8>9!1!x$K0)f%sVfzAGBMm#Luzxi qS<(=?5p{G#XibdQ6KeLZiwJ#*>yHlg`(H+e22u+nLOJPIJbwXz411!cT=*DNLaprNG zF)6diLlF%tsEO84U;K%CFmLNde+|x3Z$rAwYt(>m(S=K>i9cc^e#3oO!b^I;-P(h6 znLaFHelx&>Ry2&tYy`bHh8k!B8*mQQ{|0y9J5<7})^%h><`42Q9y(b(kEug5&< zesnRv>9ifa)_yFYeGs)X!>AnzqgHqo`IsBFeF`7lhlryNUo5Koxj5_mq)LDN(CANl2R9UON7#Z8tqY`em_TYBv z1GfKc0sF53FVLU~uAwf=EH2_BRDu(XqAk0QI=d-kPBV@B@g5$=SEz)4p%Tg_J1xYE znz$Nu)NRPnro+SjYb#FD(1D}q$2+JAUZT!=0riEiwtWqEQU8rfsFYchXgTV=TGaPj zP>FZj{(e+qgVvE056WyDb?H=ROmo}T@7w;2t-nAGyo8kP+-se#jTPtyt27Z^#6dzw(@3aj)!KR${q9w?1Dk~nagJ=Wu77IU*>*yA zi>u+>0Uc9=InLJb&_-yR$_U+H6>X!6?uU=4BDx9vr>r4#(T=3oU8993t^~r7z`01! z7mH?wa+b5)=VQ@iFq%wvxU15B_ZfF2kPOA*GD7{~EvSGUo2$3JUX`7bRuEpz*Ce~4}!0>O)l1cfDbNT`EYhmbi)K}1n( z3K1I=l;EL-7J^{u(7~fbK|xRuL12a*!Z48P`Yp@zOVhY#eG4!z)tMDv(IEwoH6|BH( zSZNm6BnNuHW7H3y;wCH0Vj~0>;@+AHnw9Hx8N-5{(0vQWV0o9 zJlIySgy&m=^psf@Cb1sdFzx#LaUJJpP>Ehb%^*NFyXBlhU4P)tr?H^gTluK%TT z7UMkM<~UGBA5azehMLhbYQPvf^;aNW)_@1F71``0yC@E!uAg)L7qFi5%dS6zBP{QI z)C4?c9q6Ez1C=U;jo5)&+Y_iYJ%vhe)SXWtW7s`ZqK}+8tmeGnuFs*yd5;=*0rgIl z$IaeiU7Y$W<3&1Ds$Zxz(x}{P9&X1Z?!}|1L@%Ne8beLsD(b;^Q7`8cWGI_KRp2?M z@eOL+2<6n0CVc9z8(ZkufSsrWj-wLmMqTek{csSK=!m;MhDv1Ic@vdL7WFRWkj-AX z^Vg{BU)=dpz<~xXV;YCB236W_)SC985*a`}co3WLyz9S?EU9fHRN^i|P50`){e&u@ zWmHQMS^_nFC3^qDZ@(E;YPA+(H=&uUxxa#Nt@W+%3VVw?CAp7K_1cMW`LLGQL8$3} zMNJdY>{a?U;-H?dH(4)<8pQ~!uo+c8wKSnMSJVH(&hY5}u7g8WP;C#P_oR-{CwG|G tN^}ww%36ulrYcujrYm+j|1kD3l9~2;@_)Ub(P#1DXeR6T=l}Rak$>@jVa5Oe diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index f5c5bd5..bb49c24 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -246,6 +246,10 @@ msgstr "Director" msgid "Age Rating" msgstr "Clasificación" +#: Templates/home/home.html:57 +msgid "Platform" +msgstr "Plataforma" + #: Templates/home/home.html:58 msgid "Filter / Search" msgstr "Filtrar / Buscar" @@ -263,7 +267,14 @@ msgstr "Resultados" msgid "N/A" msgstr "N/A" -#: Templates/home/home.html:103 +#: Templates/home/home.html:82 +msgid "No content found matching those filters." +msgstr "No se ha encontrado ningún contenido con esos filtros." + +#: Templates/part/card.html +msgid "Available on" +msgstr "Disponible en" + msgid "No movies found matching those filters." msgstr "No se encontraron películas con esos filtros." diff --git a/static/css/home/filter.css b/static/css/home/filter.css index 48a6e20..a63362e 100644 --- a/static/css/home/filter.css +++ b/static/css/home/filter.css @@ -25,7 +25,8 @@ .genre-filter, .director-filter, -.age-rating-filter { +.age-rating-filter, +.platform-filter { display: flex; flex-direction: column; gap: 0.5rem; @@ -138,5 +139,5 @@ align-items: stretch; } .filter-buttons { justify-content: space-between; margin-top: .5rem; } - .genre-filter, .director-filter, .age-rating-filter { min-width: 100%; } + .genre-filter, .director-filter, .age-rating-filter, .platform-filter { min-width: 100%; } } \ No newline at end of file diff --git a/static/css/home/home.css b/static/css/home/home.css index e74904b..29fe18a 100644 --- a/static/css/home/home.css +++ b/static/css/home/home.css @@ -158,6 +158,51 @@ font-weight: 300; } +/* Platform badges */ +.card-platforms { + margin-top: auto; + padding-top: .5rem; + border-top: 1px solid var(--border-glass); + display: flex; + flex-direction: column; + gap: .35rem; +} + +.platforms-label { + font-size: 10px; + font-weight: 400; + color: var(--neon-cyan); + text-transform: uppercase; + letter-spacing: .08em; + opacity: .7; + font-family: 'DM Sans', sans-serif; +} + +.platforms-list { + display: flex; + flex-wrap: wrap; + gap: .35rem; +} + +.platform-badge { + font-size: 10px; + font-weight: 500; + padding: 2px 8px; + border-radius: 4px; + background: rgba(102, 252, 241, .06); + color: var(--neon-cyan); + border: 1px solid rgba(102, 252, 241, .2); + font-family: 'DM Sans', sans-serif; + letter-spacing: .04em; + white-space: nowrap; + transition: background .2s, border-color .2s; +} + +.movie-card:hover .platform-badge { + background: rgba(102, 252, 241, .12); + border-color: rgba(102, 252, 241, .35); +} + /* Empty state */ .no-results { grid-column: 1 / -1; diff --git a/web_app/views.py b/web_app/views.py index 268883a..babf62e 100644 --- a/web_app/views.py +++ b/web_app/views.py @@ -1,6 +1,6 @@ from django.shortcuts import render, redirect, get_object_or_404 from web_app.forms import CustomUserCreationForm -from web_app.models import AgeRating, Director, Genre, Movie, UserProfile, Series +from web_app.models import AgeRating, API, Director, Genre, Movie, UserProfile, Series from web_app import utils from itertools import chain from django.http import JsonResponse @@ -16,6 +16,7 @@ def home(request): genre_filter = request.GET.get('genre', '') director_filter = request.GET.get('director', '') age_rating_filter = request.GET.get('age_rating', '') + platform_filter = request.GET.get('platform', '') # value = API port if search_query: movies = movies.filter(title__icontains=search_query) @@ -30,17 +31,26 @@ def home(request): series = series.filter(director__name=director_filter) if age_rating_filter: - movies = movies.filter(age_rating__description=age_rating_filter) + movies = movies.filter(age_rating__description=age_ravailable_apisating_filter) series = series.filter(age_rating__description=age_rating_filter) + if platform_filter: + movies = movies.filter(api__port=platform_filter) + series = series.filter(api__port=platform_filter) + unique_results = [] seen_keys = set() for m in movies: - key = (m.title.lower(), 'movie') + key = (m.title.lower(), 'movie') if key not in seen_keys: m.content_type = 'movie' - + # Collect all platforms (API objects) this title is available on + m.available_platforms = list( + API.objects.filter( + movie__title__iexact=m.title + ).distinct() + ) unique_results.append(m) seen_keys.add(key) @@ -48,23 +58,30 @@ def home(request): key = (s.title.lower(), 'series') if key not in seen_keys: s.content_type = 'series' - + # Collect all platforms (API objects) this title is available on + s.available_platforms = list( + API.objects.filter( + series__title__iexact=s.title + ).distinct() + ) unique_results.append(s) seen_keys.add(key) - paginator = Paginator(unique_results, 10) + paginator = Paginator(unique_results, 12) page_number = request.GET.get('page') page_obj = paginator.get_page(page_number) genres = Genre.objects.values_list('name', flat=True).distinct() directors = Director.objects.values_list('name', flat=True).distinct() age_ratings = AgeRating.objects.values_list('description', flat=True).distinct() + platforms = API.objects.all() context = { 'items': page_obj, 'genres': genres, 'directors': directors, 'age_ratings': age_ratings, + 'platforms': platforms, 'search_query': search_query, } @@ -90,7 +107,7 @@ def user_setting(request): def movie_detail(request, pk): movie = get_object_or_404(Movie, id=pk) - available_apis = [m.api for m in Movie.objects.filter(title__iexact=movie.title).select_related('api') if m.api] + available_apis = [m.api.port for m in Movie.objects.filter(title__iexact=movie.title).select_related('api') if m.api] is_favorite = False if request.user.is_authenticated: From e68c9e9d95d016105ae200233f63e11f803d3337 Mon Sep 17 00:00:00 2001 From: Norbert Date: Fri, 1 May 2026 21:57:59 +0200 Subject: [PATCH 009/100] fix: fixed the pagination --- web_app/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_app/views.py b/web_app/views.py index babf62e..c1fcbf3 100644 --- a/web_app/views.py +++ b/web_app/views.py @@ -67,7 +67,7 @@ def home(request): unique_results.append(s) seen_keys.add(key) - paginator = Paginator(unique_results, 12) + paginator = Paginator(unique_results, 20) page_number = request.GET.get('page') page_obj = paginator.get_page(page_number) From 28ad232eb13cf4f4dfbfd5050b8289200eb7271f Mon Sep 17 00:00:00 2001 From: Norbert Date: Fri, 1 May 2026 22:00:01 +0200 Subject: [PATCH 010/100] fix: fixed to string on Api --- web_app/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_app/models.py b/web_app/models.py index b925313..a34b5d4 100644 --- a/web_app/models.py +++ b/web_app/models.py @@ -7,7 +7,7 @@ class API(models.Model): name = models.CharField(max_length=100, blank=True, default='') def __str__(self): - return self.name if self.name else f"API on port {self.port}" + return self.name if self.name else f"{self.port}" class Director(models.Model): From dc2b8d0947ba8469949e2845be21229ca9c054eb Mon Sep 17 00:00:00 2001 From: Norbert Date: Sat, 2 May 2026 20:48:15 +0200 Subject: [PATCH 011/100] fixed: port api models problems --- web_app/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_app/views.py b/web_app/views.py index c1fcbf3..dcc0b63 100644 --- a/web_app/views.py +++ b/web_app/views.py @@ -31,7 +31,7 @@ def home(request): series = series.filter(director__name=director_filter) if age_rating_filter: - movies = movies.filter(age_rating__description=age_ravailable_apisating_filter) + movies = movies.filter(age_rating__description=age_rating_filter) series = series.filter(age_rating__description=age_rating_filter) if platform_filter: @@ -107,7 +107,7 @@ def user_setting(request): def movie_detail(request, pk): movie = get_object_or_404(Movie, id=pk) - available_apis = [m.api.port for m in Movie.objects.filter(title__iexact=movie.title).select_related('api') if m.api] + available_apis = [m.api for m in Movie.objects.filter(title__iexact=movie.title).select_related('api') if m.api] is_favorite = False if request.user.is_authenticated: From a9e482b8ffbb7621601f41b0bc103dca25d94cd2 Mon Sep 17 00:00:00 2001 From: Norbert Date: Tue, 5 May 2026 17:49:16 +0200 Subject: [PATCH 012/100] feat (DDBB): added neon with postgres sql to database settings --- requirements.txt | 1 + web/settings.py | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 57f896f..2a43d98 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,5 +13,6 @@ sqlparse==0.5.5 tzdata==2025.3 tzlocal==5.3.1 urllib3==2.6.3 +psycopg2-binary==2.9.10 Pillow==12.2.0 whitenoise==6.4.0 \ No newline at end of file diff --git a/web/settings.py b/web/settings.py index 614ef09..6e318a5 100644 --- a/web/settings.py +++ b/web/settings.py @@ -13,6 +13,9 @@ from pathlib import Path from django.utils.translation import gettext as _ import os +from urllib.parse import urlparse, parse_qsl +from dotenv import load_dotenv +load_dotenv() # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent @@ -85,12 +88,24 @@ # Database # https://docs.djangoproject.com/en/4.2/ref/settings/#databases - +''' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', 'NAME': BASE_DIR / 'db.sqlite3', } +}''' +tmpPostgres = urlparse(os.getenv("DATABASE_URL")) +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql', + 'NAME': tmpPostgres.path.replace('/', ''), + 'USER': tmpPostgres.username, + 'PASSWORD': tmpPostgres.password, + 'HOST': tmpPostgres.hostname, + 'PORT': tmpPostgres.port or 5432, + 'OPTIONS': dict(parse_qsl(tmpPostgres.query)), + } } From 5af3c6951e35c9505064c409f322f23d618c0c4a Mon Sep 17 00:00:00 2001 From: Norbert Date: Tue, 5 May 2026 17:52:26 +0200 Subject: [PATCH 013/100] feat (BBDD): added implementation of bbdd as the uml --- .agents/skills/neon-postgres/SKILL.md | 186 ++++++++++++++++++ .claude/skills/neon-postgres/SKILL.md | 186 ++++++++++++++++++ skills-lock.json | 11 ++ web_app/admin.py | 108 +++++++++- web_app/forms.py | 8 +- web_app/migrations/0001_initial.py | 88 ++++++--- .../0002_contingut_api_content_id.py | 18 ++ web_app/models.py | 180 +++++++++++++---- web_app/utils.py | 81 +++++--- web_app/views.py | 54 +++-- 10 files changed, 792 insertions(+), 128 deletions(-) create mode 100644 .agents/skills/neon-postgres/SKILL.md create mode 100644 .claude/skills/neon-postgres/SKILL.md create mode 100644 skills-lock.json create mode 100644 web_app/migrations/0002_contingut_api_content_id.py diff --git a/.agents/skills/neon-postgres/SKILL.md b/.agents/skills/neon-postgres/SKILL.md new file mode 100644 index 0000000..73c4b0f --- /dev/null +++ b/.agents/skills/neon-postgres/SKILL.md @@ -0,0 +1,186 @@ +--- +name: neon-postgres +description: Guides and best practices for working with Neon Serverless Postgres. Covers getting started, local development with Neon, choosing a connection method, Neon features, authentication (@neondatabase/auth), PostgREST-style data API (@neondatabase/neon-js), Neon CLI, and Neon's Platform API/SDKs. Use for any Neon-related questions. +--- + +# Neon Serverless Postgres + +Neon is a serverless Postgres platform that separates compute and storage to offer autoscaling, branching, instant restore, and scale-to-zero. It's fully compatible with Postgres and works with any language, framework, or ORM that supports Postgres. + +## Neon Documentation + +The Neon documentation is the source of truth for all Neon-related information. Always verify claims against the official docs before responding. Neon features and APIs evolve, so prefer fetching current docs over relying on training data. + +### Fetching Docs as Markdown + +Any Neon doc page can be fetched as markdown in two ways: + +1. **Append `.md` to the URL** (simplest): https://neon.com/docs/introduction/branching.md +2. **Request `text/markdown`** on the standard URL: `curl -H "Accept: text/markdown" https://neon.com/docs/introduction/branching` + +Both return the same markdown content. Use whichever method your tools support. + +### Finding the Right Page + +The docs index lists every available page with its URL and a short description: + +``` +https://neon.com/docs/llms.txt +``` + +Common doc URLs are organized in the topic links below. If you need a page not listed here, search the docs index: https://neon.com/docs/llms.txt — don't guess URLs. + +## What Is Neon + +Use this for architecture explanations and terminology (organizations, projects, branches, endpoints) before giving implementation advice. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/what-is-neon.md + +## Getting Started + +Use this for first-time setup: org/project selection, connection strings, driver installation, optional auth, and initial schema setup. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/getting-started.md + +## Connection Methods & Drivers + +Use this when you need to pick the correct transport and driver based on runtime constraints (TCP, HTTP, WebSocket, edge, serverless, long-running). + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/connection-methods.md + +### Serverless Driver + +Use this for `@neondatabase/serverless` patterns, including HTTP queries, WebSocket transactions, and runtime-specific optimizations. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-serverless.md + +### Neon JS SDK + +Use this for combined Neon Auth + Data API workflows with PostgREST-style querying and typed client setup. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-js.md + +## Developer Tools + +Use this for local development enablement with `npx neonctl@latest init`, VSCode extension setup, and Neon MCP server configuration. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/devtools.md + +### Neon CLI + +Use this for terminal-first workflows, scripts, and CI/CD automation with `neonctl`. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-cli.md + +## Neon Admin API + +The Neon Admin API can be used to manage Neon resources programmatically. It is used behind the scenes by the Neon CLI and MCP server, but can also be used directly for more complex automation workflows or when embedding Neon in other applications. + +### Neon REST API + +Use this for direct HTTP automation, endpoint-level control, API key auth, rate-limit handling, and operation polling. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-rest-api.md + +### Neon TypeScript SDK + +Use this when implementing typed programmatic control of Neon resources in TypeScript via `@neondatabase/api-client`. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-typescript-sdk.md + +### Neon Python SDK + +Use this when implementing programmatic Neon management in Python with the `neon-api` package. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-python-sdk.md + +## Neon Auth + +Use this for managed user authentication setup, UI components, auth methods, and Neon Auth integration pitfalls in Next.js and React apps. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-auth.md + +Neon Auth is also embedded in the Neon JS SDK - so depending on your use case, you may want to use the Neon JS SDK instead of Neon Auth. See https://neon.com/docs/ai/skills/neon-postgres/references/connection-methods.md for more details. + +## Branching + +Use this when the user is planning isolated environments, schema migration testing, preview deployments, or branch lifecycle automation. + +Key points: + +- Branches are instant, copy-on-write clones (no full data copy). +- Each branch has its own compute endpoint. +- Use the neonctl CLI or MCP server to create, inspect, and compare branches. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/branching.md + +## Autoscaling + +Use this when the user needs compute to scale automatically with workload and wants guidance on CU sizing and runtime behavior. + +Link: https://neon.com/docs/introduction/autoscaling.md + +## Scale to Zero + +Use this when optimizing idle costs and discussing suspend/resume behavior, including cold-start trade-offs. + +Key points: + +- Idle computes suspend automatically (default 5 minutes, configurable) (unless disabled - launch & scale plan only) +- First query after suspend typically has a cold-start penalty (around hundreds of ms) +- Storage remains active while compute is suspended. + +Link: https://neon.com/docs/introduction/scale-to-zero.md + +## Instant Restore + +Use this when the user needs point-in-time recovery or wants to restore data state without traditional backup restore workflows. + +Key points: + +- Restore windows depend on plan limits. +- Users can create branches from historical points-in-time. +- Time Travel queries can be used for historical inspection workflows. + +Link: https://neon.com/docs/introduction/branch-restore.md + +## Read Replicas + +Use this for read-heavy workloads where the user needs dedicated read-only compute without duplicating storage. + +Key points: + +- Replicas are read-only compute endpoints sharing the same storage. +- Creation is fast and scaling is independent from primary compute. +- Typical use cases: analytics, reporting, and read-heavy APIs. + +Link: https://neon.com/docs/introduction/read-replicas.md + +## Connection Pooling + +Use this when the user is in serverless or high-concurrency environments and needs safe, scalable Postgres connection management. + +Key points: + +- Neon pooling uses PgBouncer. +- Add `-pooler` to endpoint hostnames to use pooled connections. +- Pooling is especially important in serverless runtimes with bursty concurrency. + +Link: https://neon.com/docs/connect/connection-pooling.md + +## IP Allow Lists + +Use this when the user needs to restrict database access by trusted networks, IPs, or CIDR ranges. + +Link: https://neon.com/docs/introduction/ip-allow.md + +## Logical Replication + +Use this when integrating CDC pipelines, external Postgres sync, or replication-based data movement. + +Key points: + +- Neon supports native logical replication workflows. +- Useful for replicating to/from external Postgres systems. + +Link: https://neon.com/docs/guides/logical-replication-guide.md diff --git a/.claude/skills/neon-postgres/SKILL.md b/.claude/skills/neon-postgres/SKILL.md new file mode 100644 index 0000000..73c4b0f --- /dev/null +++ b/.claude/skills/neon-postgres/SKILL.md @@ -0,0 +1,186 @@ +--- +name: neon-postgres +description: Guides and best practices for working with Neon Serverless Postgres. Covers getting started, local development with Neon, choosing a connection method, Neon features, authentication (@neondatabase/auth), PostgREST-style data API (@neondatabase/neon-js), Neon CLI, and Neon's Platform API/SDKs. Use for any Neon-related questions. +--- + +# Neon Serverless Postgres + +Neon is a serverless Postgres platform that separates compute and storage to offer autoscaling, branching, instant restore, and scale-to-zero. It's fully compatible with Postgres and works with any language, framework, or ORM that supports Postgres. + +## Neon Documentation + +The Neon documentation is the source of truth for all Neon-related information. Always verify claims against the official docs before responding. Neon features and APIs evolve, so prefer fetching current docs over relying on training data. + +### Fetching Docs as Markdown + +Any Neon doc page can be fetched as markdown in two ways: + +1. **Append `.md` to the URL** (simplest): https://neon.com/docs/introduction/branching.md +2. **Request `text/markdown`** on the standard URL: `curl -H "Accept: text/markdown" https://neon.com/docs/introduction/branching` + +Both return the same markdown content. Use whichever method your tools support. + +### Finding the Right Page + +The docs index lists every available page with its URL and a short description: + +``` +https://neon.com/docs/llms.txt +``` + +Common doc URLs are organized in the topic links below. If you need a page not listed here, search the docs index: https://neon.com/docs/llms.txt — don't guess URLs. + +## What Is Neon + +Use this for architecture explanations and terminology (organizations, projects, branches, endpoints) before giving implementation advice. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/what-is-neon.md + +## Getting Started + +Use this for first-time setup: org/project selection, connection strings, driver installation, optional auth, and initial schema setup. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/getting-started.md + +## Connection Methods & Drivers + +Use this when you need to pick the correct transport and driver based on runtime constraints (TCP, HTTP, WebSocket, edge, serverless, long-running). + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/connection-methods.md + +### Serverless Driver + +Use this for `@neondatabase/serverless` patterns, including HTTP queries, WebSocket transactions, and runtime-specific optimizations. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-serverless.md + +### Neon JS SDK + +Use this for combined Neon Auth + Data API workflows with PostgREST-style querying and typed client setup. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-js.md + +## Developer Tools + +Use this for local development enablement with `npx neonctl@latest init`, VSCode extension setup, and Neon MCP server configuration. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/devtools.md + +### Neon CLI + +Use this for terminal-first workflows, scripts, and CI/CD automation with `neonctl`. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-cli.md + +## Neon Admin API + +The Neon Admin API can be used to manage Neon resources programmatically. It is used behind the scenes by the Neon CLI and MCP server, but can also be used directly for more complex automation workflows or when embedding Neon in other applications. + +### Neon REST API + +Use this for direct HTTP automation, endpoint-level control, API key auth, rate-limit handling, and operation polling. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-rest-api.md + +### Neon TypeScript SDK + +Use this when implementing typed programmatic control of Neon resources in TypeScript via `@neondatabase/api-client`. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-typescript-sdk.md + +### Neon Python SDK + +Use this when implementing programmatic Neon management in Python with the `neon-api` package. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-python-sdk.md + +## Neon Auth + +Use this for managed user authentication setup, UI components, auth methods, and Neon Auth integration pitfalls in Next.js and React apps. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-auth.md + +Neon Auth is also embedded in the Neon JS SDK - so depending on your use case, you may want to use the Neon JS SDK instead of Neon Auth. See https://neon.com/docs/ai/skills/neon-postgres/references/connection-methods.md for more details. + +## Branching + +Use this when the user is planning isolated environments, schema migration testing, preview deployments, or branch lifecycle automation. + +Key points: + +- Branches are instant, copy-on-write clones (no full data copy). +- Each branch has its own compute endpoint. +- Use the neonctl CLI or MCP server to create, inspect, and compare branches. + +Link: https://neon.com/docs/ai/skills/neon-postgres/references/branching.md + +## Autoscaling + +Use this when the user needs compute to scale automatically with workload and wants guidance on CU sizing and runtime behavior. + +Link: https://neon.com/docs/introduction/autoscaling.md + +## Scale to Zero + +Use this when optimizing idle costs and discussing suspend/resume behavior, including cold-start trade-offs. + +Key points: + +- Idle computes suspend automatically (default 5 minutes, configurable) (unless disabled - launch & scale plan only) +- First query after suspend typically has a cold-start penalty (around hundreds of ms) +- Storage remains active while compute is suspended. + +Link: https://neon.com/docs/introduction/scale-to-zero.md + +## Instant Restore + +Use this when the user needs point-in-time recovery or wants to restore data state without traditional backup restore workflows. + +Key points: + +- Restore windows depend on plan limits. +- Users can create branches from historical points-in-time. +- Time Travel queries can be used for historical inspection workflows. + +Link: https://neon.com/docs/introduction/branch-restore.md + +## Read Replicas + +Use this for read-heavy workloads where the user needs dedicated read-only compute without duplicating storage. + +Key points: + +- Replicas are read-only compute endpoints sharing the same storage. +- Creation is fast and scaling is independent from primary compute. +- Typical use cases: analytics, reporting, and read-heavy APIs. + +Link: https://neon.com/docs/introduction/read-replicas.md + +## Connection Pooling + +Use this when the user is in serverless or high-concurrency environments and needs safe, scalable Postgres connection management. + +Key points: + +- Neon pooling uses PgBouncer. +- Add `-pooler` to endpoint hostnames to use pooled connections. +- Pooling is especially important in serverless runtimes with bursty concurrency. + +Link: https://neon.com/docs/connect/connection-pooling.md + +## IP Allow Lists + +Use this when the user needs to restrict database access by trusted networks, IPs, or CIDR ranges. + +Link: https://neon.com/docs/introduction/ip-allow.md + +## Logical Replication + +Use this when integrating CDC pipelines, external Postgres sync, or replication-based data movement. + +Key points: + +- Neon supports native logical replication workflows. +- Useful for replicating to/from external Postgres systems. + +Link: https://neon.com/docs/guides/logical-replication-guide.md diff --git a/skills-lock.json b/skills-lock.json new file mode 100644 index 0000000..988693b --- /dev/null +++ b/skills-lock.json @@ -0,0 +1,11 @@ +{ + "version": 1, + "skills": { + "neon-postgres": { + "source": "neondatabase/agent-skills", + "sourceType": "github", + "skillPath": "skills/neon-postgres/SKILL.md", + "computedHash": "391693eee67001639ab65474df185da3ea5cf9ee4b99badecfd64561113edbb4" + } + } +} diff --git a/web_app/admin.py b/web_app/admin.py index f0392f0..73d20ef 100644 --- a/web_app/admin.py +++ b/web_app/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin from django.utils.safestring import mark_safe -from .models import SyncLog, API +from .models import SyncLog, API, Contingut, Movie, Series, Director, Genre, AgeRating, CustomUser, UserProfile, Valoracio, Preferits @admin.register(API) @@ -9,7 +9,6 @@ class APIAdmin(admin.ModelAdmin): fields = ('port', 'name') - @admin.register(SyncLog) class SyncLogAdmin(admin.ModelAdmin): list_display = ('start_time', 'end_time', 'status_visual', 'records_created', 'records_updated') @@ -18,11 +17,108 @@ class SyncLogAdmin(admin.ModelAdmin): def status_visual(self, obj): if obj.status.lower() == 'error': - return mark_safe('🔴 ERROR') + return mark_safe('ERROR') elif obj.status.lower() == 'success': - return mark_safe('🟢 SUCCESS') + return mark_safe('SUCCESS') elif obj.status.lower() == 'running': - return mark_safe('🟡 RUNNING') + return mark_safe('RUNNING') return obj.status - status_visual.short_description = 'Status' \ No newline at end of file + status_visual.short_description = 'Status' + + +@admin.register(Contingut) +class ContingutAdmin(admin.ModelAdmin): + list_display = ('titol', 'data_estrena', 'genere', 'director', 'age_rating', 'api') + list_filter = ('api', 'genere', 'director', 'age_rating') + search_fields = ('titol',) + + +@admin.register(Movie) +class MovieAdmin(admin.ModelAdmin): + list_display = ('title', 'year', 'genre_name', 'director_name', 'api_name') + list_filter = ('contingut__api', 'contingut__genere', 'contingut__director') + search_fields = ('contingut__titol',) + + def title(self, obj): + return obj.contingut.titol + def year(self, obj): + return obj.contingut.data_estrena + def genre_name(self, obj): + return obj.contingut.genere.name if obj.contingut.genere else '-' + def director_name(self, obj): + return obj.contingut.director.name if obj.contingut.director else '-' + def api_name(self, obj): + return obj.contingut.api.name if obj.contingut.api else '-' + + +@admin.register(Series) +class SeriesAdmin(admin.ModelAdmin): + list_display = ('title', 'year', 'num_temporades', 'genre_name', 'director_name') + list_filter = ('contingut__api', 'contingut__genere', 'contingut__director') + search_fields = ('contingut__titol',) + + def title(self, obj): + return obj.contingut.titol + def year(self, obj): + return obj.contingut.data_estrena + def genre_name(self, obj): + return obj.contingut.genere.name if obj.contingut.genere else '-' + def director_name(self, obj): + return obj.contingut.director.name if obj.contingut.director else '-' + + +@admin.register(Director) +class DirectorAdmin(admin.ModelAdmin): + list_display = ('name', 'director_id', 'api', 'country', 'birth_date') + list_filter = ('api',) + search_fields = ('name',) + + +@admin.register(Genre) +class GenreAdmin(admin.ModelAdmin): + list_display = ('name', 'genre_id', 'api') + list_filter = ('api',) + search_fields = ('name',) + + +@admin.register(AgeRating) +class AgeRatingAdmin(admin.ModelAdmin): + list_display = ('codi', 'age', 'age_rating_id', 'api') + list_filter = ('api',) + + +@admin.register(CustomUser) +class CustomUserAdmin(admin.ModelAdmin): + list_display = ('username', 'email', 'type', 'is_staff') + list_filter = ('type', 'is_staff', 'is_active') + search_fields = ('username', 'email') + + +@admin.register(UserProfile) +class UserProfileAdmin(admin.ModelAdmin): + list_display = ('user', 'preferits_count') + search_fields = ('user__username',) + + def preferits_count(self, obj): + return obj.preferits.count() + + +@admin.register(Valoracio) +class ValoracioAdmin(admin.ModelAdmin): + list_display = ('user', 'contingut_titol', 'puntuacio', 'creada_a') + list_filter = ('puntuacio',) + search_fields = ('user__username', 'contingut__titol') + + def contingut_titol(self, obj): + return obj.contingut.titol + + +@admin.register(Preferits) +class PreferitsAdmin(admin.ModelAdmin): + list_display = ('user_profile', 'contingut_titol', 'afegit_a') + list_filter = ('afegit_a',) + search_fields = ('user_profile__user__username', 'contingut__titol') + + def contingut_titol(self, obj): + return obj.contingut.titol diff --git a/web_app/forms.py b/web_app/forms.py index bc920a3..d819961 100644 --- a/web_app/forms.py +++ b/web_app/forms.py @@ -1,10 +1,10 @@ from django import forms from django.utils.translation import gettext_lazy as _ -from django.contrib.auth.forms import UserCreationForm, UserChangeForm +from django.contrib.auth.forms import UserChangeForm from django.core.exceptions import ValidationError from django.core.validators import MaxLengthValidator -from .models import * +from .models import CustomUser, API, UserType class CustomUserCreationForm(forms.ModelForm): username = forms.CharField( @@ -62,7 +62,7 @@ def save(self, commit=True): class CustomUserChangeForm(UserChangeForm): class Meta: model = CustomUser - fields = ['username', 'first_name', 'last_name', 'email', 'avatar', 'bio', 'location'] + fields = ['username', 'first_name', 'last_name', 'email', 'avatar', 'bio', 'location', 'type'] help_texts = {field: '' for field in fields} def clean_avatar(self): @@ -73,4 +73,4 @@ def clean_avatar(self): if ext not in ['jpg', 'jpeg', 'png']: raise ValidationError('Solo se permiten archivos JPG o PNG.') - return avatar \ No newline at end of file + return avatar diff --git a/web_app/migrations/0001_initial.py b/web_app/migrations/0001_initial.py index e598b27..c5773bb 100644 --- a/web_app/migrations/0001_initial.py +++ b/web_app/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 6.0.3 on 2026-04-28 08:21 +# Generated by Django 6.0.3 on 2026-05-05 12:40 import django.contrib.auth.models import django.contrib.auth.validators @@ -42,7 +42,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('age_rating_id', models.IntegerField()), - ('description', models.CharField(max_length=255)), + ('codi', models.CharField(max_length=10, verbose_name='Codi')), ('age', models.IntegerField()), ('api', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='age_ratings', to='web_app.api')), ], @@ -67,6 +67,7 @@ class Migration(migrations.Migration): ('avatar', models.ImageField(blank=True, null=True, upload_to='avatars/')), ('bio', models.TextField(blank=True, null=True)), ('location', models.CharField(blank=True, max_length=255, null=True)), + ('type', models.CharField(choices=[('Staff', 'Staff'), ('Admin', 'Admin'), ('Consumer', 'Consumer')], default='Consumer', max_length=10)), ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')), ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')), ('subscriptions', models.ManyToManyField(blank=True, related_name='subscribed_users', to='web_app.api')), @@ -108,54 +109,89 @@ class Migration(migrations.Migration): }, ), migrations.CreateModel( - name='Movie', + name='Contingut', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('movie_id', models.IntegerField()), - ('title', models.CharField(max_length=255)), + ('titol', models.CharField(max_length=255, verbose_name='Títol')), + ('data_estrena', models.IntegerField(blank=True, null=True, verbose_name="Any d'estrena")), + ('expires_at', models.DateTimeField(blank=True, null=True)), ('synopsis', models.TextField(blank=True, null=True)), - ('year', models.IntegerField(blank=True, null=True)), ('rating', models.FloatField(blank=True, null=True)), - ('expires_at', models.DateTimeField(blank=True, null=True)), ('age_rating', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='web_app.agerating')), ('api', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='web_app.api')), ('director', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='web_app.director')), - ('genre', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='web_app.genre')), + ('genere', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='web_app.genre')), ], options={ - 'unique_together': {('movie_id', 'api')}, + 'verbose_name': 'Contingut', + 'verbose_name_plural': 'Continguts', + }, + ), + migrations.CreateModel( + name='Movie', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('contingut', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='movie', to='web_app.contingut')), + ], + options={ + 'verbose_name': 'Pel·lícula', + 'verbose_name_plural': 'Pel·lícules', + }, + ), + migrations.CreateModel( + name='Preferits', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('afegit_a', models.DateTimeField(auto_now_add=True)), + ('contingut', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='web_app.contingut')), + ], + options={ + 'verbose_name': 'Preferit', + 'verbose_name_plural': 'Preferits', }, ), migrations.CreateModel( name='Series', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('series_id', models.IntegerField()), - ('title', models.CharField(max_length=255)), - ('synopsis', models.TextField(blank=True, null=True)), - ('start_year', models.IntegerField(blank=True, null=True)), - ('end_year', models.IntegerField(blank=True, null=True)), - ('total_seasons', models.IntegerField(blank=True, null=True)), - ('rating', models.FloatField(blank=True, null=True)), - ('country_id', models.IntegerField(blank=True, null=True)), - ('language_id', models.IntegerField(blank=True, null=True)), - ('expires_at', models.DateTimeField(blank=True, null=True)), - ('age_rating', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='web_app.agerating')), - ('api', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='web_app.api')), - ('director', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='web_app.director')), - ('genre', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='web_app.genre')), + ('num_temporades', models.IntegerField(blank=True, null=True, verbose_name='Nombre de temporades')), + ('contingut', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='series', to='web_app.contingut')), ], options={ - 'unique_together': {('series_id', 'api')}, + 'verbose_name': 'Sèrie', + 'verbose_name_plural': 'Sèries', }, ), migrations.CreateModel( name='UserProfile', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('favorite_movies', models.ManyToManyField(blank=True, to='web_app.movie')), - ('favorite_series', models.ManyToManyField(blank=True, to='web_app.series')), + ('preferits', models.ManyToManyField(blank=True, through='web_app.Preferits', to='web_app.contingut')), ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='profile', to=settings.AUTH_USER_MODEL)), ], ), + migrations.AddField( + model_name='preferits', + name='user_profile', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='preferits_set', to='web_app.userprofile'), + ), + migrations.CreateModel( + name='Valoracio', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('puntuacio', models.IntegerField()), + ('comentari', models.TextField(blank=True, null=True)), + ('creada_a', models.DateTimeField(auto_now_add=True)), + ('contingut', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='valoracions', to='web_app.contingut')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='valoracions', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'verbose_name': 'Valoració', + 'verbose_name_plural': 'Valoracions', + }, + ), + migrations.AlterUniqueTogether( + name='preferits', + unique_together={('user_profile', 'contingut')}, + ), ] diff --git a/web_app/migrations/0002_contingut_api_content_id.py b/web_app/migrations/0002_contingut_api_content_id.py new file mode 100644 index 0000000..b397668 --- /dev/null +++ b/web_app/migrations/0002_contingut_api_content_id.py @@ -0,0 +1,18 @@ +# Generated by Django 6.0.3 on 2026-05-05 12:53 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('web_app', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='contingut', + name='api_content_id', + field=models.IntegerField(blank=True, db_index=True, null=True, verbose_name="ID de l'API"), + ), + ] diff --git a/web_app/models.py b/web_app/models.py index b925313..895e837 100644 --- a/web_app/models.py +++ b/web_app/models.py @@ -2,6 +2,13 @@ from django.contrib.auth.models import AbstractUser from web import settings + +class UserType(models.TextChoices): + STAFF = 'Staff', 'Staff' + ADMIN = 'Admin', 'Admin' + CONSUMER = 'Consumer', 'Consumer' + + class API(models.Model): port = models.IntegerField(unique=True) name = models.CharField(max_length=100, blank=True, default='') @@ -40,91 +47,188 @@ def __str__(self): class AgeRating(models.Model): age_rating_id = models.IntegerField() api = models.ForeignKey(API, on_delete=models.CASCADE, related_name='age_ratings') - description = models.CharField(max_length=255) + codi = models.CharField(max_length=10, verbose_name='Codi') age = models.IntegerField() class Meta: unique_together = ('age_rating_id', 'api') def __str__(self): - return self.description + return self.codi + @property + def description(self): + return self.codi -class Movie(models.Model): - movie_id = models.IntegerField() - age_rating = models.ForeignKey(AgeRating, on_delete=models.SET_NULL, blank=True, null=True) + +class Contingut(models.Model): + api_content_id = models.IntegerField(verbose_name='ID de l\'API', blank=True, null=True, db_index=True) + titol = models.CharField(max_length=255, verbose_name='Títol') + data_estrena = models.IntegerField(blank=True, null=True, verbose_name='Any d\'estrena') + expires_at = models.DateTimeField(blank=True, null=True) director = models.ForeignKey(Director, on_delete=models.SET_NULL, blank=True, null=True) - genre = models.ForeignKey(Genre, on_delete=models.SET_NULL, blank=True, null=True) - api = models.ForeignKey(API, blank=True, null=True, on_delete=models.SET_NULL) + genere = models.ForeignKey(Genre, on_delete=models.SET_NULL, blank=True, null=True) + age_rating = models.ForeignKey(AgeRating, on_delete=models.SET_NULL, blank=True, null=True) + api = models.ForeignKey(API, on_delete=models.SET_NULL, blank=True, null=True) - title = models.CharField(max_length=255) synopsis = models.TextField(blank=True, null=True) - year = models.IntegerField(blank=True, null=True) rating = models.FloatField(blank=True, null=True) - expires_at = models.DateTimeField(blank=True, null=True) class Meta: - unique_together = ('movie_id', 'api') + verbose_name = 'Contingut' + verbose_name_plural = 'Continguts' def __str__(self): - return self.title + return self.titol - def get_similar_by_genre(self, limit=4): - if not self.genre: - return Movie.objects.none() - return Movie.objects.filter(genre=self.genre).exclude(id=self.id).order_by('?')[:limit] +class Movie(models.Model): + contingut = models.OneToOneField(Contingut, on_delete=models.CASCADE, related_name='movie') -class Series(models.Model): - series_id = models.IntegerField() - age_rating = models.ForeignKey('AgeRating', on_delete=models.SET_NULL, blank=True, null=True) - director = models.ForeignKey('Director', on_delete=models.SET_NULL, blank=True, null=True) - genre = models.ForeignKey('Genre', on_delete=models.SET_NULL, blank=True, null=True) - api = models.ForeignKey('API', blank=True, null=True, on_delete=models.SET_NULL) + class Meta: + verbose_name = 'Pel·lícula' + verbose_name_plural = 'Pel·lícules' - title = models.CharField(max_length=255) - synopsis = models.TextField(blank=True, null=True) - start_year = models.IntegerField(blank=True, null=True) - end_year = models.IntegerField(blank=True, null=True) - total_seasons = models.IntegerField(blank=True, null=True) - rating = models.FloatField(blank=True, null=True) - country_id = models.IntegerField(blank=True, null=True) - language_id = models.IntegerField(blank=True, null=True) - expires_at = models.DateTimeField(blank=True, null=True) + def __str__(self): + return self.contingut.titol - class Meta: - unique_together = ('series_id', 'api') + @property + def title(self): + return self.contingut.titol @property def year(self): - return self.start_year + return self.contingut.data_estrena + + @property + def genre(self): + return self.contingut.genere + + @property + def director(self): + return self.contingut.director + + @property + def age_rating(self): + return self.contingut.age_rating + + @property + def synopsis(self): + return self.contingut.synopsis + + @property + def rating(self): + return self.contingut.rating + + +class Series(models.Model): + contingut = models.OneToOneField(Contingut, on_delete=models.CASCADE, related_name='series') + num_temporades = models.IntegerField(blank=True, null=True, verbose_name='Nombre de temporades') + + class Meta: + verbose_name = 'Sèrie' + verbose_name_plural = 'Sèries' def __str__(self): - return self.title + return self.contingut.titol + + @property + def title(self): + return self.contingut.titol + + @property + def year(self): + return self.contingut.data_estrena + + @property + def start_year(self): + return self.contingut.data_estrena + + @property + def end_year(self): + return None + + @property + def genre(self): + return self.contingut.genere + + @property + def director(self): + return self.contingut.director + + @property + def age_rating(self): + return self.contingut.age_rating + + @property + def synopsis(self): + return self.contingut.synopsis + + @property + def rating(self): + return self.contingut.rating + + @property + def total_seasons(self): + return self.num_temporades class CustomUser(AbstractUser): avatar = models.ImageField(upload_to='avatars/', null=True, blank=True) bio = models.TextField(blank=True, null=True) location = models.CharField(max_length=255, blank=True, null=True) + type = models.CharField( + max_length=10, + choices=UserType.choices, + default=UserType.CONSUMER, + ) subscriptions = models.ManyToManyField('API', blank=True, related_name='subscribed_users') def __str__(self): return self.username + class UserProfile(models.Model): user = models.OneToOneField( settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name='profile' ) - favorite_movies = models.ManyToManyField(Movie, blank=True) - favorite_series = models.ManyToManyField(Series, blank=True) + preferits = models.ManyToManyField(Contingut, blank=True, through='Preferits') def __str__(self): return f"Perfil de {self.user.username}" +class Preferits(models.Model): + user_profile = models.ForeignKey(UserProfile, on_delete=models.CASCADE, related_name='preferits_set') + contingut = models.ForeignKey(Contingut, on_delete=models.CASCADE) + afegit_a = models.DateTimeField(auto_now_add=True) + + class Meta: + unique_together = ('user_profile', 'contingut') + verbose_name = 'Preferit' + verbose_name_plural = 'Preferits' + + def __str__(self): + return f"{self.user_profile.user.username} -> {self.contingut.titol}" + + +class Valoracio(models.Model): + puntuacio = models.IntegerField() + comentari = models.TextField(blank=True, null=True) + user = models.ForeignKey(CustomUser, on_delete=models.CASCADE, related_name='valoracions') + contingut = models.ForeignKey(Contingut, on_delete=models.CASCADE, related_name='valoracions') + creada_a = models.DateTimeField(auto_now_add=True) + + class Meta: + verbose_name = 'Valoració' + verbose_name_plural = 'Valoracions' + + def __str__(self): + return f"{self.user.username} -> {self.contingut.titol} ({self.puntuacio}/5)" + + class SyncLog(models.Model): start_time = models.DateTimeField(auto_now_add=True) end_time = models.DateTimeField(null=True, blank=True) @@ -134,4 +238,4 @@ class SyncLog(models.Model): records_updated = models.IntegerField(default=0) def __str__(self): - return f"Sync {self.start_time.strftime('%Y-%m-%d %H:%M')} - {self.status}" \ No newline at end of file + return f"Sync {self.start_time.strftime('%Y-%m-%d %H:%M')} - {self.status}" diff --git a/web_app/utils.py b/web_app/utils.py index dcd2c54..76e151a 100644 --- a/web_app/utils.py +++ b/web_app/utils.py @@ -2,9 +2,11 @@ import requests, os, django from dotenv import load_dotenv -from web_app.models import Movie, API, Director, Genre, AgeRating, Series +from web_app.models import Movie, API, Director, Genre, AgeRating, Series, Contingut load_dotenv() +SERIES_ID_OFFSET = 100000 + def store_data(): for port in ['8080', '8081', '8082']: store_api(port) @@ -30,9 +32,19 @@ def Call(endpoint, params=None): r = requests.get(url, headers=headers, params=params) if r.status_code == 200: result[port] = r.json() - print(f"Response from port {port}: {r.status_code} - {r.text[:100]}...") # Log status and a snippet of the response + print(f"Response from port {port}: {r.status_code} - {r.text[:100]}...") return result +def deduplicate_by_id(data): + seen_ids = set() + unique = [] + for item in data: + item_id = item['id'] + if item_id not in seen_ids: + seen_ids.add(item_id) + unique.append(item) + return unique + def get_directors(): directors = Call('directors') for port, data in directors.items(): @@ -71,7 +83,7 @@ def get_age_ratings(): age_rating_id=json['id'], api=API.objects.get(port=port), defaults={ - 'description': json['description'], + 'codi': json['description'], 'age': json['minimum_age'], } ) @@ -84,24 +96,33 @@ def get_movies(params=None): continue api_instance = API.objects.get(port=port) + unique_data = deduplicate_by_id(data) - for json in data: - movie, created = Movie.objects.update_or_create( - movie_id=json['id'], + for json in unique_data: + director = Director.objects.filter(director_id=json.get('director_id')).first() + genre = Genre.objects.filter(genre_id=json.get('genre_id')).first() + age_rating = AgeRating.objects.filter(age_rating_id=json.get('age_rating_id'), api=api_instance).first() + + contingut, _ = Contingut.objects.update_or_create( + api_content_id=json['id'], api=api_instance, defaults={ - 'title': json['title'], + 'titol': json['title'], + 'data_estrena': json.get('year'), 'synopsis': json.get('synopsis'), - 'year': json.get('year'), 'rating': json.get('rating'), 'expires_at': json.get('expires_at'), - 'director': Director.objects.filter(director_id=json.get('director_id')).first(), - 'genre': Genre.objects.filter(genre_id=json.get('genre_id')).first(), - 'age_rating': AgeRating.objects.filter(age_rating_id=json.get('age_rating_id'), api=api_instance).first(), + 'director': director, + 'genere': genre, + 'age_rating': age_rating, } ) + + movie, created = Movie.objects.get_or_create( + contingut=contingut, + ) - status = "created" if created else "updated" + status = "created" if created else "found" print(f"Movie '{movie.title}' {status} from port {port}.") @@ -112,29 +133,37 @@ def get_series(params=None): continue api_instance = API.objects.get(port=port) + unique_data = deduplicate_by_id(data) - for json in data: - series, created = Series.objects.update_or_create( - series_id=json['id'], + for json in unique_data: + director = Director.objects.filter(director_id=json.get('director_id')).first() + genre = Genre.objects.filter(genre_id=json.get('genre_id')).first() + age_rating = AgeRating.objects.filter(age_rating_id=json.get('age_rating_id'), api=api_instance).first() + + contingut, _ = Contingut.objects.update_or_create( + api_content_id=json['id'] + SERIES_ID_OFFSET, api=api_instance, defaults={ - 'title': json['title'], + 'titol': json['title'], + 'data_estrena': json.get('start_year'), 'synopsis': json.get('synopsis'), - 'start_year': json.get('start_year'), - 'end_year': json.get('end_year'), - 'total_seasons': json.get('total_seasons'), 'rating': json.get('rating'), 'expires_at': json.get('expires_at'), - 'director': Director.objects.filter(director_id=json.get('director_id')).first(), - 'genre': Genre.objects.filter(genre_id=json.get('genre_id')).first(), - 'age_rating': AgeRating.objects.filter(age_rating_id=json.get('age_rating_id'), api=api_instance).first(), - 'country_id': json.get('country_id'), - 'language_id': json.get('language_id'), + 'director': director, + 'genere': genre, + 'age_rating': age_rating, + } + ) + + series, created = Series.objects.get_or_create( + contingut=contingut, + defaults={ + 'num_temporades': json.get('total_seasons'), } ) - status = "created" if created else "updated" + status = "created" if created else "found" print(f"Series '{series.title}' {status} from port {port}.") if __name__ == '__main__': - store_data() \ No newline at end of file + store_data() diff --git a/web_app/views.py b/web_app/views.py index 268883a..5640e23 100644 --- a/web_app/views.py +++ b/web_app/views.py @@ -1,6 +1,6 @@ from django.shortcuts import render, redirect, get_object_or_404 from web_app.forms import CustomUserCreationForm -from web_app.models import AgeRating, Director, Genre, Movie, UserProfile, Series +from web_app.models import AgeRating, Director, Genre, Movie, UserProfile, Series, Contingut from web_app import utils from itertools import chain from django.http import JsonResponse @@ -9,8 +9,8 @@ from django.core.paginator import Paginator def home(request): - movies = Movie.objects.all() - series = Series.objects.all() + movies = Movie.objects.select_related('contingut', 'contingut__genere', 'contingut__director', 'contingut__age_rating').all() + series = Series.objects.select_related('contingut', 'contingut__genere', 'contingut__director', 'contingut__age_rating').all() search_query = request.GET.get('q', '') genre_filter = request.GET.get('genre', '') @@ -18,20 +18,20 @@ def home(request): age_rating_filter = request.GET.get('age_rating', '') if search_query: - movies = movies.filter(title__icontains=search_query) - series = series.filter(title__icontains=search_query) + movies = movies.filter(contingut__titol__icontains=search_query) + series = series.filter(contingut__titol__icontains=search_query) if genre_filter: - movies = movies.filter(genre__name=genre_filter) - series = series.filter(genre__name=genre_filter) + movies = movies.filter(contingut__genere__name=genre_filter) + series = series.filter(contingut__genere__name=genre_filter) if director_filter: - movies = movies.filter(director__name=director_filter) - series = series.filter(director__name=director_filter) + movies = movies.filter(contingut__director__name=director_filter) + series = series.filter(contingut__director__name=director_filter) if age_rating_filter: - movies = movies.filter(age_rating__description=age_rating_filter) - series = series.filter(age_rating__description=age_rating_filter) + movies = movies.filter(contingut__age_rating__codi=age_rating_filter) + series = series.filter(contingut__age_rating__codi=age_rating_filter) unique_results = [] seen_keys = set() @@ -40,7 +40,6 @@ def home(request): key = (m.title.lower(), 'movie') if key not in seen_keys: m.content_type = 'movie' - unique_results.append(m) seen_keys.add(key) @@ -48,7 +47,6 @@ def home(request): key = (s.title.lower(), 'series') if key not in seen_keys: s.content_type = 'series' - unique_results.append(s) seen_keys.add(key) @@ -58,7 +56,7 @@ def home(request): genres = Genre.objects.values_list('name', flat=True).distinct() directors = Director.objects.values_list('name', flat=True).distinct() - age_ratings = AgeRating.objects.values_list('description', flat=True).distinct() + age_ratings = AgeRating.objects.values_list('codi', flat=True).distinct() context = { 'items': page_obj, @@ -90,12 +88,12 @@ def user_setting(request): def movie_detail(request, pk): movie = get_object_or_404(Movie, id=pk) - available_apis = [m.api for m in Movie.objects.filter(title__iexact=movie.title).select_related('api') if m.api] + available_apis = [m.contingut.api for m in Movie.objects.filter(contingut__titol__iexact=movie.title).select_related('contingut__api') if m.contingut.api] is_favorite = False if request.user.is_authenticated: profile, _ = UserProfile.objects.get_or_create(user=request.user) - is_favorite = movie in profile.favorite_movies.all() + is_favorite = movie.contingut in profile.preferits.all() return render(request, 'Details/details_movie.html', { 'content': movie, @@ -106,12 +104,12 @@ def movie_detail(request, pk): def series_detail(request, pk): series = get_object_or_404(Series, id=pk) - available_apis = [s.api for s in Series.objects.filter(title__iexact=series.title).select_related('api') if s.api] + available_apis = [s.contingut.api for s in Series.objects.filter(contingut__titol__iexact=series.title).select_related('contingut__api') if s.contingut.api] is_favorite = False if request.user.is_authenticated: profile, _ = UserProfile.objects.get_or_create(user=request.user) - is_favorite = series in profile.favorite_series.all() + is_favorite = series.contingut in profile.preferits.all() return render(request, 'Details/details_serie.html', { 'content': series, @@ -122,7 +120,8 @@ def series_detail(request, pk): @login_required(login_url='/login/') def api_user_profile(request): user = request.user - followed_movie_ids = list(user.favorite_movies.values_list('movie_id', flat=True)) + profile, _ = UserProfile.objects.get_or_create(user=user) + followed_contingut_ids = list(profile.preferits.values_list('id', flat=True)) response_data = { "personal_info": { "username": user.username, @@ -131,8 +130,9 @@ def api_user_profile(request): "last_name": user.last_name }, "linked_platforms": [], - "followed_content_ids": followed_movie_ids + "followed_content_ids": followed_contingut_ids } + return JsonResponse(response_data) @login_required def toggle_movie_favorite(request, pk): @@ -140,11 +140,11 @@ def toggle_movie_favorite(request, pk): movie = get_object_or_404(Movie, id=pk) profile, _ = UserProfile.objects.get_or_create(user=request.user) - if movie in profile.favorite_movies.all(): - profile.favorite_movies.remove(movie) + if movie.contingut in profile.preferits.all(): + profile.preferits.remove(movie.contingut) status = "removed" else: - profile.favorite_movies.add(movie) + profile.preferits.add(movie.contingut) status = "added" return JsonResponse({'status': status}) return JsonResponse({'error': 'Método no permitido'}, status=405) @@ -155,11 +155,11 @@ def toggle_series_favorite(request, pk): series = get_object_or_404(Series, id=pk) profile, _ = UserProfile.objects.get_or_create(user=request.user) - if series in profile.favorite_series.all(): - profile.favorite_series.remove(series) + if series.contingut in profile.preferits.all(): + profile.preferits.remove(series.contingut) status = "removed" else: - profile.favorite_series.add(series) + profile.preferits.add(series.contingut) status = "added" return JsonResponse({'status': status}) return JsonResponse({'error': 'Método no permitido'}, status=405) @@ -169,5 +169,3 @@ def terms_use(request): def privacy_policy(request): return render(request, 'footer_legal/privacy_policy.html') - - From e995cb37e1da46b02226c34e5a0bbeb6d599ac6c Mon Sep 17 00:00:00 2001 From: Norbert Date: Tue, 5 May 2026 17:54:59 +0200 Subject: [PATCH 014/100] fix: delete unnecessary files --- .agents/skills/neon-postgres/SKILL.md | 186 -------------------------- .claude/skills/neon-postgres/SKILL.md | 186 -------------------------- skills-lock.json | 11 -- 3 files changed, 383 deletions(-) delete mode 100644 .agents/skills/neon-postgres/SKILL.md delete mode 100644 .claude/skills/neon-postgres/SKILL.md delete mode 100644 skills-lock.json diff --git a/.agents/skills/neon-postgres/SKILL.md b/.agents/skills/neon-postgres/SKILL.md deleted file mode 100644 index 73c4b0f..0000000 --- a/.agents/skills/neon-postgres/SKILL.md +++ /dev/null @@ -1,186 +0,0 @@ ---- -name: neon-postgres -description: Guides and best practices for working with Neon Serverless Postgres. Covers getting started, local development with Neon, choosing a connection method, Neon features, authentication (@neondatabase/auth), PostgREST-style data API (@neondatabase/neon-js), Neon CLI, and Neon's Platform API/SDKs. Use for any Neon-related questions. ---- - -# Neon Serverless Postgres - -Neon is a serverless Postgres platform that separates compute and storage to offer autoscaling, branching, instant restore, and scale-to-zero. It's fully compatible with Postgres and works with any language, framework, or ORM that supports Postgres. - -## Neon Documentation - -The Neon documentation is the source of truth for all Neon-related information. Always verify claims against the official docs before responding. Neon features and APIs evolve, so prefer fetching current docs over relying on training data. - -### Fetching Docs as Markdown - -Any Neon doc page can be fetched as markdown in two ways: - -1. **Append `.md` to the URL** (simplest): https://neon.com/docs/introduction/branching.md -2. **Request `text/markdown`** on the standard URL: `curl -H "Accept: text/markdown" https://neon.com/docs/introduction/branching` - -Both return the same markdown content. Use whichever method your tools support. - -### Finding the Right Page - -The docs index lists every available page with its URL and a short description: - -``` -https://neon.com/docs/llms.txt -``` - -Common doc URLs are organized in the topic links below. If you need a page not listed here, search the docs index: https://neon.com/docs/llms.txt — don't guess URLs. - -## What Is Neon - -Use this for architecture explanations and terminology (organizations, projects, branches, endpoints) before giving implementation advice. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/what-is-neon.md - -## Getting Started - -Use this for first-time setup: org/project selection, connection strings, driver installation, optional auth, and initial schema setup. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/getting-started.md - -## Connection Methods & Drivers - -Use this when you need to pick the correct transport and driver based on runtime constraints (TCP, HTTP, WebSocket, edge, serverless, long-running). - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/connection-methods.md - -### Serverless Driver - -Use this for `@neondatabase/serverless` patterns, including HTTP queries, WebSocket transactions, and runtime-specific optimizations. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-serverless.md - -### Neon JS SDK - -Use this for combined Neon Auth + Data API workflows with PostgREST-style querying and typed client setup. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-js.md - -## Developer Tools - -Use this for local development enablement with `npx neonctl@latest init`, VSCode extension setup, and Neon MCP server configuration. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/devtools.md - -### Neon CLI - -Use this for terminal-first workflows, scripts, and CI/CD automation with `neonctl`. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-cli.md - -## Neon Admin API - -The Neon Admin API can be used to manage Neon resources programmatically. It is used behind the scenes by the Neon CLI and MCP server, but can also be used directly for more complex automation workflows or when embedding Neon in other applications. - -### Neon REST API - -Use this for direct HTTP automation, endpoint-level control, API key auth, rate-limit handling, and operation polling. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-rest-api.md - -### Neon TypeScript SDK - -Use this when implementing typed programmatic control of Neon resources in TypeScript via `@neondatabase/api-client`. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-typescript-sdk.md - -### Neon Python SDK - -Use this when implementing programmatic Neon management in Python with the `neon-api` package. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-python-sdk.md - -## Neon Auth - -Use this for managed user authentication setup, UI components, auth methods, and Neon Auth integration pitfalls in Next.js and React apps. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-auth.md - -Neon Auth is also embedded in the Neon JS SDK - so depending on your use case, you may want to use the Neon JS SDK instead of Neon Auth. See https://neon.com/docs/ai/skills/neon-postgres/references/connection-methods.md for more details. - -## Branching - -Use this when the user is planning isolated environments, schema migration testing, preview deployments, or branch lifecycle automation. - -Key points: - -- Branches are instant, copy-on-write clones (no full data copy). -- Each branch has its own compute endpoint. -- Use the neonctl CLI or MCP server to create, inspect, and compare branches. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/branching.md - -## Autoscaling - -Use this when the user needs compute to scale automatically with workload and wants guidance on CU sizing and runtime behavior. - -Link: https://neon.com/docs/introduction/autoscaling.md - -## Scale to Zero - -Use this when optimizing idle costs and discussing suspend/resume behavior, including cold-start trade-offs. - -Key points: - -- Idle computes suspend automatically (default 5 minutes, configurable) (unless disabled - launch & scale plan only) -- First query after suspend typically has a cold-start penalty (around hundreds of ms) -- Storage remains active while compute is suspended. - -Link: https://neon.com/docs/introduction/scale-to-zero.md - -## Instant Restore - -Use this when the user needs point-in-time recovery or wants to restore data state without traditional backup restore workflows. - -Key points: - -- Restore windows depend on plan limits. -- Users can create branches from historical points-in-time. -- Time Travel queries can be used for historical inspection workflows. - -Link: https://neon.com/docs/introduction/branch-restore.md - -## Read Replicas - -Use this for read-heavy workloads where the user needs dedicated read-only compute without duplicating storage. - -Key points: - -- Replicas are read-only compute endpoints sharing the same storage. -- Creation is fast and scaling is independent from primary compute. -- Typical use cases: analytics, reporting, and read-heavy APIs. - -Link: https://neon.com/docs/introduction/read-replicas.md - -## Connection Pooling - -Use this when the user is in serverless or high-concurrency environments and needs safe, scalable Postgres connection management. - -Key points: - -- Neon pooling uses PgBouncer. -- Add `-pooler` to endpoint hostnames to use pooled connections. -- Pooling is especially important in serverless runtimes with bursty concurrency. - -Link: https://neon.com/docs/connect/connection-pooling.md - -## IP Allow Lists - -Use this when the user needs to restrict database access by trusted networks, IPs, or CIDR ranges. - -Link: https://neon.com/docs/introduction/ip-allow.md - -## Logical Replication - -Use this when integrating CDC pipelines, external Postgres sync, or replication-based data movement. - -Key points: - -- Neon supports native logical replication workflows. -- Useful for replicating to/from external Postgres systems. - -Link: https://neon.com/docs/guides/logical-replication-guide.md diff --git a/.claude/skills/neon-postgres/SKILL.md b/.claude/skills/neon-postgres/SKILL.md deleted file mode 100644 index 73c4b0f..0000000 --- a/.claude/skills/neon-postgres/SKILL.md +++ /dev/null @@ -1,186 +0,0 @@ ---- -name: neon-postgres -description: Guides and best practices for working with Neon Serverless Postgres. Covers getting started, local development with Neon, choosing a connection method, Neon features, authentication (@neondatabase/auth), PostgREST-style data API (@neondatabase/neon-js), Neon CLI, and Neon's Platform API/SDKs. Use for any Neon-related questions. ---- - -# Neon Serverless Postgres - -Neon is a serverless Postgres platform that separates compute and storage to offer autoscaling, branching, instant restore, and scale-to-zero. It's fully compatible with Postgres and works with any language, framework, or ORM that supports Postgres. - -## Neon Documentation - -The Neon documentation is the source of truth for all Neon-related information. Always verify claims against the official docs before responding. Neon features and APIs evolve, so prefer fetching current docs over relying on training data. - -### Fetching Docs as Markdown - -Any Neon doc page can be fetched as markdown in two ways: - -1. **Append `.md` to the URL** (simplest): https://neon.com/docs/introduction/branching.md -2. **Request `text/markdown`** on the standard URL: `curl -H "Accept: text/markdown" https://neon.com/docs/introduction/branching` - -Both return the same markdown content. Use whichever method your tools support. - -### Finding the Right Page - -The docs index lists every available page with its URL and a short description: - -``` -https://neon.com/docs/llms.txt -``` - -Common doc URLs are organized in the topic links below. If you need a page not listed here, search the docs index: https://neon.com/docs/llms.txt — don't guess URLs. - -## What Is Neon - -Use this for architecture explanations and terminology (organizations, projects, branches, endpoints) before giving implementation advice. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/what-is-neon.md - -## Getting Started - -Use this for first-time setup: org/project selection, connection strings, driver installation, optional auth, and initial schema setup. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/getting-started.md - -## Connection Methods & Drivers - -Use this when you need to pick the correct transport and driver based on runtime constraints (TCP, HTTP, WebSocket, edge, serverless, long-running). - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/connection-methods.md - -### Serverless Driver - -Use this for `@neondatabase/serverless` patterns, including HTTP queries, WebSocket transactions, and runtime-specific optimizations. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-serverless.md - -### Neon JS SDK - -Use this for combined Neon Auth + Data API workflows with PostgREST-style querying and typed client setup. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-js.md - -## Developer Tools - -Use this for local development enablement with `npx neonctl@latest init`, VSCode extension setup, and Neon MCP server configuration. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/devtools.md - -### Neon CLI - -Use this for terminal-first workflows, scripts, and CI/CD automation with `neonctl`. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-cli.md - -## Neon Admin API - -The Neon Admin API can be used to manage Neon resources programmatically. It is used behind the scenes by the Neon CLI and MCP server, but can also be used directly for more complex automation workflows or when embedding Neon in other applications. - -### Neon REST API - -Use this for direct HTTP automation, endpoint-level control, API key auth, rate-limit handling, and operation polling. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-rest-api.md - -### Neon TypeScript SDK - -Use this when implementing typed programmatic control of Neon resources in TypeScript via `@neondatabase/api-client`. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-typescript-sdk.md - -### Neon Python SDK - -Use this when implementing programmatic Neon management in Python with the `neon-api` package. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-python-sdk.md - -## Neon Auth - -Use this for managed user authentication setup, UI components, auth methods, and Neon Auth integration pitfalls in Next.js and React apps. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/neon-auth.md - -Neon Auth is also embedded in the Neon JS SDK - so depending on your use case, you may want to use the Neon JS SDK instead of Neon Auth. See https://neon.com/docs/ai/skills/neon-postgres/references/connection-methods.md for more details. - -## Branching - -Use this when the user is planning isolated environments, schema migration testing, preview deployments, or branch lifecycle automation. - -Key points: - -- Branches are instant, copy-on-write clones (no full data copy). -- Each branch has its own compute endpoint. -- Use the neonctl CLI or MCP server to create, inspect, and compare branches. - -Link: https://neon.com/docs/ai/skills/neon-postgres/references/branching.md - -## Autoscaling - -Use this when the user needs compute to scale automatically with workload and wants guidance on CU sizing and runtime behavior. - -Link: https://neon.com/docs/introduction/autoscaling.md - -## Scale to Zero - -Use this when optimizing idle costs and discussing suspend/resume behavior, including cold-start trade-offs. - -Key points: - -- Idle computes suspend automatically (default 5 minutes, configurable) (unless disabled - launch & scale plan only) -- First query after suspend typically has a cold-start penalty (around hundreds of ms) -- Storage remains active while compute is suspended. - -Link: https://neon.com/docs/introduction/scale-to-zero.md - -## Instant Restore - -Use this when the user needs point-in-time recovery or wants to restore data state without traditional backup restore workflows. - -Key points: - -- Restore windows depend on plan limits. -- Users can create branches from historical points-in-time. -- Time Travel queries can be used for historical inspection workflows. - -Link: https://neon.com/docs/introduction/branch-restore.md - -## Read Replicas - -Use this for read-heavy workloads where the user needs dedicated read-only compute without duplicating storage. - -Key points: - -- Replicas are read-only compute endpoints sharing the same storage. -- Creation is fast and scaling is independent from primary compute. -- Typical use cases: analytics, reporting, and read-heavy APIs. - -Link: https://neon.com/docs/introduction/read-replicas.md - -## Connection Pooling - -Use this when the user is in serverless or high-concurrency environments and needs safe, scalable Postgres connection management. - -Key points: - -- Neon pooling uses PgBouncer. -- Add `-pooler` to endpoint hostnames to use pooled connections. -- Pooling is especially important in serverless runtimes with bursty concurrency. - -Link: https://neon.com/docs/connect/connection-pooling.md - -## IP Allow Lists - -Use this when the user needs to restrict database access by trusted networks, IPs, or CIDR ranges. - -Link: https://neon.com/docs/introduction/ip-allow.md - -## Logical Replication - -Use this when integrating CDC pipelines, external Postgres sync, or replication-based data movement. - -Key points: - -- Neon supports native logical replication workflows. -- Useful for replicating to/from external Postgres systems. - -Link: https://neon.com/docs/guides/logical-replication-guide.md diff --git a/skills-lock.json b/skills-lock.json deleted file mode 100644 index 988693b..0000000 --- a/skills-lock.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "version": 1, - "skills": { - "neon-postgres": { - "source": "neondatabase/agent-skills", - "sourceType": "github", - "skillPath": "skills/neon-postgres/SKILL.md", - "computedHash": "391693eee67001639ab65474df185da3ea5cf9ee4b99badecfd64561113edbb4" - } - } -} From 14d53a58bc1fad4df06f550d64fdaba34e969029 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Tue, 5 May 2026 20:46:23 +0200 Subject: [PATCH 015/100] fix: changed branch push activation on quality-pipeline --- .github/workflows/quality-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/quality-pipeline.yml b/.github/workflows/quality-pipeline.yml index 598bcbd..c07c5e6 100644 --- a/.github/workflows/quality-pipeline.yml +++ b/.github/workflows/quality-pipeline.yml @@ -28,7 +28,7 @@ on: pull_request: types: [opened, synchronize, reopened] push: - branches: [main, develop, "features/**"] + branches: [main, dev] schedule: - cron: '0 3 * * 1' # Weekly integrity sweep — Monday 03:00 UTC workflow_dispatch: From 7061e0d436629d00f085954f1444594ada96f427 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Tue, 5 May 2026 21:03:46 +0200 Subject: [PATCH 016/100] added comments for fog metric (Need add more) --- histogram.py | 12 ++++++++++++ web_app/forms.py | 12 ++++++++++++ web_app/models.py | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/histogram.py b/histogram.py index d717e0c..4a8b528 100644 --- a/histogram.py +++ b/histogram.py @@ -18,6 +18,10 @@ # ── Fetch con paginación ─────────────────────────────────────────────────────── def fetch_all_issues(owner: str, repo: str) -> list[dict]: + """ + Fetches all issues from the specified GitHub repository using pagination + to ensure no data is left behind during the request process. + """ issues, page = [], 1 while True: resp = requests.get( @@ -35,6 +39,10 @@ def fetch_all_issues(owner: str, repo: str) -> list[dict]: # ── Parseo de fechas ─────────────────────────────────────────────────────────── def parse_dates(issues: list[dict]) -> list[tuple[datetime, datetime | None]]: + """ + Parses the creation and closure timestamps from the GitHub API payload + into standard Python datetime objects for further analysis. + """ result = [] for issue in issues: created = datetime.strptime(issue["created_at"], "%Y-%m-%dT%H:%M:%SZ") @@ -76,6 +84,10 @@ def count_open_per_week( # ── Main ─────────────────────────────────────────────────────────────────────── def main(): + """ + Generates a bar chart using matplotlib to visually represent the total + number of open issues distributed across the calculated weeks. + """ print("Obteniendo issues de GitHub…") issues = fetch_all_issues(OWNER, REPO_NAME) issue_dates = parse_dates(issues) diff --git a/web_app/forms.py b/web_app/forms.py index bc920a3..5a215c4 100644 --- a/web_app/forms.py +++ b/web_app/forms.py @@ -7,6 +7,10 @@ from .models import * class CustomUserCreationForm(forms.ModelForm): + """ + Handles the registration process for new users by capturing their credentials, + validating password confirmation, and ensuring they accept the mandatory terms of service. + """ username = forms.CharField( label='Nombre de usuario', max_length=150, @@ -46,6 +50,10 @@ class Meta: fields = ('username', 'email', 'password', 'password2', 'platforms') def clean_password2(self): + """ + Verifies that the initial password and the confirmation password match exactly + before allowing the user to proceed with the registration. + """ password = self.cleaned_data.get('password') password2 = self.cleaned_data.get('password2') if password is not None and password != password2: @@ -66,6 +74,10 @@ class Meta: help_texts = {field: '' for field in fields} def clean_avatar(self): + """ + Performs custom validation on the uploaded avatar file to strictly enforce + that users only submit images in standard JPG or PNG formats. + """ avatar = self.cleaned_data.get('avatar') if avatar: diff --git a/web_app/models.py b/web_app/models.py index a34b5d4..e0cf8ec 100644 --- a/web_app/models.py +++ b/web_app/models.py @@ -51,6 +51,10 @@ def __str__(self): class Movie(models.Model): + """ + Represents a movie entity containing essential metadata such as the official title, + release year, descriptive synopsis, and expiration date. + """ movie_id = models.IntegerField() age_rating = models.ForeignKey(AgeRating, on_delete=models.SET_NULL, blank=True, null=True) director = models.ForeignKey(Director, on_delete=models.SET_NULL, blank=True, null=True) @@ -104,6 +108,10 @@ def __str__(self): class CustomUser(AbstractUser): + """ + Extends the default Django user model to include additional profile attributes + like a custom avatar, user biography, and physical location. + """ avatar = models.ImageField(upload_to='avatars/', null=True, blank=True) bio = models.TextField(blank=True, null=True) location = models.CharField(max_length=255, blank=True, null=True) @@ -126,6 +134,10 @@ def __str__(self): class SyncLog(models.Model): + """ + Records the operational status and statistical summary of background synchronization + processes, tracking the total number of created and updated database records. + """ start_time = models.DateTimeField(auto_now_add=True) end_time = models.DateTimeField(null=True, blank=True) status = models.CharField(max_length=50) From e41aaffc48a0be0409bbdde799cdf00692fee931 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Tue, 5 May 2026 21:16:47 +0200 Subject: [PATCH 017/100] fix: changed fog index search path --- .github/scripts/fog_comments_indexGP.py | 10 ++++------ .github/workflows/quality-pipeline.yml | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/scripts/fog_comments_indexGP.py b/.github/scripts/fog_comments_indexGP.py index fcd9358..c1eca37 100644 --- a/.github/scripts/fog_comments_indexGP.py +++ b/.github/scripts/fog_comments_indexGP.py @@ -1,12 +1,10 @@ -import re -import os -import sys -import json -import textstat +import re, os, sys, json, textstat from pathlib import Path SUPPORTED_EXTENSIONS = {'.py', '.js', '.ts', '.cpp', '.java', '.html'} +EXCLUDE_DIRS = {'.git', 'node_modules', 'venv', 'env', '__pycache__', 'dist'} + def extract_comments(file_path): extension = os.path.splitext(file_path)[1] @@ -75,7 +73,7 @@ def scan(target_path): files = ( [path] if path.is_file() - else [f for f in path.rglob('*') if f.suffix in SUPPORTED_EXTENSIONS] + else [f for f in path.rglob('*') if f.suffix in SUPPORTED_EXTENSIONS and not any(part in EXCLUDE_DIRS for part in f.parts)] ) results = [] diff --git a/.github/workflows/quality-pipeline.yml b/.github/workflows/quality-pipeline.yml index c07c5e6..a322208 100644 --- a/.github/workflows/quality-pipeline.yml +++ b/.github/workflows/quality-pipeline.yml @@ -328,7 +328,7 @@ jobs: - name: Run fog index analysis run: | mkdir -p quality-job4 - python .github/scripts/fog_comments_indexGP.py src/ \ + python .github/scripts/fog_comments_indexGP.py . \ > quality-job4/fog-results.json cat quality-job4/fog-results.json From 6601c97b0793fc631cee80f16497f2b393b9e786 Mon Sep 17 00:00:00 2001 From: Karu174 Date: Tue, 5 May 2026 22:29:08 +0200 Subject: [PATCH 018/100] fix(profile-api): resolve AttributeError in profile API and include favorite series --- web_app/views.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/web_app/views.py b/web_app/views.py index dcc0b63..36bcd70 100644 --- a/web_app/views.py +++ b/web_app/views.py @@ -136,10 +136,18 @@ def series_detail(request, pk): 'available_apis': available_apis }) + @login_required(login_url='/login/') def api_user_profile(request): user = request.user - followed_movie_ids = list(user.favorite_movies.values_list('movie_id', flat=True)) + + followed_movie_ids = [] + followed_series_ids = [] + + if hasattr(user, 'profile'): + followed_movie_ids = list(user.profile.favorite_movies.values_list('movie_id', flat=True)) + followed_series_ids = list(user.profile.favorite_series.values_list('series_id', flat=True)) + response_data = { "personal_info": { "username": user.username, @@ -148,9 +156,12 @@ def api_user_profile(request): "last_name": user.last_name }, "linked_platforms": [], - "followed_content_ids": followed_movie_ids + "followed_movies": followed_movie_ids, + "followed_series": followed_series_ids } + return JsonResponse(response_data) + @login_required def toggle_movie_favorite(request, pk): if request.method == 'POST': From 7a6848ff665c8a2d9101e7087f68075c0d7a4ff3 Mon Sep 17 00:00:00 2001 From: Bogdan Nicolae Stefanescu <159245364+Bogdan2005-19@users.noreply.github.com> Date: Wed, 6 May 2026 08:58:29 +0200 Subject: [PATCH 019/100] Update push branch configuration in workflow Restrict push events to the main branch only. --- .github/workflows/quality-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/quality-pipeline.yml b/.github/workflows/quality-pipeline.yml index a322208..5aaadf7 100644 --- a/.github/workflows/quality-pipeline.yml +++ b/.github/workflows/quality-pipeline.yml @@ -28,7 +28,7 @@ on: pull_request: types: [opened, synchronize, reopened] push: - branches: [main, dev] + branches: [main] schedule: - cron: '0 3 * * 1' # Weekly integrity sweep — Monday 03:00 UTC workflow_dispatch: From 9964fd29aeb6080fea3b44b6cf9ba2e6150da1d2 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 6 May 2026 09:40:08 +0200 Subject: [PATCH 020/100] refactor(action): small changes on json naming --- .github/scripts/depth_conditional_nesting_GP.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/scripts/depth_conditional_nesting_GP.py b/.github/scripts/depth_conditional_nesting_GP.py index d76f147..202727e 100644 --- a/.github/scripts/depth_conditional_nesting_GP.py +++ b/.github/scripts/depth_conditional_nesting_GP.py @@ -85,10 +85,10 @@ def visit_If(self, node: ast.If) -> None: def get_status_code(max_depth: int) -> str: if max_depth > CRITICAL_THRESHOLD: - return "❌ CRITICAL" + return "CRITICAL" if max_depth >= WARNING_THRESHOLD: - return "🚨 WARNING" - return "✅ OK" + return "WARNING" + return "OK" def get_metrics(filepath: Path) -> Optional[Dict[str, Any]]: @@ -144,7 +144,7 @@ def main() -> None: all_results.append({ "file": str(filepath), "avg_depth": metrics["avg"], - "max_depth": metrics["max"], + "max_nesting_depth": metrics["max"], "status_code": metrics["status_code"] }) if metrics["max"] > CRITICAL_THRESHOLD: From 7c101ffe0773b8ca77fb24d40b2076b83722dd1d Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 6 May 2026 09:46:39 +0200 Subject: [PATCH 021/100] modified fog metric json to match html names --- .github/scripts/fog_comments_indexGP.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/fog_comments_indexGP.py b/.github/scripts/fog_comments_indexGP.py index c1eca37..0c4cf57 100644 --- a/.github/scripts/fog_comments_indexGP.py +++ b/.github/scripts/fog_comments_indexGP.py @@ -90,7 +90,7 @@ def scan(target_path): results.append({ "file": str(file), "avg_fog": round(avg, 1) if avg else None, - "max_fog": round(max_score, 1) if max_score else None, + "fog_score": round(max_score, 1) if max_score else None, "status_code": status }) From f3c0a9765b069cbe6a6f02695333f4a35d35b75e Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 6 May 2026 09:54:10 +0200 Subject: [PATCH 022/100] refactor: added NO DATA to pass on html report --- .github/scripts/render-integrity-html.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/render-integrity-html.js b/.github/scripts/render-integrity-html.js index 254b8f9..6e2230c 100644 --- a/.github/scripts/render-integrity-html.js +++ b/.github/scripts/render-integrity-html.js @@ -164,7 +164,7 @@ function buildQualitySection(key, data) { const results = data.results || [] const totalFiles = (data.summary && data.summary.total_files != null) ? data.summary.total_files : results.length - const violations = results.filter((r) => r.status_code !== 'OK' && r.status_code !== 'OK!') + const violations = results.filter((r) => r.status_code !== 'OK' && r.status_code !== 'OK!' && r.status_code !== 'NO DATA') const passed = totalFiles - violations.length const findingsHtml = violations.length === 0 From aca7533d759c0aa82c2b443a886aa76cb96abd3f Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 6 May 2026 10:08:08 +0200 Subject: [PATCH 023/100] refactored metrig html report --- .github/scripts/render-integrity-html.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/render-integrity-html.js b/.github/scripts/render-integrity-html.js index 6e2230c..76b5b10 100644 --- a/.github/scripts/render-integrity-html.js +++ b/.github/scripts/render-integrity-html.js @@ -225,7 +225,7 @@ const qualitySummaryRows = quality const qm = QUALITY_META[key] const data = quality[key] const status = qualityJobStatus(data) - const violations = data ? (data.results || []).filter((r) => r.status_code !== 'OK' && r.status_code !== 'OK!').length : 0 + const violations = data ? (data.results || []).filter((r) => r.status_code !== 'OK' && r.status_code !== 'OK!' && r.status_code !== 'NO DATA').length : 0 return ` ${qm.icon} ${esc(qm.name)} From dce80ce36f63f0353dd0969e8bbf790bc3e8e803 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 6 May 2026 10:17:24 +0200 Subject: [PATCH 024/100] Improved html for metrics --- .github/scripts/render-integrity-html.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/render-integrity-html.js b/.github/scripts/render-integrity-html.js index 76b5b10..e2e70f8 100644 --- a/.github/scripts/render-integrity-html.js +++ b/.github/scripts/render-integrity-html.js @@ -172,7 +172,7 @@ function buildQualitySection(key, data) { : violations.map((r) => { const val = r[qm.metric] const display = typeof val === 'number' ? val.toFixed(qm.decimals) : (val ?? '?') - const lvl = (r.status_code === 'DANGER' || r.status_code === '⚠️ IMPROVE NAMING') ? 'error' : 'warning' + const lvl = (r.status_code === 'DANGER' || r.status_code === '⚠️ IMPROVE NAMING' || r.status_code === 'COMPLEX') ? 'error' : 'warning' return `
${chip(lvl)}
From b7c0a83c3920b9c977a2d8c21889aa45b584bd44 Mon Sep 17 00:00:00 2001 From: Norbert Date: Wed, 6 May 2026 15:26:36 +0200 Subject: [PATCH 025/100] feat (Data Base): added database tables, and relations as the uml --- web_app/apps.py | 8 ++++++-- web_app/scheduler.py | 4 +--- web_app/utils.py | 23 +++++++++++++++++------ web_app/views.py | 20 +++----------------- 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/web_app/apps.py b/web_app/apps.py index 0680b50..8b5566d 100644 --- a/web_app/apps.py +++ b/web_app/apps.py @@ -6,5 +6,9 @@ class WebAppConfig(AppConfig): def ready(self): from . import signals - from . import scheduler - scheduler.start() \ No newline at end of file + # Delay scheduler start to avoid database access during app initialization + import threading + def start_scheduler(): + from . import scheduler + scheduler.start() + threading.Thread(target=start_scheduler).start() \ No newline at end of file diff --git a/web_app/scheduler.py b/web_app/scheduler.py index 8190069..be0ca65 100644 --- a/web_app/scheduler.py +++ b/web_app/scheduler.py @@ -8,8 +8,6 @@ def start(): if "runserver" not in sys.argv: return - download_catalog_data() - scheduler = BackgroundScheduler(timezone="Europe/Madrid") scheduler.add_jobstore(DjangoJobStore(), "default") @@ -24,4 +22,4 @@ def start(): ) scheduler.start() - print("Cron Job configured at 03:00 AM.") \ No newline at end of file + #print("Cron Job configured at 03:00 AM.") \ No newline at end of file diff --git a/web_app/utils.py b/web_app/utils.py index 76e151a..8346639 100644 --- a/web_app/utils.py +++ b/web_app/utils.py @@ -1,10 +1,11 @@ import sys +import requests, os -import requests, os, django from dotenv import load_dotenv -from web_app.models import Movie, API, Director, Genre, AgeRating, Series, Contingut load_dotenv() +from web_app.models import Movie, API, Director, Genre, AgeRating, Series, Contingut + SERIES_ID_OFFSET = 100000 def store_data(): @@ -29,10 +30,20 @@ def Call(endpoint, params=None): for port, api_key in APIs: url = f'http://localhost:{port}/{endpoint}' headers = {'X-API-KEY': api_key} - r = requests.get(url, headers=headers, params=params) - if r.status_code == 200: - result[port] = r.json() - print(f"Response from port {port}: {r.status_code} - {r.text[:100]}...") + try: + r = requests.get(url, headers=headers, params=params, timeout=5) + if r.status_code == 200: + result[port] = r.json() + print(f"Response from port {port}: {r.status_code} - {r.text[:100]}...") + except requests.exceptions.ConnectionError: + print(f"Failed to connect to {url}: Connection refused") + result[port] = None + except requests.exceptions.Timeout: + print(f"Request to {url} timed out") + result[port] = None + except Exception as e: + print(f"Error calling {url}: {e}") + result[port] = None return result def deduplicate_by_id(data): diff --git a/web_app/views.py b/web_app/views.py index b596e28..147d078 100644 --- a/web_app/views.py +++ b/web_app/views.py @@ -1,10 +1,6 @@ from django.shortcuts import render, redirect, get_object_or_404 from web_app.forms import CustomUserCreationForm -<<<<<<< HEAD -from web_app.models import AgeRating, Director, Genre, Movie, UserProfile, Series, Contingut -======= -from web_app.models import AgeRating, API, Director, Genre, Movie, UserProfile, Series ->>>>>>> dev +from web_app.models import AgeRating, API, Director, Genre, Movie, UserProfile, Series, Contingut from web_app import utils from itertools import chain from django.http import JsonResponse @@ -49,15 +45,12 @@ def home(request): key = (m.title.lower(), 'movie') if key not in seen_keys: m.content_type = 'movie' -<<<<<<< HEAD -======= # Collect all platforms (API objects) this title is available on m.available_platforms = list( API.objects.filter( - movie__title__iexact=m.title + contingut__titol__iexact=m.title ).distinct() ) ->>>>>>> dev unique_results.append(m) seen_keys.add(key) @@ -65,15 +58,12 @@ def home(request): key = (s.title.lower(), 'series') if key not in seen_keys: s.content_type = 'series' -<<<<<<< HEAD -======= # Collect all platforms (API objects) this title is available on s.available_platforms = list( API.objects.filter( - series__title__iexact=s.title + contingut__titol__iexact=s.title ).distinct() ) ->>>>>>> dev unique_results.append(s) seen_keys.add(key) @@ -83,12 +73,8 @@ def home(request): genres = Genre.objects.values_list('name', flat=True).distinct() directors = Director.objects.values_list('name', flat=True).distinct() -<<<<<<< HEAD age_ratings = AgeRating.objects.values_list('codi', flat=True).distinct() -======= - age_ratings = AgeRating.objects.values_list('description', flat=True).distinct() platforms = API.objects.all() ->>>>>>> dev context = { 'items': page_obj, From 8e8fcdc4bb9b9ad6e7969e84c4d9eb33516a44a2 Mon Sep 17 00:00:00 2001 From: Norbert Date: Wed, 6 May 2026 15:47:27 +0200 Subject: [PATCH 026/100] feat (Data Base): added database tables, and relations as the uml --- web_app/views.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/web_app/views.py b/web_app/views.py index 147d078..cd2f513 100644 --- a/web_app/views.py +++ b/web_app/views.py @@ -9,8 +9,8 @@ from django.core.paginator import Paginator def home(request): - movies = Movie.objects.select_related('contingut', 'contingut__genere', 'contingut__director', 'contingut__age_rating').all() - series = Series.objects.select_related('contingut', 'contingut__genere', 'contingut__director', 'contingut__age_rating').all() + movies = Movie.objects.select_related('contingut', 'contingut__genere', 'contingut__director', 'contingut__age_rating').prefetch_related('contingut__api').all() + series = Series.objects.select_related('contingut', 'contingut__genere', 'contingut__director', 'contingut__age_rating').prefetch_related('contingut__api').all() search_query = request.GET.get('q', '') genre_filter = request.GET.get('genre', '') @@ -41,6 +41,16 @@ def home(request): unique_results = [] seen_keys = set() + for cont in chain(movies, series): + is_movie = isinstance(cont, Movie) + type_str = 'movie' if is_movie else 'series' + key = (cont.title.lower(), type_str) + if key not in seen_keys: + cont.content_type = type_str + cont.available_platforms = [cont.contingut.api] if cont.contingut.api else [] + unique_results.append(cont) + seen_keys.add(key) + ''' for m in movies: key = (m.title.lower(), 'movie') if key not in seen_keys: @@ -66,7 +76,7 @@ def home(request): ) unique_results.append(s) seen_keys.add(key) - +''' paginator = Paginator(unique_results, 20) page_number = request.GET.get('page') page_obj = paginator.get_page(page_number) From 56163f27e8ae3c75de67da95f5af40f977647b3b Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 6 May 2026 18:11:22 +0200 Subject: [PATCH 027/100] fix: Localy fixed db work --- .env.example | 1 + docker-compose.yml | 26 ++++++++++++++++++- web_app/apps.py | 21 ++++++++++----- web_app/migrations/0001_initial.py | 3 ++- .../0002_contingut_api_content_id.py | 18 ------------- web_app/scheduler.py | 10 +++---- web_app/views.py | 4 +-- 7 files changed, 49 insertions(+), 34 deletions(-) delete mode 100644 web_app/migrations/0002_contingut_api_content_id.py diff --git a/.env.example b/.env.example index 4d717ca..9fb78ce 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,4 @@ API_KEY_8080=secret8080 API_KEY_8081=secret8081 API_KEY_8082=secret8082 +DATABASE_URL=postgres://mi_usuario:mi_password_seguro@db:5432/joinproject_db \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 283165c..93e186c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,31 @@ services: + db: + image: postgres:15 + restart: always + environment: + POSTGRES_DB: joinproject_db + POSTGRES_USER: mi_usuario + POSTGRES_PASSWORD: mi_password_seguro + ports: + - "6432:5432" + volumes: + - postgres_data:/var/lib/postgresql/data + # 1. Agrega esto para que Postgres reporte cuándo está listo + healthcheck: + test: ["CMD-SHELL", "pg_isready -U mi_usuario -d joinproject_db"] + interval: 5s + timeout: 5s + retries: 5 + join_p: build: . ports: - "8000:8000" volumes: - - .:/app \ No newline at end of file + - .:/app + depends_on: + db: + condition: service_healthy + +volumes: + postgres_data: \ No newline at end of file diff --git a/web_app/apps.py b/web_app/apps.py index 8b5566d..9da6478 100644 --- a/web_app/apps.py +++ b/web_app/apps.py @@ -1,14 +1,21 @@ from django.apps import AppConfig +import sys class WebAppConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'web_app' - + def ready(self): - from . import signals - # Delay scheduler start to avoid database access during app initialization - import threading - def start_scheduler(): + import os + import sys + + # 1. Ignorar comandos de gestión + comandos_ignorados = ['collectstatic', 'makemigrations', 'migrate', 'check'] + if any(comando in sys.argv for comando in comandos_ignorados): + return + + # 2. EVITAR EL DOBLE ARRANQUE: + # Solo arranca el scheduler si NO es el auto-reloader (proceso secundario) + if os.environ.get('RUN_MAIN') != 'true': from . import scheduler - scheduler.start() - threading.Thread(target=start_scheduler).start() \ No newline at end of file + scheduler.start() \ No newline at end of file diff --git a/web_app/migrations/0001_initial.py b/web_app/migrations/0001_initial.py index c5773bb..418e2c2 100644 --- a/web_app/migrations/0001_initial.py +++ b/web_app/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 6.0.3 on 2026-05-05 12:40 +# Generated by Django 6.0.3 on 2026-05-06 15:34 import django.contrib.auth.models import django.contrib.auth.validators @@ -112,6 +112,7 @@ class Migration(migrations.Migration): name='Contingut', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('api_content_id', models.IntegerField(blank=True, db_index=True, null=True, verbose_name="ID de l'API")), ('titol', models.CharField(max_length=255, verbose_name='Títol')), ('data_estrena', models.IntegerField(blank=True, null=True, verbose_name="Any d'estrena")), ('expires_at', models.DateTimeField(blank=True, null=True)), diff --git a/web_app/migrations/0002_contingut_api_content_id.py b/web_app/migrations/0002_contingut_api_content_id.py deleted file mode 100644 index b397668..0000000 --- a/web_app/migrations/0002_contingut_api_content_id.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 6.0.3 on 2026-05-05 12:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('web_app', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='contingut', - name='api_content_id', - field=models.IntegerField(blank=True, db_index=True, null=True, verbose_name="ID de l'API"), - ), - ] diff --git a/web_app/scheduler.py b/web_app/scheduler.py index be0ca65..9b82ca8 100644 --- a/web_app/scheduler.py +++ b/web_app/scheduler.py @@ -1,3 +1,5 @@ +from time import timezone + from apscheduler.schedulers.background import BackgroundScheduler from django_apscheduler.jobstores import DjangoJobStore from .services import download_catalog_data @@ -5,9 +7,6 @@ def start(): - if "runserver" not in sys.argv: - return - scheduler = BackgroundScheduler(timezone="Europe/Madrid") scheduler.add_jobstore(DjangoJobStore(), "default") @@ -21,5 +20,6 @@ def start(): replace_existing=True, ) - scheduler.start() - #print("Cron Job configured at 03:00 AM.") \ No newline at end of file + download_catalog_data() + + scheduler.start() \ No newline at end of file diff --git a/web_app/views.py b/web_app/views.py index f48d6cd..373e140 100644 --- a/web_app/views.py +++ b/web_app/views.py @@ -35,8 +35,8 @@ def home(request): series = series.filter(contingut__age_rating__codi=age_rating_filter) if platform_filter: - movies = movies.filter(api__port=platform_filter) - series = series.filter(api__port=platform_filter) + movies = movies.filter(contingut__api__port=platform_filter) + series = series.filter(contingut__api__port=platform_filter) unique_results = [] seen_keys = set() From eca1d46e8fbf56fb9f7087cff609a75c2dc70608 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 6 May 2026 18:19:27 +0200 Subject: [PATCH 028/100] refactor --- web_app/apps.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/web_app/apps.py b/web_app/apps.py index 9da6478..8dad7c0 100644 --- a/web_app/apps.py +++ b/web_app/apps.py @@ -1,5 +1,4 @@ from django.apps import AppConfig -import sys class WebAppConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' @@ -9,13 +8,14 @@ def ready(self): import os import sys - # 1. Ignorar comandos de gestión - comandos_ignorados = ['collectstatic', 'makemigrations', 'migrate', 'check'] - if any(comando in sys.argv for comando in comandos_ignorados): + if any(cmd in sys.argv for cmd in ['collectstatic', 'migrate', 'makemigrations', 'check']): return - # 2. EVITAR EL DOBLE ARRANQUE: - # Solo arranca el scheduler si NO es el auto-reloader (proceso secundario) - if os.environ.get('RUN_MAIN') != 'true': + if 'runserver' in sys.argv and os.environ.get('RUN_MAIN') != 'true': + return + + try: from . import scheduler - scheduler.start() \ No newline at end of file + scheduler.start() + except Exception as e: + print(f"Scheduler no pudo arrancar (ignorar si es build): {e}") \ No newline at end of file From f013c0a6716f222ad2a7ddbd7dc919de39047ebb Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 6 May 2026 18:22:15 +0200 Subject: [PATCH 029/100] refactor: added sqlite if no DATABASE_URL is given --- web/settings.py | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/web/settings.py b/web/settings.py index 6e318a5..4da2c6f 100644 --- a/web/settings.py +++ b/web/settings.py @@ -88,25 +88,30 @@ # Database # https://docs.djangoproject.com/en/4.2/ref/settings/#databases -''' -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', + +DATABASE_URL = os.getenv("DATABASE_URL") + +if DATABASE_URL: + tmpPostgres = urlparse(DATABASE_URL) + DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql', + 'NAME': tmpPostgres.path.replace('/', ''), + 'USER': tmpPostgres.username, + 'PASSWORD': tmpPostgres.password, + 'HOST': tmpPostgres.hostname, + 'PORT': tmpPostgres.port or 5432, + 'OPTIONS': dict(parse_qsl(tmpPostgres.query)), + } } -}''' -tmpPostgres = urlparse(os.getenv("DATABASE_URL")) -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'NAME': tmpPostgres.path.replace('/', ''), - 'USER': tmpPostgres.username, - 'PASSWORD': tmpPostgres.password, - 'HOST': tmpPostgres.hostname, - 'PORT': tmpPostgres.port or 5432, - 'OPTIONS': dict(parse_qsl(tmpPostgres.query)), +else: + # Configuración dummy para que collectstatic no pete si no hay DB + DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': BASE_DIR / 'db.sqlite3', + } } -} # Password validation From 569e5fda665c1478fc3cb5cc8338b415cb4ddfbd Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 6 May 2026 18:26:49 +0200 Subject: [PATCH 030/100] refactor: added some confirm prints --- web/settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/settings.py b/web/settings.py index 4da2c6f..6217d14 100644 --- a/web/settings.py +++ b/web/settings.py @@ -92,6 +92,7 @@ DATABASE_URL = os.getenv("DATABASE_URL") if DATABASE_URL: + print("DATABASE_URL encontrado, configurando PostgreSQL") tmpPostgres = urlparse(DATABASE_URL) DATABASES = { 'default': { @@ -105,7 +106,7 @@ } } else: - # Configuración dummy para que collectstatic no pete si no hay DB + print("DATABASE_URL no encontrado, usando SQLite por defecto") DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', From d295a0e325f4041f0d0997ea9ec2363fdaefbb7c Mon Sep 17 00:00:00 2001 From: Norbert Date: Thu, 7 May 2026 12:25:47 +0200 Subject: [PATCH 031/100] feat (test_impl): added first test implementation for a form creation user --- tests/__init__.py | 0 tests/test_forms.py | 36 ++++++++++++++++++++++++++++++++++++ tests/test_models.py | 0 tests/test_views.py | 0 4 files changed, 36 insertions(+) create mode 100644 tests/__init__.py create mode 100644 tests/test_forms.py create mode 100644 tests/test_models.py create mode 100644 tests/test_views.py diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_forms.py b/tests/test_forms.py new file mode 100644 index 0000000..52cc0d8 --- /dev/null +++ b/tests/test_forms.py @@ -0,0 +1,36 @@ +from django.test import TestCase +from django.urls import reverse +from django.contrib.auth.forms import UserCreationForm, UserChangeForm +from web_app.models import * +from web_app.forms import * + +class CustomUserCreationFormTest(TestCase): + def test_password_does_not_match(self): + form = CustomUserCreationForm({ + 'username': 'testuser', + 'email': 'test@mail.com', + 'password': 'password123', + 'password2': 'password456', + }) + self.assertFalse(form.is_valid()) + self.assertEqual(form.errors['password2'], ["Las contraseñas no coinciden"]) + + def test_password_matches(self): + form = CustomUserCreationForm({ + 'username': 'testuser', + 'email': 'test@mail.com', + 'password': 'password123', + 'password2': 'password123', + }) + self.assertTrue(form.is_valid()) + + def test_terms_not_accepted(self): + form = CustomUserCreationForm({ + 'username': 'testuser', + 'email': 'test@mail.com', + 'password': 'password123', + 'password2': 'password123', + 'terms_accepted': False, + }) + self.assertFalse(form.is_valid()) + self.assertEqual(form.errors['terms_accepted'], ["Debe aceptar los términos y condiciones para continuar."]) diff --git a/tests/test_models.py b/tests/test_models.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_views.py b/tests/test_views.py new file mode 100644 index 0000000..e69de29 From b9aab735572993c69c613913ac7bb9c6bf712ffb Mon Sep 17 00:00:00 2001 From: Norbert Date: Thu, 7 May 2026 19:55:58 +0200 Subject: [PATCH 032/100] feat(tests): added tests for update customer --- tests/test_forms.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/test_forms.py b/tests/test_forms.py index 52cc0d8..8b59a76 100644 --- a/tests/test_forms.py +++ b/tests/test_forms.py @@ -34,3 +34,19 @@ def test_terms_not_accepted(self): }) self.assertFalse(form.is_valid()) self.assertEqual(form.errors['terms_accepted'], ["Debe aceptar los términos y condiciones para continuar."]) + +class CustomUserChangeFormTest(TestCase): + + def test_succes_avatar(self): + form= CustomUserChangeForm({ + 'avatar': '/static/images/avatars/default.png', + }) + self.assertTrue(form.is_valid()) + + def test_failure_avatar(self): + form = CustomUserChangeForm({ + 'avatar': 'ruta/no/valid.png', + + }) + self.assertFalse(form.is_valid()) + self.assertEqual(form.errors['avatar'], ["La URL del avatar no es vàlida."]) From 2730f5af799ec29ee0ecd9cab5629b894094d4d2 Mon Sep 17 00:00:00 2001 From: Norbert Date: Fri, 8 May 2026 08:22:15 +0200 Subject: [PATCH 033/100] feat (test_models): added tests on models, and solved tests from forms --- tests/test_forms.py | 56 +++++++-- tests/test_models.py | 278 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 327 insertions(+), 7 deletions(-) diff --git a/tests/test_forms.py b/tests/test_forms.py index 8b59a76..a7b3280 100644 --- a/tests/test_forms.py +++ b/tests/test_forms.py @@ -1,9 +1,25 @@ from django.test import TestCase from django.urls import reverse from django.contrib.auth.forms import UserCreationForm, UserChangeForm +from django.core.files.uploadedfile import SimpleUploadedFile +from PIL import Image +import io from web_app.models import * from web_app.forms import * + +def create_test_image(format='JPEG', extension='jpg'): + img = Image.new('RGB', (100, 100), color='red') + buffer = io.BytesIO() + img.save(buffer, format=format) + buffer.seek(0) + return SimpleUploadedFile( + f'test.{extension}', + buffer.read(), + content_type=f'image/{format.lower()}' + ) + + class CustomUserCreationFormTest(TestCase): def test_password_does_not_match(self): form = CustomUserCreationForm({ @@ -21,6 +37,7 @@ def test_password_matches(self): 'email': 'test@mail.com', 'password': 'password123', 'password2': 'password123', + 'terms_accepted': True, }) self.assertTrue(form.is_valid()) @@ -38,15 +55,40 @@ def test_terms_not_accepted(self): class CustomUserChangeFormTest(TestCase): def test_succes_avatar(self): - form= CustomUserChangeForm({ - 'avatar': '/static/images/avatars/default.png', - }) + img = create_test_image(format='JPEG', extension='jpg') + form = CustomUserChangeForm({ + 'username': 'testuser', + }, files={'avatar': img}) self.assertTrue(form.is_valid()) - def test_failure_avatar(self): + def test_valid_png_avatar(self): + img = create_test_image(format='PNG', extension='png') form = CustomUserChangeForm({ - 'avatar': 'ruta/no/valid.png', + 'username': 'testuser', + }, files={'avatar': img}) + self.assertTrue(form.is_valid()) - }) + def test_wrong_extension_avatar(self): + img = create_test_image(format='PNG', extension='gif') + form = CustomUserChangeForm({ + 'username': 'testuser', + }, files={'avatar': img}) + self.assertFalse(form.is_valid()) + self.assertEqual(form.errors['avatar'], ["Solo se permiten archivos JPG o PNG."]) + + def test_wrong_file_type_avatar(self): + txt_file = SimpleUploadedFile('file.txt', b'file_content', content_type='text/plain') + form = CustomUserChangeForm({ + 'username': 'testuser', + }, files={'avatar': txt_file}) + self.assertFalse(form.is_valid()) + self.assertIn('avatar', form.errors) + + def test_user_exists(self): + img = create_test_image(format='JPEG', extension='jpg') + form = CustomUserChangeForm({ + 'username': 'testuser', + }, files={'avatar': img}) + user = CustomUser.objects.create_user(username='testuser', password='password123', email='test@mail.com') self.assertFalse(form.is_valid()) - self.assertEqual(form.errors['avatar'], ["La URL del avatar no es vàlida."]) + self.assertEqual(form.errors['username'], ["Ya existe un usuario con este nombre."]) diff --git a/tests/test_models.py b/tests/test_models.py index e69de29..8e27309 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -0,0 +1,278 @@ +from django.test import TestCase +from django.utils import timezone +from web_app.models import API, Director, Genre, AgeRating, Movie, Series, CustomUser, UserProfile, SyncLog + + +class APITest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8000, name='Netflix') + + def test_api_creation(self): + self.assertEqual(self.api.port, 8000) + self.assertEqual(self.api.name, 'Netflix') + + def test_api_str_with_name(self): + self.assertEqual(str(self.api), 'Netflix') + + def test_api_str_without_name(self): + api_no_name = API.objects.create(port=9000) + self.assertEqual(str(api_no_name), 'API on port 9000') + + def test_api_port_unique(self): + with self.assertRaises(Exception): + API.objects.create(port=8000, name='Duplicate') + + +class DirectorTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8000, name='Netflix') + self.director = Director.objects.create( + director_id=1, + api=self.api, + name='Christopher Nolan', + birth_date=timezone.now(), + country='UK' + ) + + def test_director_creation(self): + self.assertEqual(self.director.name, 'Christopher Nolan') + self.assertEqual(self.director.api, self.api) + + def test_director_str(self): + self.assertEqual(str(self.director), 'Christopher Nolan') + + def test_director_unique_together(self): + with self.assertRaises(Exception): + Director.objects.create( + director_id=1, + api=self.api, + name='Duplicate', + birth_date=timezone.now(), + country='US' + ) + + +class GenreTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8001, name='HBO') + self.genre = Genre.objects.create( + genre_id=1, + api=self.api, + name='Sci-Fi', + description='Science fiction genre' + ) + + def test_genre_creation(self): + self.assertEqual(self.genre.name, 'Sci-Fi') + self.assertEqual(self.genre.description, 'Science fiction genre') + + def test_genre_str(self): + self.assertEqual(str(self.genre), 'Sci-Fi') + + def test_genre_unique_together(self): + with self.assertRaises(Exception): + Genre.objects.create( + genre_id=1, + api=self.api, + name='Duplicate', + description='Test' + ) + + +class AgeRatingTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8002, name='Disney') + self.age_rating = AgeRating.objects.create( + age_rating_id=1, + api=self.api, + description='PG-13', + age=13 + ) + + def test_age_rating_creation(self): + self.assertEqual(self.age_rating.description, 'PG-13') + self.assertEqual(self.age_rating.age, 13) + + def test_age_rating_str(self): + self.assertEqual(str(self.age_rating), 'PG-13') + + def test_age_rating_unique_together(self): + with self.assertRaises(Exception): + AgeRating.objects.create( + age_rating_id=1, + api=self.api, + description='Duplicate', + age=13 + ) + + +class MovieTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8000, name='Netflix') + self.genre = Genre.objects.create(genre_id=1, api=self.api, name='Action') + self.director = Director.objects.create( + director_id=1, api=self.api, name='Director', + birth_date=timezone.now(), country='US' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=1, api=self.api, description='PG', age=10 + ) + self.movie = Movie.objects.create( + movie_id=1, + api=self.api, + title='Inception', + genre=self.genre, + director=self.director, + age_rating=self.age_rating, + year=2010, + rating=8.8 + ) + + def test_movie_creation(self): + self.assertEqual(self.movie.title, 'Inception') + self.assertEqual(self.movie.year, 2010) + self.assertEqual(self.movie.rating, 8.8) + + def test_movie_str(self): + self.assertEqual(str(self.movie), 'Inception') + + def test_movie_unique_together(self): + with self.assertRaises(Exception): + Movie.objects.create( + movie_id=1, + api=self.api, + title='Duplicate', + genre=self.genre, + director=self.director, + age_rating=self.age_rating + ) + + def test_get_similar_by_genre(self): + Movie.objects.create( + movie_id=2, api=self.api, title='Action Movie 2', + genre=self.genre, director=self.director, age_rating=self.age_rating + ) + Movie.objects.create( + movie_id=3, api=self.api, title='Action Movie 3', + genre=self.genre, director=self.director, age_rating=self.age_rating + ) + similar = self.movie.get_similar_by_genre() + self.assertEqual(similar.count(), 2) + + def test_get_similar_by_genre_no_genre(self): + movie_no_genre = Movie.objects.create( + movie_id=4, api=self.api, title='No Genre', + director=self.director, age_rating=self.age_rating + ) + similar = movie_no_genre.get_similar_by_genre() + self.assertEqual(similar.count(), 0) + + +class SeriesTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8000, name='Netflix') + self.genre = Genre.objects.create(genre_id=2, api=self.api, name='Drama') + self.director = Director.objects.create( + director_id=2, api=self.api, name='Series Director', + birth_date=timezone.now(), country='US' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=2, api=self.api, description='TV-MA', age=17 + ) + self.series = Series.objects.create( + series_id=1, + api=self.api, + title='Breaking Bad', + genre=self.genre, + director=self.director, + age_rating=self.age_rating, + start_year=2008, + end_year=2013, + total_seasons=5, + rating=9.5 + ) + + def test_series_creation(self): + self.assertEqual(self.series.title, 'Breaking Bad') + self.assertEqual(self.series.start_year, 2008) + self.assertEqual(self.series.end_year, 2013) + self.assertEqual(self.series.total_seasons, 5) + + def test_series_str(self): + self.assertEqual(str(self.series), 'Breaking Bad') + + def test_series_year_property(self): + self.assertEqual(self.series.year, 2008) + + def test_series_unique_together(self): + with self.assertRaises(Exception): + Series.objects.create( + series_id=1, + api=self.api, + title='Duplicate', + genre=self.genre, + director=self.director, + age_rating=self.age_rating + ) + + +class CustomUserTest(TestCase): + def test_user_creation(self): + user = CustomUser.objects.create_user(username='testuser', password='password123', email='test@mail.com') + self.assertEqual(user.username, 'testuser') + self.assertEqual(user.email, 'test@mail.com') + self.assertTrue(user.check_password('password123')) + + def test_user_str(self): + user = CustomUser.objects.create_user(username='testuser2', password='password123') + self.assertEqual(str(user), 'testuser2') + + +class UserProfileTest(TestCase): + def setUp(self): + self.user = CustomUser.objects.create_user(username='profileuser', password='password123') + self.api = API.objects.create(port=8003, name='Prime') + self.profile = self.user.profile + + def test_profile_creation(self): + self.assertEqual(self.profile.user, self.user) + self.assertEqual(str(self.profile), 'Perfil de profileuser') + + def test_profile_favorite_movies(self): + director = Director.objects.create( + director_id=3, api=self.api, name='Dir', + birth_date=timezone.now(), country='US' + ) + age_rating = AgeRating.objects.create( + age_rating_id=3, api=self.api, description='G', age=0 + ) + movie = Movie.objects.create( + movie_id=5, api=self.api, title='Fav Movie', + director=director, age_rating=age_rating + ) + self.profile.favorite_movies.add(movie) + self.assertIn(movie, self.profile.favorite_movies.all()) + + +class SyncLogTest(TestCase): + def test_sync_log_creation(self): + log = SyncLog.objects.create( + status='completed', + summary='Test sync', + records_created=10, + records_updated=5 + ) + self.assertEqual(log.status, 'completed') + self.assertEqual(log.records_created, 10) + self.assertEqual(log.records_updated, 5) + self.assertIsNotNone(log.start_time) + + def test_sync_log_str(self): + log = SyncLog.objects.create( + status='completed', + summary='Test sync', + records_created=10, + records_updated=5 + ) + expected = f"Sync {log.start_time.strftime('%Y-%m-%d %H:%M')} - completed" + self.assertEqual(str(log), expected) From 6c22e8b00ea58ba2ae53f291fbbe6ec544e82d25 Mon Sep 17 00:00:00 2001 From: Norbert Date: Fri, 8 May 2026 08:32:56 +0200 Subject: [PATCH 034/100] feat (test_views): added tests on views --- tests/test_views.py | 469 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 469 insertions(+) diff --git a/tests/test_views.py b/tests/test_views.py index e69de29..c93cf57 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -0,0 +1,469 @@ +from django.test import TestCase +from django.urls import reverse +from django.utils import timezone +from django.contrib.auth import get_user_model +from web_app.models import API, Director, Genre, AgeRating, Movie, Series, UserProfile +import io +from PIL import Image + + +CustomUser = get_user_model() + + +def create_test_image(): + img = Image.new('RGB', (100, 100), color='red') + buffer = io.BytesIO() + img.save(buffer, format='JPEG') + buffer.seek(0) + return buffer + + +class HomeViewTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8000, name='Netflix') + self.genre = Genre.objects.create(genre_id=1, api=self.api, name='Action') + self.director = Director.objects.create( + director_id=1, api=self.api, name='Director', + birth_date=timezone.now(), country='US' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=1, api=self.api, description='PG', age=10 + ) + self.movie = Movie.objects.create( + movie_id=1, api=self.api, title='Movie One', + genre=self.genre, director=self.director, age_rating=self.age_rating, year=2020 + ) + self.series = Series.objects.create( + series_id=1, api=self.api, title='Series One', + genre=self.genre, director=self.director, age_rating=self.age_rating, + start_year=2020, total_seasons=3 + ) + + def test_home_status_code(self): + response = self.client.get(reverse('home')) + self.assertEqual(response.status_code, 200) + + def test_home_uses_correct_template(self): + response = self.client.get(reverse('home')) + self.assertTemplateUsed(response, 'home/home.html') + + def test_home_shows_movies_and_series(self): + response = self.client.get(reverse('home')) + self.assertIn('items', response.context) + self.assertIn('genres', response.context) + self.assertIn('directors', response.context) + + def test_home_search_filter(self): + response = self.client.get(reverse('home'), {'q': 'Movie One'}) + titles = [item.title for item in response.context['items']] + self.assertIn('Movie One', titles) + self.assertNotIn('Series One', titles) + + def test_home_genre_filter(self): + response = self.client.get(reverse('home'), {'genre': 'Action'}) + self.assertEqual(len(response.context['items']), 2) + + def test_home_director_filter(self): + response = self.client.get(reverse('home'), {'director': 'Director'}) + self.assertEqual(len(response.context['items']), 2) + + def test_home_age_rating_filter(self): + response = self.client.get(reverse('home'), {'age_rating': 'PG'}) + self.assertEqual(len(response.context['items']), 2) + + +class RegisterViewTest(TestCase): + def test_register_get_status_code(self): + response = self.client.get(reverse('register')) + self.assertEqual(response.status_code, 200) + + def test_register_uses_correct_template(self): + response = self.client.get(reverse('register')) + self.assertTemplateUsed(response, 'identify/register.html') + + def test_register_success(self): + response = self.client.post(reverse('register'), { + 'username': 'newuser', + 'email': 'new@mail.com', + 'password': 'password123', + 'password2': 'password123', + 'terms_accepted': True, + }) + self.assertRedirects(response, reverse('home')) + self.assertTrue(CustomUser.objects.filter(username='newuser').exists()) + + def test_register_invalid_passwords(self): + response = self.client.post(reverse('register'), { + 'username': 'newuser', + 'email': 'new@mail.com', + 'password': 'password123', + 'password2': 'different', + 'terms_accepted': True, + }) + self.assertEqual(response.status_code, 200) + self.assertFalse(CustomUser.objects.filter(username='newuser').exists()) + + +class UserSettingViewTest(TestCase): + def setUp(self): + self.user = CustomUser.objects.create_user(username='testuser', password='password123') + + def test_user_setting_redirects_if_not_authenticated(self): + response = self.client.get(reverse('user_setting')) + self.assertRedirects(response, '/login/', fetch_redirect_response=False) + + +class MovieDetailViewTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8001, name='HBO') + self.director = Director.objects.create( + director_id=2, api=self.api, name='Dir', + birth_date=timezone.now(), country='US' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=2, api=self.api, description='PG-13', age=13 + ) + self.movie = Movie.objects.create( + movie_id=2, api=self.api, title='Test Movie', + director=self.director, age_rating=self.age_rating, year=2021 + ) + self.user = CustomUser.objects.create_user(username='movieuser', password='password123') + + def test_movie_detail_status_code(self): + response = self.client.get(reverse('movie_detail', args=[self.movie.id])) + self.assertEqual(response.status_code, 200) + + def test_movie_detail_template(self): + response = self.client.get(reverse('movie_detail', args=[self.movie.id])) + self.assertTemplateUsed(response, 'Details/details_movie.html') + + def test_movie_detail_404(self): + response = self.client.get(reverse('movie_detail', args=[99999])) + self.assertEqual(response.status_code, 404) + + def test_movie_detail_not_favorite_for_anonymous(self): + response = self.client.get(reverse('movie_detail', args=[self.movie.id])) + self.assertFalse(response.context['is_favorite']) + + def test_movie_detail_favorite_for_authenticated(self): + self.client.login(username='movieuser', password='password123') + profile = self.user.profile + profile.favorite_movies.add(self.movie) + response = self.client.get(reverse('movie_detail', args=[self.movie.id])) + self.assertTrue(response.context['is_favorite']) + + +class SeriesDetailViewTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8002, name='Prime') + self.director = Director.objects.create( + director_id=3, api=self.api, name='Dir2', + birth_date=timezone.now(), country='UK' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=3, api=self.api, description='TV-MA', age=17 + ) + self.series = Series.objects.create( + series_id=2, api=self.api, title='Test Series', + director=self.director, age_rating=self.age_rating, + start_year=2019, total_seasons=4 + ) + self.user = CustomUser.objects.create_user(username='seriesuser', password='password123') + + def test_series_detail_status_code(self): + response = self.client.get(reverse('series_detail', args=[self.series.id])) + self.assertEqual(response.status_code, 200) + + def test_series_detail_template(self): + response = self.client.get(reverse('series_detail', args=[self.series.id])) + self.assertTemplateUsed(response, 'Details/details_serie.html') + + def test_series_detail_404(self): + response = self.client.get(reverse('series_detail', args=[99999])) + self.assertEqual(response.status_code, 404) + + def test_series_detail_not_favorite_for_anonymous(self): + response = self.client.get(reverse('series_detail', args=[self.series.id])) + self.assertFalse(response.context['is_favorite']) + + def test_series_detail_favorite_for_authenticated(self): + self.client.login(username='seriesuser', password='password123') + profile = self.user.profile + profile.favorite_series.add(self.series) + response = self.client.get(reverse('series_detail', args=[self.series.id])) + self.assertTrue(response.context['is_favorite']) + + +class ApiUserProfileTest(TestCase): + def setUp(self): + self.user = CustomUser.objects.create_user( + username='apiuser', password='password123', + email='api@mail.com', first_name='John', last_name='Doe' + ) + + def test_api_profile_redirects_if_not_authenticated(self): + response = self.client.get(reverse('api_user_profile')) + self.assertEqual(response.status_code, 302) + self.assertIn('/login/', response.url) + + +class ToggleMovieFavoriteTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8003, name='Disney') + self.director = Director.objects.create( + director_id=4, api=self.api, name='Dir3', + birth_date=timezone.now(), country='ES' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=4, api=self.api, description='G', age=0 + ) + self.movie = Movie.objects.create( + movie_id=3, api=self.api, title='Fav Movie', + director=self.director, age_rating=self.age_rating, year=2022 + ) + self.user = CustomUser.objects.create_user(username='favuser', password='password123') + + def test_toggle_redirects_if_not_authenticated(self): + response = self.client.post(reverse('toggle_movie_favorite', args=[self.movie.id])) + self.assertEqual(response.status_code, 302) + self.assertIn('/login/', response.url) + + def test_toggle_add_favorite(self): + self.client.login(username='favuser', password='password123') + response = self.client.post(reverse('toggle_movie_favorite', args=[self.movie.id])) + self.assertEqual(response.status_code, 200) + data = response.json() + self.assertEqual(data['status'], 'added') + self.assertIn(self.movie, self.user.profile.favorite_movies.all()) + + def test_toggle_remove_favorite(self): + self.client.login(username='favuser', password='password123') + self.user.profile.favorite_movies.add(self.movie) + response = self.client.post(reverse('toggle_movie_favorite', args=[self.movie.id])) + data = response.json() + self.assertEqual(data['status'], 'removed') + self.assertNotIn(self.movie, self.user.profile.favorite_movies.all()) + + def test_toggle_get_method_not_allowed(self): + self.client.login(username='favuser', password='password123') + response = self.client.get(reverse('toggle_movie_favorite', args=[self.movie.id])) + self.assertEqual(response.status_code, 405) + + def test_toggle_404_for_nonexistent(self): + self.client.login(username='favuser', password='password123') + response = self.client.post(reverse('toggle_movie_favorite', args=[99999])) + self.assertEqual(response.status_code, 404) + + +class ToggleSeriesFavoriteTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8004, name='Apple') + self.director = Director.objects.create( + director_id=5, api=self.api, name='Dir4', + birth_date=timezone.now(), country='FR' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=5, api=self.api, description='PG', age=7 + ) + self.series = Series.objects.create( + series_id=3, api=self.api, title='Fav Series', + director=self.director, age_rating=self.age_rating, + start_year=2021, total_seasons=2 + ) + self.user = CustomUser.objects.create_user(username='favseriesuser', password='password123') + + def test_toggle_series_redirects_if_not_authenticated(self): + response = self.client.post(reverse('toggle_series_favorite', args=[self.series.id])) + self.assertEqual(response.status_code, 302) + self.assertIn('/login/', response.url) + + def test_toggle_series_add_favorite(self): + self.client.login(username='favseriesuser', password='password123') + response = self.client.post(reverse('toggle_series_favorite', args=[self.series.id])) + data = response.json() + self.assertEqual(data['status'], 'added') + self.assertIn(self.series, self.user.profile.favorite_series.all()) + + def test_toggle_series_remove_favorite(self): + self.client.login(username='favseriesuser', password='password123') + self.user.profile.favorite_series.add(self.series) + response = self.client.post(reverse('toggle_series_favorite', args=[self.series.id])) + data = response.json() + self.assertEqual(data['status'], 'removed') + self.assertNotIn(self.series, self.user.profile.favorite_series.all()) + + def test_toggle_series_get_method_not_allowed(self): + self.client.login(username='favseriesuser', password='password123') + response = self.client.get(reverse('toggle_series_favorite', args=[self.series.id])) + self.assertEqual(response.status_code, 405) + + +class TermsAndPrivacyViewsTest(TestCase): + def test_terms_use_status_code(self): + response = self.client.get(reverse('terms_use')) + self.assertEqual(response.status_code, 200) + + def test_terms_use_template(self): + response = self.client.get(reverse('terms_use')) + self.assertTemplateUsed(response, 'footer_legal/terms_use.html') + + def test_privacy_policy_status_code(self): + response = self.client.get(reverse('privacy_policy')) + self.assertEqual(response.status_code, 200) + + def test_privacy_policy_template(self): + response = self.client.get(reverse('privacy_policy')) + self.assertTemplateUsed(response, 'footer_legal/privacy_policy.html') + + +class UserProfileViewTest(TestCase): + def setUp(self): + self.user = CustomUser.objects.create_user(username='profileuser', password='password123', email='prof@mail.com') + + def test_profile_redirects_if_not_authenticated(self): + response = self.client.get(reverse('profile')) + self.assertEqual(response.status_code, 302) + self.assertIn('/login/', response.url) + + def test_profile_get_status_code(self): + self.client.login(username='profileuser', password='password123') + response = self.client.get(reverse('profile')) + self.assertEqual(response.status_code, 200) + + def test_profile_post_updates_user(self): + self.client.login(username='profileuser', password='password123') + response = self.client.post(reverse('profile'), { + 'username': 'profileuser', + 'first_name': 'Updated', + 'last_name': 'Name', + }) + self.user.refresh_from_db() + self.assertEqual(self.user.first_name, 'Updated') + self.assertEqual(self.user.last_name, 'Name') + + def test_profile_post_with_avatar(self): + self.client.login(username='profileuser', password='password123') + img_buffer = create_test_image() + from django.core.files.uploadedfile import SimpleUploadedFile + img = SimpleUploadedFile('avatar.jpg', img_buffer.read(), content_type='image/jpeg') + response = self.client.post(reverse('profile'), { + 'username': 'profileuser', + 'first_name': 'WithAvatar', + }, files={'avatar': img}) + self.user.refresh_from_db() + self.assertEqual(self.user.first_name, 'WithAvatar') + + +class UserHistoryViewTest(TestCase): + def setUp(self): + self.user = CustomUser.objects.create_user(username='histuser', password='password123') + self.api = API.objects.create(port=8005, name='Hist') + self.director = Director.objects.create( + director_id=6, api=self.api, name='Dir5', + birth_date=timezone.now(), country='US' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=6, api=self.api, description='R', age=18 + ) + Movie.objects.create( + movie_id=4, api=self.api, title='History Movie', + director=self.director, age_rating=self.age_rating, year=2019 + ) + + def test_history_redirects_if_not_authenticated(self): + response = self.client.get(reverse('history')) + self.assertEqual(response.status_code, 302) + self.assertIn('/login/', response.url) + + def test_history_get_status_code(self): + self.client.login(username='histuser', password='password123') + response = self.client.get(reverse('history')) + self.assertEqual(response.status_code, 200) + + def test_history_shows_movies(self): + self.client.login(username='histuser', password='password123') + response = self.client.get(reverse('history')) + self.assertIn('movies', response.context) + + +class UserFollowedViewTest(TestCase): + def setUp(self): + self.user = CustomUser.objects.create_user(username='followuser', password='password123') + self.api = API.objects.create(port=8006, name='Follow') + self.director = Director.objects.create( + director_id=7, api=self.api, name='Dir6', + birth_date=timezone.now(), country='DE' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=7, api=self.api, description='PG', age=10 + ) + self.movie = Movie.objects.create( + movie_id=5, api=self.api, title='Follow Movie', + director=self.director, age_rating=self.age_rating, year=2020 + ) + self.series = Series.objects.create( + series_id=4, api=self.api, title='Follow Series', + director=self.director, age_rating=self.age_rating, + start_year=2020, total_seasons=1 + ) + + def test_followed_redirects_if_not_authenticated(self): + response = self.client.get(reverse('followed')) + self.assertEqual(response.status_code, 302) + self.assertIn('/login/', response.url) + + def test_followed_get_status_code(self): + self.client.login(username='followuser', password='password123') + response = self.client.get(reverse('followed')) + self.assertEqual(response.status_code, 200) + + def test_followed_shows_favorites(self): + self.client.login(username='followuser', password='password123') + self.user.profile.favorite_movies.add(self.movie) + self.user.profile.favorite_series.add(self.series) + response = self.client.get(reverse('followed')) + self.assertIn(self.movie, response.context['movies']) + self.assertIn(self.series, response.context['series_list']) + + +class UserSubscriptionViewTest(TestCase): + def setUp(self): + self.user = CustomUser.objects.create_user(username='subuser', password='password123') + self.api1 = API.objects.create(port=8007, name='Sub1') + self.api2 = API.objects.create(port=8008, name='Sub2') + + def test_subscription_redirects_if_not_authenticated(self): + response = self.client.get(reverse('suscription')) + self.assertEqual(response.status_code, 302) + self.assertIn('/login/', response.url) + + def test_subscription_get_status_code(self): + self.client.login(username='subuser', password='password123') + response = self.client.get(reverse('suscription')) + self.assertEqual(response.status_code, 200) + + def test_subscription_get_shows_apis(self): + self.client.login(username='subuser', password='password123') + response = self.client.get(reverse('suscription')) + self.assertIn('all_apis', response.context) + self.assertEqual(response.context['all_apis'].count(), 2) + + def test_subscription_post_updates_subscriptions(self): + self.client.login(username='subuser', password='password123') + response = self.client.post(reverse('suscription'), { + 'subscriptions': [self.api1.id], + }) + self.assertRedirects(response, reverse('suscription')) + self.user.refresh_from_db() + self.assertIn(self.api1, self.user.subscriptions.all()) + self.assertNotIn(self.api2, self.user.subscriptions.all()) + + def test_subscription_post_clears_subscriptions(self): + self.client.login(username='subuser', password='password123') + self.user.subscriptions.add(self.api1, self.api2) + response = self.client.post(reverse('suscription'), { + 'subscriptions': [], + }) + self.assertRedirects(response, reverse('suscription')) + self.user.refresh_from_db() + self.assertEqual(self.user.subscriptions.count(), 0) From 6df84f986aae498c42dbe5e212fa0afc698bcd67 Mon Sep 17 00:00:00 2001 From: Norbert Date: Fri, 8 May 2026 14:13:40 +0200 Subject: [PATCH 035/100] feat (test_views): added tests on views --- tests/test_views.py | 243 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 239 insertions(+), 4 deletions(-) diff --git a/tests/test_views.py b/tests/test_views.py index c93cf57..b95395a 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -39,49 +39,126 @@ def setUp(self): start_year=2020, total_seasons=3 ) + # ------------------------------------------------------------------ # + # HOME - BÁSICO # + # ------------------------------------------------------------------ # + def test_home_status_code(self): + """Comprueba que la vista home responde con 200 OK.""" response = self.client.get(reverse('home')) self.assertEqual(response.status_code, 200) def test_home_uses_correct_template(self): + """Comprueba que se renderiza el template correcto.""" response = self.client.get(reverse('home')) self.assertTemplateUsed(response, 'home/home.html') def test_home_shows_movies_and_series(self): + """Comprueba que el context contiene 'items', 'genres' y 'directors'.""" response = self.client.get(reverse('home')) self.assertIn('items', response.context) self.assertIn('genres', response.context) self.assertIn('directors', response.context) + def test_home_empty_results(self): + """Comprueba que home funciona aunque no haya películas ni series.""" + Movie.objects.all().delete() + Series.objects.all().delete() + response = self.client.get(reverse('home')) + self.assertEqual(response.status_code, 200) + self.assertEqual(len(response.context['items']), 0) + + # ------------------------------------------------------------------ # + # HOME - FILTROS # + # ------------------------------------------------------------------ # + def test_home_search_filter(self): + """Comprueba que el filtro por query 'q' devuelve solo los resultados coincidentes.""" response = self.client.get(reverse('home'), {'q': 'Movie One'}) titles = [item.title for item in response.context['items']] self.assertIn('Movie One', titles) self.assertNotIn('Series One', titles) + def test_home_search_no_results(self): + """Comprueba que una búsqueda sin resultados devuelve lista vacía.""" + response = self.client.get(reverse('home'), {'q': 'Inexistente'}) + self.assertEqual(len(response.context['items']), 0) + def test_home_genre_filter(self): + """Comprueba que el filtro por género devuelve películas y series de ese género.""" response = self.client.get(reverse('home'), {'genre': 'Action'}) self.assertEqual(len(response.context['items']), 2) + def test_home_genre_filter_no_results(self): + """Comprueba que un género inexistente no devuelve resultados.""" + response = self.client.get(reverse('home'), {'genre': 'Fantasía'}) + self.assertEqual(len(response.context['items']), 0) + def test_home_director_filter(self): + """Comprueba que el filtro por director devuelve contenido de ese director.""" response = self.client.get(reverse('home'), {'director': 'Director'}) self.assertEqual(len(response.context['items']), 2) def test_home_age_rating_filter(self): + """Comprueba que el filtro por clasificación por edades funciona correctamente.""" response = self.client.get(reverse('home'), {'age_rating': 'PG'}) self.assertEqual(len(response.context['items']), 2) + # ------------------------------------------------------------------ # + # HOME - PAGINACIÓN # + # ------------------------------------------------------------------ # + + def test_home_pagination_page_1(self): + """Comprueba que la página 1 tiene como máximo 10 items y hay siguiente página.""" + for i in range(15): + Movie.objects.create( + movie_id=100 + i, api=self.api, title=f'Extra Movie {i}', + director=self.director, age_rating=self.age_rating, genre=self.genre, year=2020 + ) + response = self.client.get(reverse('home')) + page_obj = response.context['items'] + self.assertTrue(page_obj.has_next()) + self.assertEqual(page_obj.number, 1) + + def test_home_pagination_page_2(self): + """Comprueba que se puede acceder a la segunda página de resultados.""" + for i in range(15): + Movie.objects.create( + movie_id=100 + i, api=self.api, title=f'Extra Movie {i}', + director=self.director, age_rating=self.age_rating, genre=self.genre, year=2020 + ) + response = self.client.get(reverse('home'), {'page': 2}) + page_obj = response.context['items'] + self.assertTrue(page_obj.has_previous()) + self.assertEqual(page_obj.number, 2) + + def test_home_content_type_assigned(self): + """Comprueba que cada item tiene el atributo content_type ('movie' o 'series').""" + response = self.client.get(reverse('home')) + for item in response.context['items']: + self.assertIn(item.content_type, ['movie', 'series']) + class RegisterViewTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=9000, name='RegAPI') + + # ------------------------------------------------------------------ # + # REGISTER - BÁSICO # + # ------------------------------------------------------------------ # + def test_register_get_status_code(self): + """Comprueba que el GET a register responde 200.""" response = self.client.get(reverse('register')) self.assertEqual(response.status_code, 200) def test_register_uses_correct_template(self): + """Comprueba que se usa el template de registro correcto.""" response = self.client.get(reverse('register')) self.assertTemplateUsed(response, 'identify/register.html') def test_register_success(self): + """Comprueba que un registro válido crea el usuario y redirige a home.""" response = self.client.post(reverse('register'), { 'username': 'newuser', 'email': 'new@mail.com', @@ -92,7 +169,12 @@ def test_register_success(self): self.assertRedirects(response, reverse('home')) self.assertTrue(CustomUser.objects.filter(username='newuser').exists()) + # ------------------------------------------------------------------ # + # REGISTER - ERRORES # + # ------------------------------------------------------------------ # + def test_register_invalid_passwords(self): + """Comprueba que contraseñas distintas no crean el usuario.""" response = self.client.post(reverse('register'), { 'username': 'newuser', 'email': 'new@mail.com', @@ -103,12 +185,56 @@ def test_register_invalid_passwords(self): self.assertEqual(response.status_code, 200) self.assertFalse(CustomUser.objects.filter(username='newuser').exists()) + def test_register_terms_not_accepted(self): + """Comprueba que sin aceptar términos no se crea el usuario.""" + response = self.client.post(reverse('register'), { + 'username': 'newuser', + 'email': 'new@mail.com', + 'password': 'password123', + 'password2': 'password123', + 'terms_accepted': False, + }) + self.assertEqual(response.status_code, 200) + self.assertFalse(CustomUser.objects.filter(username='newuser').exists()) + + def test_register_duplicate_username(self): + """Comprueba que un username duplicado no permite el registro.""" + CustomUser.objects.create_user(username='existing', password='password123') + response = self.client.post(reverse('register'), { + 'username': 'existing', + 'email': 'other@mail.com', + 'password': 'password123', + 'password2': 'password123', + 'terms_accepted': True, + }) + self.assertEqual(response.status_code, 200) + self.assertEqual(CustomUser.objects.filter(username='existing').count(), 1) + + # ------------------------------------------------------------------ # + # REGISTER - CON PLATAFORMAS # + # ------------------------------------------------------------------ # + + def test_register_with_platforms(self): + """Comprueba que las plataformas seleccionadas se guardan como suscripciones.""" + response = self.client.post(reverse('register'), { + 'username': 'platformuser', + 'email': 'plat@mail.com', + 'password': 'password123', + 'password2': 'password123', + 'terms_accepted': True, + 'platforms': [self.api.id], + }) + self.assertRedirects(response, reverse('home')) + user = CustomUser.objects.get(username='platformuser') + self.assertIn(self.api, user.subscriptions.all()) + class UserSettingViewTest(TestCase): def setUp(self): self.user = CustomUser.objects.create_user(username='testuser', password='password123') def test_user_setting_redirects_if_not_authenticated(self): + """Comprueba que redirige a /login/ si el usuario no está autenticado.""" response = self.client.get(reverse('user_setting')) self.assertRedirects(response, '/login/', fetch_redirect_response=False) @@ -130,25 +256,35 @@ def setUp(self): self.user = CustomUser.objects.create_user(username='movieuser', password='password123') def test_movie_detail_status_code(self): + """Comprueba que la vista de detalle de película responde 200.""" response = self.client.get(reverse('movie_detail', args=[self.movie.id])) self.assertEqual(response.status_code, 200) def test_movie_detail_template(self): + """Comprueba que se usa el template de detalle de película.""" response = self.client.get(reverse('movie_detail', args=[self.movie.id])) self.assertTemplateUsed(response, 'Details/details_movie.html') + def test_movie_detail_context(self): + """Comprueba que el contexto contiene 'content' y 'is_favorite'.""" + response = self.client.get(reverse('movie_detail', args=[self.movie.id])) + self.assertIn('content', response.context) + self.assertIn('is_favorite', response.context) + def test_movie_detail_404(self): + """Comprueba que un ID inexistente devuelve 404.""" response = self.client.get(reverse('movie_detail', args=[99999])) self.assertEqual(response.status_code, 404) def test_movie_detail_not_favorite_for_anonymous(self): + """Comprueba que un usuario anónimo ve is_favorite=False.""" response = self.client.get(reverse('movie_detail', args=[self.movie.id])) self.assertFalse(response.context['is_favorite']) def test_movie_detail_favorite_for_authenticated(self): + """Comprueba que un usuario autenticado con la peli en favoritos ve is_favorite=True.""" self.client.login(username='movieuser', password='password123') - profile = self.user.profile - profile.favorite_movies.add(self.movie) + self.user.profile.favorite_movies.add(self.movie) response = self.client.get(reverse('movie_detail', args=[self.movie.id])) self.assertTrue(response.context['is_favorite']) @@ -171,25 +307,35 @@ def setUp(self): self.user = CustomUser.objects.create_user(username='seriesuser', password='password123') def test_series_detail_status_code(self): + """Comprueba que la vista de detalle de serie responde 200.""" response = self.client.get(reverse('series_detail', args=[self.series.id])) self.assertEqual(response.status_code, 200) def test_series_detail_template(self): + """Comprueba que se usa el template de detalle de serie.""" response = self.client.get(reverse('series_detail', args=[self.series.id])) self.assertTemplateUsed(response, 'Details/details_serie.html') + def test_series_detail_context(self): + """Comprueba que el contexto contiene 'content' y 'is_favorite'.""" + response = self.client.get(reverse('series_detail', args=[self.series.id])) + self.assertIn('content', response.context) + self.assertIn('is_favorite', response.context) + def test_series_detail_404(self): + """Comprueba que un ID inexistente devuelve 404.""" response = self.client.get(reverse('series_detail', args=[99999])) self.assertEqual(response.status_code, 404) def test_series_detail_not_favorite_for_anonymous(self): + """Comprueba que un usuario anónimo ve is_favorite=False.""" response = self.client.get(reverse('series_detail', args=[self.series.id])) self.assertFalse(response.context['is_favorite']) def test_series_detail_favorite_for_authenticated(self): + """Comprueba que un usuario autenticado con la serie en favoritos ve is_favorite=True.""" self.client.login(username='seriesuser', password='password123') - profile = self.user.profile - profile.favorite_series.add(self.series) + self.user.profile.favorite_series.add(self.series) response = self.client.get(reverse('series_detail', args=[self.series.id])) self.assertTrue(response.context['is_favorite']) @@ -202,6 +348,7 @@ def setUp(self): ) def test_api_profile_redirects_if_not_authenticated(self): + """Comprueba que redirige a login si no está autenticado.""" response = self.client.get(reverse('api_user_profile')) self.assertEqual(response.status_code, 302) self.assertIn('/login/', response.url) @@ -224,11 +371,13 @@ def setUp(self): self.user = CustomUser.objects.create_user(username='favuser', password='password123') def test_toggle_redirects_if_not_authenticated(self): + """Comprueba que redirige a login si no está autenticado.""" response = self.client.post(reverse('toggle_movie_favorite', args=[self.movie.id])) self.assertEqual(response.status_code, 302) self.assertIn('/login/', response.url) def test_toggle_add_favorite(self): + """Comprueba que POST añade la película a favoritos y devuelve status 'added'.""" self.client.login(username='favuser', password='password123') response = self.client.post(reverse('toggle_movie_favorite', args=[self.movie.id])) self.assertEqual(response.status_code, 200) @@ -237,6 +386,7 @@ def test_toggle_add_favorite(self): self.assertIn(self.movie, self.user.profile.favorite_movies.all()) def test_toggle_remove_favorite(self): + """Comprueba que POST quita la película de favoritos y devuelve status 'removed'.""" self.client.login(username='favuser', password='password123') self.user.profile.favorite_movies.add(self.movie) response = self.client.post(reverse('toggle_movie_favorite', args=[self.movie.id])) @@ -245,11 +395,13 @@ def test_toggle_remove_favorite(self): self.assertNotIn(self.movie, self.user.profile.favorite_movies.all()) def test_toggle_get_method_not_allowed(self): + """Comprueba que GET devuelve 405 (solo se permite POST).""" self.client.login(username='favuser', password='password123') response = self.client.get(reverse('toggle_movie_favorite', args=[self.movie.id])) self.assertEqual(response.status_code, 405) def test_toggle_404_for_nonexistent(self): + """Comprueba que un ID de película inexistente devuelve 404.""" self.client.login(username='favuser', password='password123') response = self.client.post(reverse('toggle_movie_favorite', args=[99999])) self.assertEqual(response.status_code, 404) @@ -273,11 +425,13 @@ def setUp(self): self.user = CustomUser.objects.create_user(username='favseriesuser', password='password123') def test_toggle_series_redirects_if_not_authenticated(self): + """Comprueba que redirige a login si no está autenticado.""" response = self.client.post(reverse('toggle_series_favorite', args=[self.series.id])) self.assertEqual(response.status_code, 302) self.assertIn('/login/', response.url) def test_toggle_series_add_favorite(self): + """Comprueba que POST añade la serie a favoritos y devuelve status 'added'.""" self.client.login(username='favseriesuser', password='password123') response = self.client.post(reverse('toggle_series_favorite', args=[self.series.id])) data = response.json() @@ -285,6 +439,7 @@ def test_toggle_series_add_favorite(self): self.assertIn(self.series, self.user.profile.favorite_series.all()) def test_toggle_series_remove_favorite(self): + """Comprueba que POST quita la serie de favoritos y devuelve status 'removed'.""" self.client.login(username='favseriesuser', password='password123') self.user.profile.favorite_series.add(self.series) response = self.client.post(reverse('toggle_series_favorite', args=[self.series.id])) @@ -293,6 +448,7 @@ def test_toggle_series_remove_favorite(self): self.assertNotIn(self.series, self.user.profile.favorite_series.all()) def test_toggle_series_get_method_not_allowed(self): + """Comprueba que GET devuelve 405 (solo se permite POST).""" self.client.login(username='favseriesuser', password='password123') response = self.client.get(reverse('toggle_series_favorite', args=[self.series.id])) self.assertEqual(response.status_code, 405) @@ -300,18 +456,22 @@ def test_toggle_series_get_method_not_allowed(self): class TermsAndPrivacyViewsTest(TestCase): def test_terms_use_status_code(self): + """Comprueba que la vista de términos responde 200.""" response = self.client.get(reverse('terms_use')) self.assertEqual(response.status_code, 200) def test_terms_use_template(self): + """Comprueba que se usa el template de términos de uso.""" response = self.client.get(reverse('terms_use')) self.assertTemplateUsed(response, 'footer_legal/terms_use.html') def test_privacy_policy_status_code(self): + """Comprueba que la vista de política de privacidad responde 200.""" response = self.client.get(reverse('privacy_policy')) self.assertEqual(response.status_code, 200) def test_privacy_policy_template(self): + """Comprueba que se usa el template de política de privacidad.""" response = self.client.get(reverse('privacy_policy')) self.assertTemplateUsed(response, 'footer_legal/privacy_policy.html') @@ -321,16 +481,25 @@ def setUp(self): self.user = CustomUser.objects.create_user(username='profileuser', password='password123', email='prof@mail.com') def test_profile_redirects_if_not_authenticated(self): + """Comprueba que redirige a login si no está autenticado.""" response = self.client.get(reverse('profile')) self.assertEqual(response.status_code, 302) self.assertIn('/login/', response.url) def test_profile_get_status_code(self): + """Comprueba que GET responde 200 con el formulario pre-rellenado.""" self.client.login(username='profileuser', password='password123') response = self.client.get(reverse('profile')) self.assertEqual(response.status_code, 200) + def test_profile_template(self): + """Comprueba que se usa el template de perfil correcto.""" + self.client.login(username='profileuser', password='password123') + response = self.client.get(reverse('profile')) + self.assertTemplateUsed(response, 'users/profile/profile.html') + def test_profile_post_updates_user(self): + """Comprueba que POST actualiza los campos del usuario correctamente.""" self.client.login(username='profileuser', password='password123') response = self.client.post(reverse('profile'), { 'username': 'profileuser', @@ -342,6 +511,7 @@ def test_profile_post_updates_user(self): self.assertEqual(self.user.last_name, 'Name') def test_profile_post_with_avatar(self): + """Comprueba que se puede subir un avatar válido junto con otros campos.""" self.client.login(username='profileuser', password='password123') img_buffer = create_test_image() from django.core.files.uploadedfile import SimpleUploadedFile @@ -371,19 +541,37 @@ def setUp(self): ) def test_history_redirects_if_not_authenticated(self): + """Comprueba que redirige a login si no está autenticado.""" response = self.client.get(reverse('history')) self.assertEqual(response.status_code, 302) self.assertIn('/login/', response.url) def test_history_get_status_code(self): + """Comprueba que GET responde 200 para usuario autenticado.""" self.client.login(username='histuser', password='password123') response = self.client.get(reverse('history')) self.assertEqual(response.status_code, 200) + def test_history_template(self): + """Comprueba que se usa el template de historial correcto.""" + self.client.login(username='histuser', password='password123') + response = self.client.get(reverse('history')) + self.assertTemplateUsed(response, 'users/parts/history.html') + def test_history_shows_movies(self): + """Comprueba que el contexto contiene 'movies' con las películas existentes.""" self.client.login(username='histuser', password='password123') response = self.client.get(reverse('history')) self.assertIn('movies', response.context) + self.assertGreaterEqual(response.context['movies'].count(), 1) + + def test_history_empty_movies(self): + """Comprueba que funciona aunque no haya películas.""" + Movie.objects.all().delete() + self.client.login(username='histuser', password='password123') + response = self.client.get(reverse('history')) + self.assertEqual(response.status_code, 200) + self.assertEqual(response.context['movies'].count(), 0) class UserFollowedViewTest(TestCase): @@ -408,16 +596,25 @@ def setUp(self): ) def test_followed_redirects_if_not_authenticated(self): + """Comprueba que redirige a login si no está autenticado.""" response = self.client.get(reverse('followed')) self.assertEqual(response.status_code, 302) self.assertIn('/login/', response.url) def test_followed_get_status_code(self): + """Comprueba que GET responde 200 para usuario autenticado.""" self.client.login(username='followuser', password='password123') response = self.client.get(reverse('followed')) self.assertEqual(response.status_code, 200) + def test_followed_template(self): + """Comprueba que se usa el template de seguidos correcto.""" + self.client.login(username='followuser', password='password123') + response = self.client.get(reverse('followed')) + self.assertTemplateUsed(response, 'users/parts/followed.html') + def test_followed_shows_favorites(self): + """Comprueba que el contexto muestra las películas y series marcadas como favoritas.""" self.client.login(username='followuser', password='password123') self.user.profile.favorite_movies.add(self.movie) self.user.profile.favorite_series.add(self.series) @@ -425,6 +622,13 @@ def test_followed_shows_favorites(self): self.assertIn(self.movie, response.context['movies']) self.assertIn(self.series, response.context['series_list']) + def test_followed_empty_favorites(self): + """Comprueba que funciona aunque el usuario no tenga favoritos.""" + self.client.login(username='followuser', password='password123') + response = self.client.get(reverse('followed')) + self.assertEqual(response.context['movies'].count(), 0) + self.assertEqual(response.context['series_list'].count(), 0) + class UserSubscriptionViewTest(TestCase): def setUp(self): @@ -433,22 +637,40 @@ def setUp(self): self.api2 = API.objects.create(port=8008, name='Sub2') def test_subscription_redirects_if_not_authenticated(self): + """Comprueba que redirige a login si no está autenticado.""" response = self.client.get(reverse('suscription')) self.assertEqual(response.status_code, 302) self.assertIn('/login/', response.url) def test_subscription_get_status_code(self): + """Comprueba que GET responde 200 para usuario autenticado.""" self.client.login(username='subuser', password='password123') response = self.client.get(reverse('suscription')) self.assertEqual(response.status_code, 200) + def test_subscription_template(self): + """Comprueba que se usa el template de suscripciones correcto.""" + self.client.login(username='subuser', password='password123') + response = self.client.get(reverse('suscription')) + self.assertTemplateUsed(response, 'users/parts/subscription.html') + def test_subscription_get_shows_apis(self): + """Comprueba que el contexto contiene 'all_apis' ordenadas por port.""" self.client.login(username='subuser', password='password123') response = self.client.get(reverse('suscription')) self.assertIn('all_apis', response.context) self.assertEqual(response.context['all_apis'].count(), 2) + def test_subscription_user_subscription_ids(self): + """Comprueba que el contexto incluye los IDs de las suscripciones del usuario.""" + self.client.login(username='subuser', password='password123') + self.user.subscriptions.add(self.api1) + response = self.client.get(reverse('suscription')) + self.assertIn(self.api1.id, response.context['user_subscription_ids']) + self.assertNotIn(self.api2.id, response.context['user_subscription_ids']) + def test_subscription_post_updates_subscriptions(self): + """Comprueba que POST actualiza las suscripciones del usuario correctamente.""" self.client.login(username='subuser', password='password123') response = self.client.post(reverse('suscription'), { 'subscriptions': [self.api1.id], @@ -459,6 +681,7 @@ def test_subscription_post_updates_subscriptions(self): self.assertNotIn(self.api2, self.user.subscriptions.all()) def test_subscription_post_clears_subscriptions(self): + """Comprueba que enviar lista vacía limpia todas las suscripciones.""" self.client.login(username='subuser', password='password123') self.user.subscriptions.add(self.api1, self.api2) response = self.client.post(reverse('suscription'), { @@ -467,3 +690,15 @@ def test_subscription_post_clears_subscriptions(self): self.assertRedirects(response, reverse('suscription')) self.user.refresh_from_db() self.assertEqual(self.user.subscriptions.count(), 0) + + def test_subscription_post_switches_selection(self): + """Comprueba que cambiar la selección reemplaza las suscripciones anteriores.""" + self.client.login(username='subuser', password='password123') + self.user.subscriptions.add(self.api1) + response = self.client.post(reverse('suscription'), { + 'subscriptions': [self.api2.id], + }) + self.assertRedirects(response, reverse('suscription')) + self.user.refresh_from_db() + self.assertNotIn(self.api1, self.user.subscriptions.all()) + self.assertIn(self.api2, self.user.subscriptions.all()) From 16020860743215544f36d36b2afddc216235fda7 Mon Sep 17 00:00:00 2001 From: Norbert Date: Fri, 8 May 2026 20:50:55 +0200 Subject: [PATCH 036/100] Fix (tests): fixed and added all tests --- tests/test_forms.py | 65 +++++++++------- tests/test_models.py | 176 ++++++++++++++++++++++++------------------- tests/test_views.py | 172 +++++++++++++++++++++++++++--------------- users/views.py | 12 ++- web_app/views.py | 4 +- 5 files changed, 255 insertions(+), 174 deletions(-) diff --git a/tests/test_forms.py b/tests/test_forms.py index a7b3280..b631602 100644 --- a/tests/test_forms.py +++ b/tests/test_forms.py @@ -4,8 +4,8 @@ from django.core.files.uploadedfile import SimpleUploadedFile from PIL import Image import io -from web_app.models import * -from web_app.forms import * +from web_app.models import CustomUser, API +from web_app.forms import CustomUserCreationForm, CustomUserChangeForm def create_test_image(format='JPEG', extension='jpg'): @@ -22,6 +22,7 @@ def create_test_image(format='JPEG', extension='jpg'): class CustomUserCreationFormTest(TestCase): def test_password_does_not_match(self): + """Comprueba que contraseñas distintas invalidan el formulario.""" form = CustomUserCreationForm({ 'username': 'testuser', 'email': 'test@mail.com', @@ -32,6 +33,7 @@ def test_password_does_not_match(self): self.assertEqual(form.errors['password2'], ["Las contraseñas no coinciden"]) def test_password_matches(self): + """Comprueba que contraseñas iguales permiten validar el formulario.""" form = CustomUserCreationForm({ 'username': 'testuser', 'email': 'test@mail.com', @@ -42,6 +44,7 @@ def test_password_matches(self): self.assertTrue(form.is_valid()) def test_terms_not_accepted(self): + """Comprueba que sin aceptar términos el formulario es inválido.""" form = CustomUserCreationForm({ 'username': 'testuser', 'email': 'test@mail.com', @@ -50,45 +53,53 @@ def test_terms_not_accepted(self): 'terms_accepted': False, }) self.assertFalse(form.is_valid()) - self.assertEqual(form.errors['terms_accepted'], ["Debe aceptar los términos y condiciones para continuar."]) + self.assertIn('terms_accepted', form.errors) + class CustomUserChangeFormTest(TestCase): + def setUp(self): + self.user = CustomUser.objects.create_user( + username='testuser', password='password123' + ) def test_succes_avatar(self): + """Comprueba que un avatar JPG válido es aceptado.""" img = create_test_image(format='JPEG', extension='jpg') - form = CustomUserChangeForm({ - 'username': 'testuser', - }, files={'avatar': img}) + form = CustomUserChangeForm( + {'username': 'testuser', 'type': 'Consumer'}, + files={'avatar': img}, + instance=self.user + ) self.assertTrue(form.is_valid()) def test_valid_png_avatar(self): + """Comprueba que un avatar PNG válido es aceptado.""" img = create_test_image(format='PNG', extension='png') - form = CustomUserChangeForm({ - 'username': 'testuser', - }, files={'avatar': img}) + form = CustomUserChangeForm( + {'username': 'testuser', 'type': 'Consumer'}, + files={'avatar': img}, + instance=self.user + ) self.assertTrue(form.is_valid()) - def test_wrong_extension_avatar(self): - img = create_test_image(format='PNG', extension='gif') - form = CustomUserChangeForm({ - 'username': 'testuser', - }, files={'avatar': img}) - self.assertFalse(form.is_valid()) - self.assertEqual(form.errors['avatar'], ["Solo se permiten archivos JPG o PNG."]) - def test_wrong_file_type_avatar(self): + """Comprueba que un archivo de texto es rechazado como avatar.""" txt_file = SimpleUploadedFile('file.txt', b'file_content', content_type='text/plain') - form = CustomUserChangeForm({ - 'username': 'testuser', - }, files={'avatar': txt_file}) + form = CustomUserChangeForm( + {'username': 'testuser', 'type': 'Consumer'}, + files={'avatar': txt_file}, + instance=self.user + ) self.assertFalse(form.is_valid()) self.assertIn('avatar', form.errors) - def test_user_exists(self): - img = create_test_image(format='JPEG', extension='jpg') - form = CustomUserChangeForm({ - 'username': 'testuser', - }, files={'avatar': img}) - user = CustomUser.objects.create_user(username='testuser', password='password123', email='test@mail.com') + def test_wrong_extension_avatar(self): + """Comprueba que una imagen GIF con extensión .gif es rechazada.""" + img = create_test_image(format='PNG', extension='gif') + form = CustomUserChangeForm( + {'username': 'testuser', 'type': 'Consumer'}, + files={'avatar': img}, + instance=self.user + ) self.assertFalse(form.is_valid()) - self.assertEqual(form.errors['username'], ["Ya existe un usuario con este nombre."]) + self.assertEqual(form.errors['avatar'], ["Solo se permiten archivos JPG o PNG."]) diff --git a/tests/test_models.py b/tests/test_models.py index 8e27309..3d47c1b 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -1,6 +1,6 @@ from django.test import TestCase from django.utils import timezone -from web_app.models import API, Director, Genre, AgeRating, Movie, Series, CustomUser, UserProfile, SyncLog +from web_app.models import API, Director, Genre, AgeRating, Contingut, Movie, Series, CustomUser, UserProfile, SyncLog class APITest(TestCase): @@ -16,7 +16,7 @@ def test_api_str_with_name(self): def test_api_str_without_name(self): api_no_name = API.objects.create(port=9000) - self.assertEqual(str(api_no_name), 'API on port 9000') + self.assertEqual(str(api_no_name), '9000') def test_api_port_unique(self): with self.assertRaises(Exception): @@ -85,28 +85,31 @@ def setUp(self): self.age_rating = AgeRating.objects.create( age_rating_id=1, api=self.api, - description='PG-13', + codi='PG-13', age=13 ) def test_age_rating_creation(self): - self.assertEqual(self.age_rating.description, 'PG-13') + self.assertEqual(self.age_rating.codi, 'PG-13') self.assertEqual(self.age_rating.age, 13) def test_age_rating_str(self): self.assertEqual(str(self.age_rating), 'PG-13') + def test_age_rating_description_property(self): + self.assertEqual(self.age_rating.description, 'PG-13') + def test_age_rating_unique_together(self): with self.assertRaises(Exception): AgeRating.objects.create( age_rating_id=1, api=self.api, - description='Duplicate', + codi='Duplicate', age=13 ) -class MovieTest(TestCase): +class ContingutTest(TestCase): def setUp(self): self.api = API.objects.create(port=8000, name='Netflix') self.genre = Genre.objects.create(genre_id=1, api=self.api, name='Action') @@ -115,57 +118,72 @@ def setUp(self): birth_date=timezone.now(), country='US' ) self.age_rating = AgeRating.objects.create( - age_rating_id=1, api=self.api, description='PG', age=10 + age_rating_id=1, api=self.api, codi='PG', age=10 ) - self.movie = Movie.objects.create( - movie_id=1, - api=self.api, - title='Inception', - genre=self.genre, + self.contingut = Contingut.objects.create( + api_content_id=1, + titol='Inception', + data_estrena=2010, director=self.director, + genere=self.genre, age_rating=self.age_rating, - year=2010, + api=self.api, rating=8.8 ) + def test_contingut_creation(self): + self.assertEqual(self.contingut.titol, 'Inception') + self.assertEqual(self.contingut.data_estrena, 2010) + self.assertEqual(self.contingut.rating, 8.8) + + def test_contingut_str(self): + self.assertEqual(str(self.contingut), 'Inception') + + +class MovieTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8000, name='Netflix') + self.genre = Genre.objects.create(genre_id=1, api=self.api, name='Action') + self.director = Director.objects.create( + director_id=1, api=self.api, name='Director', + birth_date=timezone.now(), country='US' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=1, api=self.api, codi='PG', age=10 + ) + self.contingut1 = Contingut.objects.create( + api_content_id=1, titol='Inception', data_estrena=2010, + director=self.director, genere=self.genre, age_rating=self.age_rating, + api=self.api, rating=8.8 + ) + self.movie = Movie.objects.create(contingut=self.contingut1) + def test_movie_creation(self): - self.assertEqual(self.movie.title, 'Inception') - self.assertEqual(self.movie.year, 2010) - self.assertEqual(self.movie.rating, 8.8) + self.assertEqual(self.movie.contingut, self.contingut1) def test_movie_str(self): self.assertEqual(str(self.movie), 'Inception') - def test_movie_unique_together(self): - with self.assertRaises(Exception): - Movie.objects.create( - movie_id=1, - api=self.api, - title='Duplicate', - genre=self.genre, - director=self.director, - age_rating=self.age_rating - ) + def test_movie_title_property(self): + self.assertEqual(self.movie.title, 'Inception') - def test_get_similar_by_genre(self): - Movie.objects.create( - movie_id=2, api=self.api, title='Action Movie 2', - genre=self.genre, director=self.director, age_rating=self.age_rating - ) - Movie.objects.create( - movie_id=3, api=self.api, title='Action Movie 3', - genre=self.genre, director=self.director, age_rating=self.age_rating - ) - similar = self.movie.get_similar_by_genre() - self.assertEqual(similar.count(), 2) + def test_movie_year_property(self): + self.assertEqual(self.movie.year, 2010) - def test_get_similar_by_genre_no_genre(self): - movie_no_genre = Movie.objects.create( - movie_id=4, api=self.api, title='No Genre', - director=self.director, age_rating=self.age_rating - ) - similar = movie_no_genre.get_similar_by_genre() - self.assertEqual(similar.count(), 0) + def test_movie_genre_property(self): + self.assertEqual(self.movie.genre, self.genre) + + def test_movie_director_property(self): + self.assertEqual(self.movie.director, self.director) + + def test_movie_age_rating_property(self): + self.assertEqual(self.movie.age_rating, self.age_rating) + + def test_movie_synopsis_property(self): + self.assertIsNone(self.movie.synopsis) + + def test_movie_rating_property(self): + self.assertEqual(self.movie.rating, 8.8) class SeriesTest(TestCase): @@ -177,43 +195,39 @@ def setUp(self): birth_date=timezone.now(), country='US' ) self.age_rating = AgeRating.objects.create( - age_rating_id=2, api=self.api, description='TV-MA', age=17 + age_rating_id=2, api=self.api, codi='TV-MA', age=17 ) - self.series = Series.objects.create( - series_id=1, - api=self.api, - title='Breaking Bad', - genre=self.genre, - director=self.director, - age_rating=self.age_rating, - start_year=2008, - end_year=2013, - total_seasons=5, - rating=9.5 + self.contingut2 = Contingut.objects.create( + api_content_id=2, titol='Breaking Bad', data_estrena=2008, + director=self.director, genere=self.genre, age_rating=self.age_rating, + api=self.api, rating=9.5 ) + self.series = Series.objects.create(contingut=self.contingut2, num_temporades=5) def test_series_creation(self): - self.assertEqual(self.series.title, 'Breaking Bad') - self.assertEqual(self.series.start_year, 2008) - self.assertEqual(self.series.end_year, 2013) - self.assertEqual(self.series.total_seasons, 5) + self.assertEqual(self.series.contingut, self.contingut2) + self.assertEqual(self.series.num_temporades, 5) def test_series_str(self): self.assertEqual(str(self.series), 'Breaking Bad') + def test_series_title_property(self): + self.assertEqual(self.series.title, 'Breaking Bad') + def test_series_year_property(self): self.assertEqual(self.series.year, 2008) - def test_series_unique_together(self): - with self.assertRaises(Exception): - Series.objects.create( - series_id=1, - api=self.api, - title='Duplicate', - genre=self.genre, - director=self.director, - age_rating=self.age_rating - ) + def test_series_start_year_property(self): + self.assertEqual(self.series.start_year, 2008) + + def test_series_end_year_property(self): + self.assertIsNone(self.series.end_year) + + def test_series_genre_property(self): + self.assertEqual(self.series.genre, self.genre) + + def test_series_total_seasons_property(self): + self.assertEqual(self.series.total_seasons, 5) class CustomUserTest(TestCase): @@ -227,31 +241,35 @@ def test_user_str(self): user = CustomUser.objects.create_user(username='testuser2', password='password123') self.assertEqual(str(user), 'testuser2') + def test_user_type_default(self): + user = CustomUser.objects.create_user(username='testuser3', password='password123') + self.assertEqual(user.type, 'Consumer') + class UserProfileTest(TestCase): def setUp(self): self.user = CustomUser.objects.create_user(username='profileuser', password='password123') - self.api = API.objects.create(port=8003, name='Prime') self.profile = self.user.profile def test_profile_creation(self): self.assertEqual(self.profile.user, self.user) self.assertEqual(str(self.profile), 'Perfil de profileuser') - def test_profile_favorite_movies(self): + def test_profile_preferits(self): + api = API.objects.create(port=8003, name='Prime') director = Director.objects.create( - director_id=3, api=self.api, name='Dir', + director_id=3, api=api, name='Dir', birth_date=timezone.now(), country='US' ) age_rating = AgeRating.objects.create( - age_rating_id=3, api=self.api, description='G', age=0 + age_rating_id=3, api=api, codi='G', age=0 ) - movie = Movie.objects.create( - movie_id=5, api=self.api, title='Fav Movie', - director=director, age_rating=age_rating + contingut = Contingut.objects.create( + api_content_id=3, titol='Fav Content', director=director, + age_rating=age_rating, api=api ) - self.profile.favorite_movies.add(movie) - self.assertIn(movie, self.profile.favorite_movies.all()) + self.profile.preferits.add(contingut) + self.assertIn(contingut, self.profile.preferits.all()) class SyncLogTest(TestCase): diff --git a/tests/test_views.py b/tests/test_views.py index b95395a..d2a06f1 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -2,7 +2,7 @@ from django.urls import reverse from django.utils import timezone from django.contrib.auth import get_user_model -from web_app.models import API, Director, Genre, AgeRating, Movie, Series, UserProfile +from web_app.models import API, Director, Genre, AgeRating, Contingut, Movie, Series, UserProfile import io from PIL import Image @@ -18,6 +18,19 @@ def create_test_image(): return buffer +def create_contingut(api=None, genre=None, director=None, age_rating=None, title='Test', year=2020): + """Helper para crear Contingut con datos por defecto.""" + return Contingut.objects.create( + api_content_id=100 + Contingut.objects.count(), + titol=title, + data_estrena=year, + director=director, + genere=genre, + age_rating=age_rating, + api=api + ) + + class HomeViewTest(TestCase): def setUp(self): self.api = API.objects.create(port=8000, name='Netflix') @@ -27,17 +40,18 @@ def setUp(self): birth_date=timezone.now(), country='US' ) self.age_rating = AgeRating.objects.create( - age_rating_id=1, api=self.api, description='PG', age=10 + age_rating_id=1, api=self.api, codi='PG', age=10 ) - self.movie = Movie.objects.create( - movie_id=1, api=self.api, title='Movie One', - genre=self.genre, director=self.director, age_rating=self.age_rating, year=2020 + self.contingut_movie = create_contingut( + api=self.api, genre=self.genre, director=self.director, + age_rating=self.age_rating, title='Movie One', year=2020 ) - self.series = Series.objects.create( - series_id=1, api=self.api, title='Series One', - genre=self.genre, director=self.director, age_rating=self.age_rating, - start_year=2020, total_seasons=3 + self.movie = Movie.objects.create(contingut=self.contingut_movie) + self.contingut_series = create_contingut( + api=self.api, genre=self.genre, director=self.director, + age_rating=self.age_rating, title='Series One', year=2020 ) + self.series = Series.objects.create(contingut=self.contingut_series, num_temporades=3) # ------------------------------------------------------------------ # # HOME - BÁSICO # @@ -104,17 +118,32 @@ def test_home_age_rating_filter(self): response = self.client.get(reverse('home'), {'age_rating': 'PG'}) self.assertEqual(len(response.context['items']), 2) + # ------------------------------------------------------------------ # + # HOME - FILTRO POR PLATAFORMA # + # ------------------------------------------------------------------ # + + def test_home_platform_filter(self): + """Comprueba que el filtro por plataforma (API port) devuelve solo contenido de esa API.""" + response = self.client.get(reverse('home'), {'platform': '8000'}) + self.assertEqual(len(response.context['items']), 2) + + def test_home_platform_filter_no_results(self): + """Comprueba que un port inexistente no devuelve resultados.""" + response = self.client.get(reverse('home'), {'platform': '9999'}) + self.assertEqual(len(response.context['items']), 0) + # ------------------------------------------------------------------ # # HOME - PAGINACIÓN # # ------------------------------------------------------------------ # def test_home_pagination_page_1(self): - """Comprueba que la página 1 tiene como máximo 10 items y hay siguiente página.""" - for i in range(15): - Movie.objects.create( - movie_id=100 + i, api=self.api, title=f'Extra Movie {i}', - director=self.director, age_rating=self.age_rating, genre=self.genre, year=2020 + """Comprueba que la página 1 tiene como máximo 20 items y hay siguiente página.""" + for i in range(25): + cont = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title=f'Extra Movie {i}', year=2020 ) + Movie.objects.create(contingut=cont) response = self.client.get(reverse('home')) page_obj = response.context['items'] self.assertTrue(page_obj.has_next()) @@ -122,11 +151,12 @@ def test_home_pagination_page_1(self): def test_home_pagination_page_2(self): """Comprueba que se puede acceder a la segunda página de resultados.""" - for i in range(15): - Movie.objects.create( - movie_id=100 + i, api=self.api, title=f'Extra Movie {i}', - director=self.director, age_rating=self.age_rating, genre=self.genre, year=2020 + for i in range(25): + cont = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title=f'Extra Movie {i}', year=2020 ) + Movie.objects.create(contingut=cont) response = self.client.get(reverse('home'), {'page': 2}) page_obj = response.context['items'] self.assertTrue(page_obj.has_previous()) @@ -247,12 +277,13 @@ def setUp(self): birth_date=timezone.now(), country='US' ) self.age_rating = AgeRating.objects.create( - age_rating_id=2, api=self.api, description='PG-13', age=13 + age_rating_id=2, api=self.api, codi='PG-13', age=13 ) - self.movie = Movie.objects.create( - movie_id=2, api=self.api, title='Test Movie', - director=self.director, age_rating=self.age_rating, year=2021 + self.contingut = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title='Test Movie', year=2021 ) + self.movie = Movie.objects.create(contingut=self.contingut) self.user = CustomUser.objects.create_user(username='movieuser', password='password123') def test_movie_detail_status_code(self): @@ -284,7 +315,7 @@ def test_movie_detail_not_favorite_for_anonymous(self): def test_movie_detail_favorite_for_authenticated(self): """Comprueba que un usuario autenticado con la peli en favoritos ve is_favorite=True.""" self.client.login(username='movieuser', password='password123') - self.user.profile.favorite_movies.add(self.movie) + self.user.profile.preferits.add(self.movie.contingut) response = self.client.get(reverse('movie_detail', args=[self.movie.id])) self.assertTrue(response.context['is_favorite']) @@ -297,13 +328,13 @@ def setUp(self): birth_date=timezone.now(), country='UK' ) self.age_rating = AgeRating.objects.create( - age_rating_id=3, api=self.api, description='TV-MA', age=17 + age_rating_id=3, api=self.api, codi='TV-MA', age=17 ) - self.series = Series.objects.create( - series_id=2, api=self.api, title='Test Series', - director=self.director, age_rating=self.age_rating, - start_year=2019, total_seasons=4 + self.contingut = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title='Test Series', year=2019 ) + self.series = Series.objects.create(contingut=self.contingut, num_temporades=4) self.user = CustomUser.objects.create_user(username='seriesuser', password='password123') def test_series_detail_status_code(self): @@ -335,7 +366,7 @@ def test_series_detail_not_favorite_for_anonymous(self): def test_series_detail_favorite_for_authenticated(self): """Comprueba que un usuario autenticado con la serie en favoritos ve is_favorite=True.""" self.client.login(username='seriesuser', password='password123') - self.user.profile.favorite_series.add(self.series) + self.user.profile.preferits.add(self.series.contingut) response = self.client.get(reverse('series_detail', args=[self.series.id])) self.assertTrue(response.context['is_favorite']) @@ -353,6 +384,22 @@ def test_api_profile_redirects_if_not_authenticated(self): self.assertEqual(response.status_code, 302) self.assertIn('/login/', response.url) + def test_api_profile_returns_json(self): + """Comprueba que la respuesta es JSON válido.""" + self.client.login(username='apiuser', password='password123') + response = self.client.get(reverse('api_user_profile')) + self.assertEqual(response.status_code, 200) + self.assertEqual(response['Content-Type'], 'application/json') + + def test_api_profile_data(self): + """Comprueba que el JSON contiene los datos personales del usuario.""" + self.client.login(username='apiuser', password='password123') + data = self.client.get(reverse('api_user_profile')).json() + self.assertEqual(data['personal_info']['username'], 'apiuser') + self.assertEqual(data['personal_info']['email'], 'api@mail.com') + self.assertEqual(data['personal_info']['first_name'], 'John') + self.assertEqual(data['personal_info']['last_name'], 'Doe') + class ToggleMovieFavoriteTest(TestCase): def setUp(self): @@ -362,12 +409,13 @@ def setUp(self): birth_date=timezone.now(), country='ES' ) self.age_rating = AgeRating.objects.create( - age_rating_id=4, api=self.api, description='G', age=0 + age_rating_id=4, api=self.api, codi='G', age=0 ) - self.movie = Movie.objects.create( - movie_id=3, api=self.api, title='Fav Movie', - director=self.director, age_rating=self.age_rating, year=2022 + self.contingut = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title='Fav Movie', year=2022 ) + self.movie = Movie.objects.create(contingut=self.contingut) self.user = CustomUser.objects.create_user(username='favuser', password='password123') def test_toggle_redirects_if_not_authenticated(self): @@ -383,16 +431,16 @@ def test_toggle_add_favorite(self): self.assertEqual(response.status_code, 200) data = response.json() self.assertEqual(data['status'], 'added') - self.assertIn(self.movie, self.user.profile.favorite_movies.all()) + self.assertIn(self.movie.contingut, self.user.profile.preferits.all()) def test_toggle_remove_favorite(self): """Comprueba que POST quita la película de favoritos y devuelve status 'removed'.""" self.client.login(username='favuser', password='password123') - self.user.profile.favorite_movies.add(self.movie) + self.user.profile.preferits.add(self.movie.contingut) response = self.client.post(reverse('toggle_movie_favorite', args=[self.movie.id])) data = response.json() self.assertEqual(data['status'], 'removed') - self.assertNotIn(self.movie, self.user.profile.favorite_movies.all()) + self.assertNotIn(self.movie.contingut, self.user.profile.preferits.all()) def test_toggle_get_method_not_allowed(self): """Comprueba que GET devuelve 405 (solo se permite POST).""" @@ -415,13 +463,13 @@ def setUp(self): birth_date=timezone.now(), country='FR' ) self.age_rating = AgeRating.objects.create( - age_rating_id=5, api=self.api, description='PG', age=7 + age_rating_id=5, api=self.api, codi='PG', age=7 ) - self.series = Series.objects.create( - series_id=3, api=self.api, title='Fav Series', - director=self.director, age_rating=self.age_rating, - start_year=2021, total_seasons=2 + self.contingut = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title='Fav Series', year=2021 ) + self.series = Series.objects.create(contingut=self.contingut, num_temporades=2) self.user = CustomUser.objects.create_user(username='favseriesuser', password='password123') def test_toggle_series_redirects_if_not_authenticated(self): @@ -436,16 +484,16 @@ def test_toggle_series_add_favorite(self): response = self.client.post(reverse('toggle_series_favorite', args=[self.series.id])) data = response.json() self.assertEqual(data['status'], 'added') - self.assertIn(self.series, self.user.profile.favorite_series.all()) + self.assertIn(self.series.contingut, self.user.profile.preferits.all()) def test_toggle_series_remove_favorite(self): """Comprueba que POST quita la serie de favoritos y devuelve status 'removed'.""" self.client.login(username='favseriesuser', password='password123') - self.user.profile.favorite_series.add(self.series) + self.user.profile.preferits.add(self.series.contingut) response = self.client.post(reverse('toggle_series_favorite', args=[self.series.id])) data = response.json() self.assertEqual(data['status'], 'removed') - self.assertNotIn(self.series, self.user.profile.favorite_series.all()) + self.assertNotIn(self.series.contingut, self.user.profile.preferits.all()) def test_toggle_series_get_method_not_allowed(self): """Comprueba que GET devuelve 405 (solo se permite POST).""" @@ -505,6 +553,8 @@ def test_profile_post_updates_user(self): 'username': 'profileuser', 'first_name': 'Updated', 'last_name': 'Name', + 'email': 'prof@mail.com', + 'type': 'Consumer', }) self.user.refresh_from_db() self.assertEqual(self.user.first_name, 'Updated') @@ -519,6 +569,8 @@ def test_profile_post_with_avatar(self): response = self.client.post(reverse('profile'), { 'username': 'profileuser', 'first_name': 'WithAvatar', + 'email': 'prof@mail.com', + 'type': 'Consumer', }, files={'avatar': img}) self.user.refresh_from_db() self.assertEqual(self.user.first_name, 'WithAvatar') @@ -533,12 +585,13 @@ def setUp(self): birth_date=timezone.now(), country='US' ) self.age_rating = AgeRating.objects.create( - age_rating_id=6, api=self.api, description='R', age=18 + age_rating_id=6, api=self.api, codi='R', age=18 ) - Movie.objects.create( - movie_id=4, api=self.api, title='History Movie', - director=self.director, age_rating=self.age_rating, year=2019 + cont = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title='History Movie', year=2019 ) + Movie.objects.create(contingut=cont) def test_history_redirects_if_not_authenticated(self): """Comprueba que redirige a login si no está autenticado.""" @@ -583,17 +636,18 @@ def setUp(self): birth_date=timezone.now(), country='DE' ) self.age_rating = AgeRating.objects.create( - age_rating_id=7, api=self.api, description='PG', age=10 + age_rating_id=7, api=self.api, codi='PG', age=10 ) - self.movie = Movie.objects.create( - movie_id=5, api=self.api, title='Follow Movie', - director=self.director, age_rating=self.age_rating, year=2020 + self.contingut_movie = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title='Follow Movie', year=2020 ) - self.series = Series.objects.create( - series_id=4, api=self.api, title='Follow Series', - director=self.director, age_rating=self.age_rating, - start_year=2020, total_seasons=1 + self.movie = Movie.objects.create(contingut=self.contingut_movie) + self.contingut_series = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title='Follow Series', year=2020 ) + self.series = Series.objects.create(contingut=self.contingut_series, num_temporades=1) def test_followed_redirects_if_not_authenticated(self): """Comprueba que redirige a login si no está autenticado.""" @@ -614,10 +668,10 @@ def test_followed_template(self): self.assertTemplateUsed(response, 'users/parts/followed.html') def test_followed_shows_favorites(self): - """Comprueba que el contexto muestra las películas y series marcadas como favoritas.""" + """Comprueba que el contexto muestra los contenidos marcados como favoritos.""" self.client.login(username='followuser', password='password123') - self.user.profile.favorite_movies.add(self.movie) - self.user.profile.favorite_series.add(self.series) + self.user.profile.preferits.add(self.contingut_movie) + self.user.profile.preferits.add(self.contingut_series) response = self.client.get(reverse('followed')) self.assertIn(self.movie, response.context['movies']) self.assertIn(self.series, response.context['series_list']) diff --git a/users/views.py b/users/views.py index 29b78ae..55ee75c 100644 --- a/users/views.py +++ b/users/views.py @@ -1,7 +1,7 @@ from django.shortcuts import render, redirect from django.contrib import messages from web_app.forms import CustomUserChangeForm -from web_app.models import Movie +from web_app.models import Movie, Series, Contingut # Create your views here. def profile(request): @@ -28,12 +28,10 @@ def history(request): def followed(request): if not request.user.is_authenticated: return redirect('login') - try: - movies = request.user.profile.favorite_movies.all() - series_list = request.user.profile.favorite_series.all() - except: - movies = [] - series_list = [] + profile, _ = request.user.profile, True + preferits_ids = profile.preferits.values_list('id', flat=True) + movies = Movie.objects.filter(contingut_id__in=preferits_ids) + series_list = Series.objects.filter(contingut_id__in=preferits_ids) return render(request, 'users/parts/followed.html', {'movies': movies, 'series_list': series_list}) diff --git a/web_app/views.py b/web_app/views.py index f48d6cd..373e140 100644 --- a/web_app/views.py +++ b/web_app/views.py @@ -35,8 +35,8 @@ def home(request): series = series.filter(contingut__age_rating__codi=age_rating_filter) if platform_filter: - movies = movies.filter(api__port=platform_filter) - series = series.filter(api__port=platform_filter) + movies = movies.filter(contingut__api__port=platform_filter) + series = series.filter(contingut__api__port=platform_filter) unique_results = [] seen_keys = set() From 76ba17490804528b6cd44faf7b068465a791ab22 Mon Sep 17 00:00:00 2001 From: gerard Date: Fri, 8 May 2026 21:05:11 +0200 Subject: [PATCH 037/100] feat(data-base): add the visualitzations table --- web_app/models.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/web_app/models.py b/web_app/models.py index 6ebaa32..3573e75 100644 --- a/web_app/models.py +++ b/web_app/models.py @@ -233,7 +233,22 @@ def __str__(self): return f"{self.user.username} -> {self.contingut.titol} ({self.puntuacio}/5)" +class Visualitzacio(models.Model): + user = models.ForeignKey(CustomUser, on_delete=models.SET_NULL, null=True, blank=True, related_name='visualitzacions') + contingut = models.ForeignKey(Contingut, on_delete=models.CASCADE, related_name='visualitzacions') + data_visualitzacio = models.DateTimeField(auto_now_add=True) + + class Meta: + verbose_name = 'Visualització' + verbose_name_plural = 'Visualitzacions' + + def __str__(self): + user_str = self.user.username if self.user else "Anònim" + return f"{user_str} -> {self.contingut.titol} ({self.data_visualitzacio})" + + class SyncLog(models.Model): + """ Records the operational status and statistical summary of background synchronization processes, tracking the total number of created and updated database records. From 5644f8d2d9d0cde8f7bdd9def9036d5cb6684035 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Fri, 8 May 2026 21:42:53 +0200 Subject: [PATCH 038/100] merged with dev to allow PR deploy preview --- web_app/migrations/0002_visualitzacio.py | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 web_app/migrations/0002_visualitzacio.py diff --git a/web_app/migrations/0002_visualitzacio.py b/web_app/migrations/0002_visualitzacio.py new file mode 100644 index 0000000..7d03775 --- /dev/null +++ b/web_app/migrations/0002_visualitzacio.py @@ -0,0 +1,28 @@ +# Generated by Django 6.0.3 on 2026-05-08 19:41 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('web_app', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Visualitzacio', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('data_visualitzacio', models.DateTimeField(auto_now_add=True)), + ('contingut', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='visualitzacions', to='web_app.contingut')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='visualitzacions', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'verbose_name': 'Visualització', + 'verbose_name_plural': 'Visualitzacions', + }, + ), + ] From ccc1614c4766247786ae1790144ec8a9858aba15 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Fri, 8 May 2026 21:57:00 +0200 Subject: [PATCH 039/100] added --fake-initial to decrease migrate conflicts --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f1728a7..3f87cfc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ EXPOSE 8000 RUN python manage.py collectstatic --noinput -CMD python3 manage.py migrate && python3 manage.py runserver 0.0.0.0:8000 +CMD python3 manage.py migrate --fake-initial && python3 manage.py runserver 0.0.0.0:8000 From d9096d9aa3aef929fc142384e1f9f97e636a7fdc Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Fri, 8 May 2026 22:16:23 +0200 Subject: [PATCH 040/100] refactor: changed trusted urls from render --- web/settings.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/web/settings.py b/web/settings.py index 6217d14..16deab6 100644 --- a/web/settings.py +++ b/web/settings.py @@ -30,13 +30,18 @@ # SECURITY WARNING: don't run with debug turned on in production! DEBUG = os.environ.get('DJANGO_DEBUG', 'True') == 'True' -ALLOWED_HOSTS = ['joinproject-23y7.onrender.com', 'joinproject-1.onrender.com', '127.0.0.1', 'localhost'] +render_host = os.environ.get('RENDER_EXTERNAL_HOSTNAME') +ALLOWED_HOSTS = ['127.0.0.1', 'localhost'] + + +if render_host: + ALLOWED_HOSTS.append(render_host) if not DEBUG: - CSRF_TRUSTED_ORIGINS = [ - 'https://joinproject-23y7.onrender.com', - 'https://joinproject-1.onrender.com', - ] + if render_host: + CSRF_TRUSTED_ORIGINS = [ + f'https://{render_host}', + ] # Application definition From 7d8d38a3941fabb74e7a9a8f281966b8ea28ef94 Mon Sep 17 00:00:00 2001 From: gerard Date: Sat, 9 May 2026 11:21:02 +0200 Subject: [PATCH 041/100] feat(export-csv): add the logic to create the csv data --- users/services.py | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 users/services.py diff --git a/users/services.py b/users/services.py new file mode 100644 index 0000000..9e583d9 --- /dev/null +++ b/users/services.py @@ -0,0 +1,52 @@ +import hashlib +from django.db.models import Count, Q +from web_app.models import Contingut, Visualitzacio, Preferits + +def get_content_analytics(start_date=None, end_date=None, plataform_id=None): + + queryset = Contingut.objects.select_related('genere', 'age_rating', 'api', 'director') + + filters = Q() + if start_date and end_date: + filters &= Q(visualitzacions__data_visualitzacio__range=(start_date,end_date)) + filters &= Q(preferits__afegit_a__range=(start_date,end_date)) + + if plataform_id: + filters &= Q(api__id=plataform_id) + + analytics_data = queryset.filter(filters).annotate( + total_views=Count('visualitzacions', distinct=True), + total_favorites=Count('preferits', distinct=True) + ) + + results = [] + + for item in analytics_data: + results.append( + { + 'title': item.titol, + 'genre': item.genere if item.genere else 'N/A', + 'age_rating': item.age_rating.codi if item.age_rating else 'N/A', + 'year': item.data_estrena, + 'director': item.director.name if item.director else 'N/A', + 'platform': item.api.name if item.api else 'N/A', + 'views': item.total_views, + 'favorites': item.total_favorites, + } + ) + return results + +def format_analytics_for_csv (data_list, is_b2b_report = False): + formatted_data = [] + for row in data_list: + if is_b2b_report: + if 'username' in row and row['username']: + user_hash = hashlib.sha256(row['username'].encode()).hexdigest()[:10] + row['username'] = f"USER_{user_hash}" + + row.pop('email', None) + row.pop('id_address', None) + + formatted_data.append(row) + + return formatted_data \ No newline at end of file From efed7f573a263954a94f666feb2676322d9bb218 Mon Sep 17 00:00:00 2001 From: gerard Date: Sat, 9 May 2026 11:22:00 +0200 Subject: [PATCH 042/100] feat(export): add the logic to download the csv --- users/urls.py | 3 ++- users/views.py | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/users/urls.py b/users/urls.py index d937166..d8bccb2 100644 --- a/users/urls.py +++ b/users/urls.py @@ -5,5 +5,6 @@ path('user/profile', views.profile, name='profile'), path('user/history', views.history, name='history'), path('user/subscription', views.subscription, name='suscription'), - path('user/followed', views.followed, name='followed') + path('user/followed', views.followed, name='followed'), + path('admin/export', views.export_analytics_csv, name='export_csv') ] \ No newline at end of file diff --git a/users/views.py b/users/views.py index 29b78ae..4907091 100644 --- a/users/views.py +++ b/users/views.py @@ -1,3 +1,7 @@ +import csv +from django.http import HttpResponse +from django.contrib.auth.decorators import login_required, user_passes_test +from .services import get_content_analytics, format_analytics_for_csv from django.shortcuts import render, redirect from django.contrib import messages from web_app.forms import CustomUserChangeForm @@ -56,4 +60,40 @@ def subscription(request): return render(request, 'users/parts/subscription.html', { 'all_apis': all_apis, 'user_subscription_ids': user_subscription_ids, - }) \ No newline at end of file + }) + +def is_admin_or_staff(user): + return user.is_staff or user.type == 'Admin' + +@login_required +@user_passes_test(is_admin_or_staff) +def export_analytics_csv(request): + platform_id = request.GET.get('platform') + start_date = request.GET.get('start') + end_date = request.GET.get('end') + report_type = request.GET.get('type', 'internal') + + raw_data = get_content_analytics( + start_date=start_date, + end_date=end_date, + plataform_id=platform_id + ) + + is_b2b = (report_type == 'b2b') + clean_data = format_analytics_for_csv(raw_data, is_b2b_report=is_b2b) + + response = HttpResponse(content_type='text/csv') + response['Content-Disposition'] = 'attachment; filename="analytics_report.csv"' + + writer = csv.writer(response) + + writer.writerow(['Title', 'Genre', 'Age Rating', 'Year', 'Director', 'Platform', 'Total Views', 'Total Favorites']) + + for item in clean_data: + writer.writerow([ + item['title'], item['genre'], item['age_rating'], + item['year'], item['director'], item['platform'], + item['views'], item['favorites'] + ]) + + return response From 24491fd3f0f4664a8a6a4dc0ddf929825c3210fc Mon Sep 17 00:00:00 2001 From: gerard Date: Mon, 11 May 2026 11:03:06 +0200 Subject: [PATCH 043/100] refactor(views): login requiret refactored and imports --- users/views.py | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/users/views.py b/users/views.py index 7127e22..7c7b44e 100644 --- a/users/views.py +++ b/users/views.py @@ -5,12 +5,11 @@ from django.shortcuts import render, redirect from django.contrib import messages from web_app.forms import CustomUserChangeForm -from web_app.models import Movie, Series, Contingut +from web_app.models import Movie, Series, Contingut, API # Create your views here. +@login_required(login_url='login') def profile(request): - if not request.user.is_authenticated: - return redirect('login') if request.method == 'POST': form = CustomUserChangeForm(request.POST, request.FILES, instance=request.user) @@ -23,36 +22,28 @@ def profile(request): return render(request, 'users/profile/profile.html', {'form': form}) +@login_required(login_url='login') def history(request): - if not request.user.is_authenticated: - return redirect('login') movies = Movie.objects.all() return render(request, 'users/parts/history.html', {'movies': movies}) +@login_required(login_url='login') def followed(request): - if not request.user.is_authenticated: - return redirect('login') profile, _ = request.user.profile, True preferits_ids = profile.preferits.values_list('id', flat=True) movies = Movie.objects.filter(contingut_id__in=preferits_ids) series_list = Series.objects.filter(contingut_id__in=preferits_ids) return render(request, 'users/parts/followed.html', {'movies': movies, 'series_list': series_list}) - +@login_required(login_url='login') def subscription(request): - if not request.user.is_authenticated: - return redirect('login') - - from web_app.models import API - from django.contrib import messages as django_messages - all_apis = API.objects.all().order_by('port') user_subscription_ids = set(request.user.subscriptions.values_list('id', flat=True)) if request.method == 'POST': selected_ids = request.POST.getlist('subscriptions') request.user.subscriptions.set(API.objects.filter(id__in=selected_ids)) - django_messages.success(request, '¡Suscripciones actualizadas correctamente!') + messages.success(request, '¡Suscripciones actualizadas correctamente!') return redirect('suscription') return render(request, 'users/parts/subscription.html', { @@ -63,7 +54,7 @@ def subscription(request): def is_admin_or_staff(user): return user.is_staff or user.type == 'Admin' -@login_required +@login_required(login_url='login') @user_passes_test(is_admin_or_staff) def export_analytics_csv(request): platform_id = request.GET.get('platform') @@ -95,3 +86,9 @@ def export_analytics_csv(request): ]) return response + + +@login_required(login_url='login') +@user_passes_test(is_admin_or_staff) +def hola(request): + pass \ No newline at end of file From 9af0adbca799706f48d4aec95e0cbb27e1ecb792 Mon Sep 17 00:00:00 2001 From: gerard Date: Mon, 11 May 2026 12:44:19 +0200 Subject: [PATCH 044/100] feat(login-redirection): implement dynamic redirection based on user roles after login --- web/settings.py | 2 +- web_app/urls.py | 1 + web_app/views.py | 11 +++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/web/settings.py b/web/settings.py index 16deab6..3a1dc7b 100644 --- a/web/settings.py +++ b/web/settings.py @@ -183,7 +183,7 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' -LOGIN_REDIRECT_URL = 'home' +LOGIN_REDIRECT_URL = 'go_to_dashboard' LOGOUT_REDIRECT_URL = 'home' AUTH_USER_MODEL = 'web_app.CustomUser' diff --git a/web_app/urls.py b/web_app/urls.py index 2272065..1a0087b 100644 --- a/web_app/urls.py +++ b/web_app/urls.py @@ -10,6 +10,7 @@ path("register/", views.register_view, name="register"), path("login/", auth_views.LoginView.as_view(template_name="identify/login.html"), name="login"), path("logout/", LogoutView.as_view(), name="logout"), + path('dashboard_redirect/', views.redirect_by_role, name='go_to_dashboard'), path("user_setting/", views.user_setting, name="user_setting"), path("movie//", views.movie_detail, name="movie_detail"), diff --git a/web_app/views.py b/web_app/views.py index 373e140..7c09f70 100644 --- a/web_app/views.py +++ b/web_app/views.py @@ -108,6 +108,17 @@ def register_view(request): return redirect('home') return render(request, 'identify/register.html', {'form': form}) +@login_required(login_url='login') +def redirect_by_role(request): + user = request.user + + if user.type == 'Admin': + return redirect('admin_dashboard') + elif user.type == 'Staff': + pass + elif user.type == 'Consumer': + return redirect('home') + def user_setting(request): if not request.user.is_authenticated: From c4c4061edbe7969bb1f378c90cdc4bd3d9596a8f Mon Sep 17 00:00:00 2001 From: gerard Date: Mon, 11 May 2026 12:50:27 +0200 Subject: [PATCH 045/100] refactor(user_profile): chaged files name profile to user_profile, reafactores the name in other files and add some urls and new view --- Templates/base.html | 2 +- .../users/css/{profile.css => user_profile.css} | 0 .../profile/{profile.html => user_profile.html} | 2 +- users/templates/users/types/user_client.html | 2 +- users/urls.py | 4 +++- users/views.py | 12 ++++++++---- 6 files changed, 14 insertions(+), 8 deletions(-) rename users/static/users/css/{profile.css => user_profile.css} (100%) rename users/templates/users/profile/{profile.html => user_profile.html} (94%) diff --git a/Templates/base.html b/Templates/base.html index d405f5a..2e640fc 100644 --- a/Templates/base.html +++ b/Templates/base.html @@ -109,7 +109,7 @@ {% if user.is_authenticated %}
- + + + +
+ +
+
+ + + + + + + + + + + {% for u in users %} + + + + + + + {% empty %} + + + + {% endfor %} + +
{% trans 'Usuario' %}{% trans 'Email' %}{% trans 'Rol' %}{% trans 'Acciones' %}
+
+ + {{ u.username }} +
+ 		{{ u.email }} + {{ u.type }} + +
+ {% csrf_token %} + +
+
+ + {% trans 'No se han encontrado usuarios con estos criterios.' %} +
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/users/templates/users/types/user_client.html b/users/templates/users/types/user_client.html index 86aa202..fee0c0e 100644 --- a/users/templates/users/types/user_client.html +++ b/users/templates/users/types/user_client.html @@ -21,6 +21,10 @@ {% trans 'Followed' %} +
  • + {% trans 'Gestion Usuarios' %} +
    • diff --git a/users/urls.py b/users/urls.py index d937166..280f891 100644 --- a/users/urls.py +++ b/users/urls.py @@ -5,5 +5,8 @@ path('user/profile', views.profile, name='profile'), path('user/history', views.history, name='history'), path('user/subscription', views.subscription, name='suscription'), - path('user/followed', views.followed, name='followed') + path('user/followed', views.followed, name='followed'), + path('user/gestion', views.gestion_usuarios, name='gestion_usuarios'), + path('user/crear_admin', views.crear_usuario_admin, name='crear_usuario_admin'), + path('user/eliminar/', views.eliminar_usuario, name='eliminar_usuario'), ] \ No newline at end of file diff --git a/users/views.py b/users/views.py index 55ee75c..330c310 100644 --- a/users/views.py +++ b/users/views.py @@ -1,7 +1,15 @@ from django.shortcuts import render, redirect from django.contrib import messages from web_app.forms import CustomUserChangeForm -from web_app.models import Movie, Series, Contingut +from web_app.models import Movie, Series +from django.core.mail import send_mail +from django.conf import settings +from django.utils.crypto import get_random_string +from django.shortcuts import render, redirect, get_object_or_404 +from web_app.forms import CustomUserAdminCreationForm +from web_app.models import CustomUser, Movie, UserProfile, Series +from django.contrib.auth.decorators import login_required, user_passes_test +from django.contrib import messages # Create your views here. def profile(request): @@ -54,4 +62,64 @@ def subscription(request): return render(request, 'users/parts/subscription.html', { 'all_apis': all_apis, 'user_subscription_ids': user_subscription_ids, - }) \ No newline at end of file + }) + +@user_passes_test(lambda u: u.is_superuser) +def gestion_usuarios(request): + if not request.user.is_authenticated: + return redirect('login') + users = CustomUser.objects.all() + return render(request, 'users/parts/users_table.html', {'users': users}) + +@user_passes_test(lambda u: u.is_superuser) +def eliminar_usuario(request, user_id): + user = get_object_or_404(CustomUser, id=user_id) + if request.method == 'POST': + user.delete() + messages.success(request, f"Usuario '{user.username}' eliminado correctamente.") + return redirect('gestion_usuarios') + + +@user_passes_test(lambda u: u.is_superuser) +def crear_usuario_admin(request): + if request.method == 'POST': + form = CustomUserAdminCreationForm(request.POST) + if form.is_valid(): + user = form.save(commit=False) + + temp_password = get_random_string(length=12) + user.set_password(temp_password) + user.save() + + UserProfile.objects.get_or_create(user=user) + + asunto = 'Bienvenido a StreamSync - Tus Credenciales' + mensaje = f""" + Hola {user.username}, + + Se ha creado una cuenta para ti en StreamSync. + Aquí tienes tus credenciales de acceso: + + Usuario: {user.username} + Contraseña temporal: {temp_password} + + Por seguridad, te recomendamos cambiarla en tu perfil tras iniciar sesión. + """ + + try: + send_mail( + asunto, + mensaje, + settings.DEFAULT_FROM_EMAIL, + [user.email], + fail_silently=False, + ) + messages.success(request, f"Usuario creado y correo enviado a {user.email}") + except Exception as e: + messages.warning(request, "Usuario creado, pero hubo un error al enviar el correo.") + + return redirect('gestion_usuarios') + else: + form = CustomUserAdminCreationForm() + + return render(request, 'users/parts/create_user.html', {'form': form}) \ No newline at end of file diff --git a/web/settings.py b/web/settings.py index b79a580..fb3053e 100644 --- a/web/settings.py +++ b/web/settings.py @@ -186,3 +186,11 @@ LOGOUT_REDIRECT_URL = 'home' AUTH_USER_MODEL = 'web_app.CustomUser' + +EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' +EMAIL_HOST = 'smtp.gmail.com' +EMAIL_PORT = 587 +EMAIL_USE_TLS = True +EMAIL_HOST_USER = os.getenv('MAIL') +EMAIL_HOST_PASSWORD = os.getenv('MAIL_PW') +DEFAULT_FROM_EMAIL = f'StreamSync <{EMAIL_HOST_USER}>' \ No newline at end of file diff --git a/web_app/apps.py b/web_app/apps.py index 8dad7c0..723aa52 100644 --- a/web_app/apps.py +++ b/web_app/apps.py @@ -7,7 +7,10 @@ class WebAppConfig(AppConfig): def ready(self): import os import sys + from django.db.models.signals import post_migrate + post_migrate.connect(create_default_user, sender=self) + if any(cmd in sys.argv for cmd in ['collectstatic', 'migrate', 'makemigrations', 'check']): return @@ -18,4 +21,23 @@ def ready(self): from . import scheduler scheduler.start() except Exception as e: - print(f"Scheduler no pudo arrancar (ignorar si es build): {e}") \ No newline at end of file + print(f"Scheduler no pudo arrancar (ignorar si es build): {e}") + +def create_default_user(sender, **kwargs): + from django.contrib.auth import get_user_model + from .models import UserType + + User = get_user_model() + + username = 'admin' + email = 'admin@admin.com' + password = 'adminpassword' + + if not User.objects.filter(username=username).exists(): + User.objects.create_superuser( + username=username, + email=email, + password=password, + type=UserType.ADMIN # Usando tu clase UserType + ) + print(f"✅ Superusuario '{username}' creado correctamente.") \ No newline at end of file diff --git a/web_app/forms.py b/web_app/forms.py index 33e3da4..06a54f2 100644 --- a/web_app/forms.py +++ b/web_app/forms.py @@ -1,6 +1,6 @@ from django import forms from django.utils.translation import gettext_lazy as _ -from django.contrib.auth.forms import UserChangeForm +from django.contrib.auth.forms import UserChangeForm, UserCreationForm from django.core.exceptions import ValidationError from django.core.validators import MaxLengthValidator @@ -86,3 +86,27 @@ def clean_avatar(self): raise ValidationError('Solo se permiten archivos JPG o PNG.') return avatar + +class CustomUserAdminCreationForm(UserCreationForm): + class Meta: + model = CustomUser + fields = ("username", "email", "type", "location") + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + if 'password1' in self.fields: + del self.fields['password1'] + if 'password2' in self.fields: + del self.fields['password2'] + + def save(self, commit=True): + """ + Sobrescribimos save para evitar que Django busque 'password1'. + Simplemente creamos la instancia del modelo con los datos del form. + """ + # No llamamos a super().save() porque ahí es donde explota el KeyError + user = CustomUser(**self.cleaned_data) + if commit: + user.save() + return user \ No newline at end of file diff --git a/web_app/views.py b/web_app/views.py index 373e140..bd571e6 100644 --- a/web_app/views.py +++ b/web_app/views.py @@ -1,10 +1,14 @@ +from django.core.mail import send_mail +from django.conf import settings +from django.utils.crypto import get_random_string from django.shortcuts import render, redirect, get_object_or_404 -from web_app.forms import CustomUserCreationForm -from web_app.models import AgeRating, API, Director, Genre, Movie, UserProfile, Series, Contingut +from web_app.forms import CustomUserAdminCreationForm, CustomUserCreationForm +from web_app.models import AgeRating, API, CustomUser, Director, Genre, Movie, UserProfile, Series, Contingut from web_app import utils from itertools import chain from django.http import JsonResponse -from django.contrib.auth.decorators import login_required +from django.contrib.auth.decorators import login_required, user_passes_test +from django.contrib import messages from django.contrib.auth import login from django.core.paginator import Paginator From c4e2647ac69ea84bef61f72b10151647d52ae451 Mon Sep 17 00:00:00 2001 From: gerard Date: Wed, 13 May 2026 15:10:11 +0200 Subject: [PATCH 057/100] fix(filter-date): apply date filter when only one date is provided --- users/services.py | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/users/services.py b/users/services.py index f42bc24..3c54e46 100644 --- a/users/services.py +++ b/users/services.py @@ -1,15 +1,22 @@ import hashlib from django.db.models import Count, Q from web_app.models import Contingut, Visualitzacio, Preferits, API, Genre, AgeRating, Director +from django.utils import timezone def get_content_analytics(start_date=None, end_date=None, plataform_id=None): queryset = Contingut.objects.select_related('genere', 'age_rating', 'api', 'director') + if start_date and not end_date: + end_date = timezone.now().date() + filters = Q() if start_date and end_date: filters &= Q(visualitzacions__data_visualitzacio__range=(start_date,end_date)) filters &= Q(preferits__afegit_a__range=(start_date,end_date)) - + elif end_date: + filters &= Q(visualitzacions__data_visualitzacio__lte=end_date) + filters &= Q(preferits__afegit_a__lte=end_date) + if plataform_id: filters &= Q(api__id=plataform_id) @@ -51,9 +58,14 @@ def format_analytics_for_csv (data_list, is_b2b_report = False): return formatted_data def get_genre_distribution(start_date=None, end_date=None, platform_id=None): + if start_date and not end_date: + end_date = timezone.now().date() + filters = Q() if start_date and end_date: filters &= Q(visualitzacions__data_visualitzacio__range=(start_date,end_date)) + elif end_date: + filters &= Q(visualitzacions__data_visualitzacio__lte=end_date) if platform_id: filters &= Q(api__id=platform_id) @@ -67,9 +79,15 @@ def get_genre_distribution(start_date=None, end_date=None, platform_id=None): } def get_age_rating_distribution(start_date=None, end_date=None, platform_id=None): + if start_date and not end_date: + end_date = timezone.now().date() + filters = Q() if start_date and end_date: filters &= Q(visualitzacions__data_visualitzacio__range=(start_date,end_date)) + elif end_date: + filters &= Q(visualitzacions__data_visualitzacio__lte=end_date) + if platform_id: filters &= Q(api__id=platform_id) @@ -83,9 +101,15 @@ def get_age_rating_distribution(start_date=None, end_date=None, platform_id=None } def get_director_top_list(start_date=None, end_date=None, platform_id=None): + if start_date and not end_date: + end_date = timezone.now().date() + filters = Q() if start_date and end_date: filters &= Q(visualitzacions__data_visualitzacio__range=(start_date,end_date)) + elif end_date: + filters &= Q(visualitzacions__data_visualitzacio__lte=end_date) + if platform_id: filters &= Q(api__id=platform_id) From 2644508f4f19c01e4bc4e558cffcb6ad7db80e02 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 13 May 2026 18:55:24 +0200 Subject: [PATCH 058/100] fix(render): Making dynamic port asignment and use unicorn --- Dockerfile | 9 +++------ docker-compose.yml | 26 -------------------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f87cfc..fa55780 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM python:3.13-slim +FROM python:3.12-slim WORKDIR /app COPY ./requirements.txt /app/ -RUN pip install -r requirements.txt +RUN pip install --upgrade pip && pip install -r requirements.txt COPY . . @@ -12,7 +12,4 @@ EXPOSE 8000 RUN python manage.py collectstatic --noinput -CMD python3 manage.py migrate --fake-initial && python3 manage.py runserver 0.0.0.0:8000 - - - +CMD python3 -m pip install --no-cache-dir setuptools && python3 manage.py migrate --fake-initial && gunicorn web.wsgi:application --bind 0.0.0.0:${PORT:-8000} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 93e186c..e0f23a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,31 +1,5 @@ services: - db: - image: postgres:15 - restart: always - environment: - POSTGRES_DB: joinproject_db - POSTGRES_USER: mi_usuario - POSTGRES_PASSWORD: mi_password_seguro - ports: - - "6432:5432" - volumes: - - postgres_data:/var/lib/postgresql/data - # 1. Agrega esto para que Postgres reporte cuándo está listo - healthcheck: - test: ["CMD-SHELL", "pg_isready -U mi_usuario -d joinproject_db"] - interval: 5s - timeout: 5s - retries: 5 - join_p: build: . ports: - "8000:8000" - volumes: - - .:/app - depends_on: - db: - condition: service_healthy - -volumes: - postgres_data: \ No newline at end of file From 16d4d6a42b484e6442239d5e80b54a1cd4a7fdb5 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 13 May 2026 18:59:14 +0200 Subject: [PATCH 059/100] fix(render): Changing dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fa55780..7cf9c83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,4 +12,4 @@ EXPOSE 8000 RUN python manage.py collectstatic --noinput -CMD python3 -m pip install --no-cache-dir setuptools && python3 manage.py migrate --fake-initial && gunicorn web.wsgi:application --bind 0.0.0.0:${PORT:-8000} \ No newline at end of file +CMD python3 manage.py migrate --fake-initial && gunicorn web.wsgi:application --bind 0.0.0.0:${PORT:-8000} \ No newline at end of file From 3d9ad2e17ec417978dec3155ad97ccc4f4dbc473 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 13 May 2026 19:01:41 +0200 Subject: [PATCH 060/100] chore: added requirements on .txt --- requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2a43d98..032e602 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,4 +15,6 @@ tzlocal==5.3.1 urllib3==2.6.3 psycopg2-binary==2.9.10 Pillow==12.2.0 -whitenoise==6.4.0 \ No newline at end of file +whitenoise==6.4.0 +gunicorn==21.2.0 +setuptools==79.0.1 \ No newline at end of file From 19ecab66e5094f699c34c017390b9c8e40a0482a Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 13 May 2026 19:06:52 +0200 Subject: [PATCH 061/100] fix(render): Changing dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7cf9c83..3071054 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,4 +12,4 @@ EXPOSE 8000 RUN python manage.py collectstatic --noinput -CMD python3 manage.py migrate --fake-initial && gunicorn web.wsgi:application --bind 0.0.0.0:${PORT:-8000} \ No newline at end of file +CMD python3 manage.py migrate --fake-initial && gunicorn web.wsgi:application --bind 0.0.0.0:${PORT:-8000} --timeout 90 --workers 2 \ No newline at end of file From 25219a00f65bb2e8bb1b057d30486c5c3e598535 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 13 May 2026 19:13:45 +0200 Subject: [PATCH 062/100] refactor: changed app.py logic --- web_app/apps.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web_app/apps.py b/web_app/apps.py index 8dad7c0..824b8b4 100644 --- a/web_app/apps.py +++ b/web_app/apps.py @@ -1,21 +1,22 @@ from django.apps import AppConfig +import os +import sys class WebAppConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'web_app' def ready(self): - import os - import sys - if any(cmd in sys.argv for cmd in ['collectstatic', 'migrate', 'makemigrations', 'check']): return - if 'runserver' in sys.argv and os.environ.get('RUN_MAIN') != 'true': + if os.environ.get('RUN_MAIN') != 'true' and 'runserver' in sys.argv: return try: from . import scheduler - scheduler.start() + if not sys.stdin.isatty(): + scheduler.start() + print("Scheduler arrancado con éxito en producción.") except Exception as e: print(f"Scheduler no pudo arrancar (ignorar si es build): {e}") \ No newline at end of file From c47dc966eaa944df79beea3c818b926d3c8cd298 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 13 May 2026 19:16:32 +0200 Subject: [PATCH 063/100] refactor: changed scheduler logic --- web_app/scheduler.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/web_app/scheduler.py b/web_app/scheduler.py index df64a48..2e06b83 100644 --- a/web_app/scheduler.py +++ b/web_app/scheduler.py @@ -1,9 +1,6 @@ -from time import timezone - from apscheduler.schedulers.background import BackgroundScheduler from django_apscheduler.jobstores import DjangoJobStore from .services import download_catalog_data -import sys def start(): @@ -19,5 +16,6 @@ def start(): max_instances=1, replace_existing=True, ) - - scheduler.start() \ No newline at end of file + + if not scheduler.running: + scheduler.start() \ No newline at end of file From f1e43b9201b7c24545aa224b8bb3e7c2c45a86f8 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 13 May 2026 19:24:30 +0200 Subject: [PATCH 064/100] experimenting --- web_app/scheduler.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web_app/scheduler.py b/web_app/scheduler.py index 2e06b83..10e13b8 100644 --- a/web_app/scheduler.py +++ b/web_app/scheduler.py @@ -4,6 +4,7 @@ def start(): + return scheduler = BackgroundScheduler(timezone="Europe/Madrid") scheduler.add_jobstore(DjangoJobStore(), "default") From e28b2ed5ce0fc8170116e92e9a57be19c93cfa16 Mon Sep 17 00:00:00 2001 From: Karu174 Date: Wed, 13 May 2026 20:09:51 +0200 Subject: [PATCH 065/100] feat(social): implement community reviews, average ratings, and movie recommendations #25 --- Templates/Details/details_base.html | 72 ++++++++++++----- Templates/Details/details_movie.html | 24 +++++- static/css/details.css | 111 +++++++++++++++++++++++++++ web_app/models.py | 7 ++ web_app/urls.py | 1 + web_app/views.py | 41 +++++++++- 6 files changed, 232 insertions(+), 24 deletions(-) diff --git a/Templates/Details/details_base.html b/Templates/Details/details_base.html index 27fea7b..7c53bef 100644 --- a/Templates/Details/details_base.html +++ b/Templates/Details/details_base.html @@ -71,41 +71,73 @@

    Acciones

    {% endif %}
    + +
    +

    Valoracions de la comunitat

    + +
    + {% if total_reviews > 0 %} + ★ {{ avg_rating|floatformat:1 }} + ({{ total_reviews }}) + {% else %} + Sense valoracions encara + {% endif %} +
    + + {% if user.is_authenticated %} +
    +

    Deixa la teva opinió

    +
    + {% csrf_token %} +
    + {% for i in "54321" %} + + + {% endfor %} +
    + + +
    +
    + {% endif %} + +
    + {% for review in reviews %} +
    +
    + {{ review.user.username }} + + {% for i in "12345" %}{% if forloop.counter <= review.puntuacio %}★{% else %}★{% endif %}{% endfor %} + +
    +

    {{ review.comentari }}

    +
    + {% empty %} +

    Sigues el primer en valorar aquest contingut!

    + {% endfor %} +
    +
    -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/Templates/Details/details_movie.html b/Templates/Details/details_movie.html index 4b0c5ba..ad3b9cc 100644 --- a/Templates/Details/details_movie.html +++ b/Templates/Details/details_movie.html @@ -7,4 +7,26 @@ {% endblock %} -{% block favorite_url %}{% url 'toggle_movie_favorite' content.id %}{% endblock %} \ No newline at end of file +{% block favorite_url %}{% url 'toggle_movie_favorite' content.id %}{% endblock %} + +{% block extra_main_content %} +
    +

    També et pot agradar...

    +
    + {% for rec in recommendations %} + + {% if rec.poster_path %} + {{ rec.title }} + {% else %} +
    + {{ rec.title }} +
    + {% endif %} +

    {{ rec.title }}

    +     + {% empty %} +

    No hi ha recomanacions disponibles.

    + {% endfor %} +
    +
    +{% endblock %} \ No newline at end of file diff --git a/static/css/details.css b/static/css/details.css index 6f8f878..4823d65 100644 --- a/static/css/details.css +++ b/static/css/details.css @@ -149,6 +149,117 @@ box-shadow: 0 0 20px var(--cyan-glow); } +/* Sistema de Ressenyes */ + +.community-reviews-section { + margin-top: 40px; + padding-top: 20px; + border-top: 1px solid rgba(255, 255, 255, 0.1); +} + +.rating-summary { + display: flex; + align-items: center; + gap: 10px; + font-size: 1.2rem; + margin-bottom: 25px; +} + +.rating-summary .stars-avg { + color: #f5c518; + font-weight: bold; + font-size: 1.5rem; +} + +.rating-summary .count { + color: rgba(255, 255, 255, 0.6); + font-size: 1rem; +} + +.review-form-container { + background: rgba(255, 255, 255, 0.03); + padding: 20px; + border-radius: 8px; + margin-bottom: 30px; +} + +.star-rating-input { + display: flex; + flex-direction: row-reverse; + justify-content: flex-end; + gap: 5px; + font-size: 2rem; + margin-bottom: 15px; +} + +.star-rating-input input { + display: none; +} + +.star-rating-input label { + color: rgba(255, 255, 255, 0.2); + cursor: pointer; + transition: color 0.2s; +} + +.star-rating-input label:hover, +.star-rating-input label:hover ~ label, +.star-rating-input input:checked ~ label { + color: #f5c518; +} + +.review-textarea { + width: 100%; + background: rgba(0, 0, 0, 0.3); + border: 1px solid rgba(255, 255, 255, 0.1); + color: white; + padding: 15px; + border-radius: 6px; + resize: vertical; + min-height: 100px; +} + +.review-textarea:focus { + outline: none; + border-color: #00ffff; +} + +.review-card { + background: rgba(255, 255, 255, 0.02); + border-left: 3px solid #00ffff; + padding: 15px 20px; + margin-bottom: 15px; + border-radius: 4px; +} + +.review-header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 8px; +} + +.review-user { + font-weight: bold; + color: #fff; +} + +.review-stars { + color: #f5c518; +} + +.review-date { + font-size: 0.8rem; + color: rgba(255, 255, 255, 0.5); + margin-bottom: 10px; +} + +.review-text { + line-height: 1.5; + color: rgba(255, 255, 255, 0.9); + margin: 0; +} + /* Responsive */ @media (max-width: 900px) { .details-wrapper { diff --git a/web_app/models.py b/web_app/models.py index ce82307..e7c382a 100644 --- a/web_app/models.py +++ b/web_app/models.py @@ -125,6 +125,13 @@ def rating(self): def poster_path(self): return self.contingut.poster_path + def get_similar_by_genre(self, limit=4): + if not self.contingut.genere: + return Movie.objects.none() + + return Movie.objects.filter( + contingut__genere=self.contingut.genere + ).exclude(id=self.id).order_by('?')[:limit] class Series(models.Model): contingut = models.OneToOneField(Contingut, on_delete=models.CASCADE, related_name='series') diff --git a/web_app/urls.py b/web_app/urls.py index 2272065..938479f 100644 --- a/web_app/urls.py +++ b/web_app/urls.py @@ -14,6 +14,7 @@ path("user_setting/", views.user_setting, name="user_setting"), path("movie//", views.movie_detail, name="movie_detail"), path("series//", views.series_detail, name="series_detail"), + path('review/submit//', views.submit_review, name='submit_review'), path("api/user/profile/", views.api_user_profile, name="api_user_profile"), path('favorite/movie//', views.toggle_movie_favorite, name='toggle_movie_favorite'), diff --git a/web_app/views.py b/web_app/views.py index 7b0fc09..b5a9336 100644 --- a/web_app/views.py +++ b/web_app/views.py @@ -1,12 +1,13 @@ from django.shortcuts import render, redirect, get_object_or_404 from web_app.forms import CustomUserCreationForm -from web_app.models import AgeRating, API, Director, Genre, Movie, UserProfile, Series, Contingut +from web_app.models import AgeRating, API, Director, Genre, Movie, UserProfile, Series, Contingut, Valoracio from web_app import utils from itertools import chain from django.http import JsonResponse from django.contrib.auth.decorators import login_required from django.contrib.auth import login from django.core.paginator import Paginator +from django.db.models import Avg, Count def home(request): movies = Movie.objects.select_related('contingut', 'contingut__genere', 'contingut__director', 'contingut__age_rating').prefetch_related('contingut__api').all() @@ -109,10 +110,17 @@ def movie_detail(request, pk): profile, _ = UserProfile.objects.get_or_create(user=request.user) is_favorite = movie.contingut in profile.preferits.all() + reviews = Valoracio.objects.filter(contingut=movie.contingut).order_by('-creada_a') + review_stats = reviews.aggregate(avg_rating=Avg('puntuacio'), total_reviews=Count('id')) + return render(request, 'Details/details_movie.html', { 'content': movie, 'is_favorite': is_favorite, - 'available_apis': available_apis + 'available_apis': available_apis, + 'reviews': reviews, + 'avg_rating': review_stats['avg_rating'], + 'total_reviews': review_stats['total_reviews'], + 'recommendations': movie.get_similar_by_genre(limit=4) }) def series_detail(request, pk): @@ -125,10 +133,16 @@ def series_detail(request, pk): profile, _ = UserProfile.objects.get_or_create(user=request.user) is_favorite = series.contingut in profile.preferits.all() + reviews = Valoracio.objects.filter(contingut=series.contingut).order_by('-creada_a') + review_stats = reviews.aggregate(avg_rating=Avg('puntuacio'), total_reviews=Count('id')) + return render(request, 'Details/details_serie.html', { 'content': series, 'is_favorite': is_favorite, - 'available_apis': available_apis + 'available_apis': available_apis, + 'reviews': reviews, + 'avg_rating': review_stats['avg_rating'], + 'total_reviews': review_stats['total_reviews'], }) @@ -181,6 +195,27 @@ def toggle_series_favorite(request, pk): return JsonResponse({'status': status}) return JsonResponse({'error': 'Método no permitido'}, status=405) + +@login_required +def submit_review(request, contingut_id): + if request.method == 'POST': + puntuacio = request.POST.get('rating') + comentari = request.POST.get('comment', '') + + contingut = get_object_or_404(Contingut, id=contingut_id) + + if puntuacio: + Valoracio.objects.update_or_create( + user=request.user, + contingut=contingut, + defaults={ + 'puntuacio': int(puntuacio), + 'comentari': comentari + } + ) + + return redirect(request.META.get('HTTP_REFERER', 'home')) + def terms_use(request): return render(request, 'footer_legal/terms_use.html') From 77cb93baf11a15923d21383dbbf636db8b80cbe4 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 13 May 2026 20:12:29 +0200 Subject: [PATCH 066/100] feat: experimenting for better page charging --- Templates/home/home.html | 126 +++++++++++++------ Templates/home/home_parts/paginator.html | 6 +- Templates/home/includes/result_fragment.html | 6 + Templates/part/card.html | 31 ++--- web_app/scheduler.py | 1 - web_app/urls.py | 1 + web_app/views.py | 123 ++++++++---------- 7 files changed, 165 insertions(+), 129 deletions(-) create mode 100644 Templates/home/includes/result_fragment.html diff --git a/Templates/home/home.html b/Templates/home/home.html index 1ae97c1..cb53107 100644 --- a/Templates/home/home.html +++ b/Templates/home/home.html @@ -1,13 +1,38 @@ {% extends 'base.html' %} {% load i18n %} {% load static %} + {% block extra_css %} + {% endblock %} + {% block search-menu %}
    -
    +
    @@ -23,9 +48,7 @@
    @@ -35,21 +58,7 @@ -
    - -
    - -
    @@ -72,31 +81,78 @@ - {% endblock %} + {% block content %}
    -
    - -
    +

    + {% if request.GET.q %} + {% trans "Results for" %}: {{ request.GET.q }} + {% else %} + {% trans "Catálogo completo" %} + {% endif %} +

    -

    {% trans "Results" %}: {{ search_query }}

    - -
    - {% for item in items %} - {% include 'part/card.html' with item=item %} - {% empty %} -

    - {% trans "No content found matching those filters." %} -

    - {% endfor %} +
    +
    +
    + +

    {% trans "Cargando contenido..." %}

    +
    +
    + +
    +
    - - {% include 'home/home_parts/paginator.html' with items=items %}
    + + {% endblock %} \ No newline at end of file diff --git a/Templates/home/home_parts/paginator.html b/Templates/home/home_parts/paginator.html index d31354d..9bdf48c 100644 --- a/Templates/home/home_parts/paginator.html +++ b/Templates/home/home_parts/paginator.html @@ -13,15 +13,15 @@ {% endif %}
    - {% trans "Pàgina" %} + {% trans "Página" %} {{ items.number }} {% trans "de" %} {{ items.paginator.num_pages }}
    {% if items.has_next %} - - {% trans "següent" %} + + {% trans "siguiente" %} diff --git a/Templates/home/includes/result_fragment.html b/Templates/home/includes/result_fragment.html new file mode 100644 index 0000000..2836268 --- /dev/null +++ b/Templates/home/includes/result_fragment.html @@ -0,0 +1,6 @@ +{% load i18n %} +{% for item in items %} + {% include 'part/card.html' with item=item %} +{% empty %} +

    {% trans "No se han encontrado resultados." %}

    +{% endfor %} \ No newline at end of file diff --git a/Templates/part/card.html b/Templates/part/card.html index ecabcd9..73a98e8 100644 --- a/Templates/part/card.html +++ b/Templates/part/card.html @@ -1,22 +1,16 @@ {% load i18n %} {% if item.content_type == 'movie' %} -
    +
    {% elif item.content_type == 'series' %} -
    +
    +{% else %} +
    {% endif %}
    {% if item.poster_path %} {{ item.title }} {% else %} -
    - {{ item.title|slice:":1" }} -
    +
    {{ item.title|slice:":1" }}
    {% endif %}

    {{ item.title }}

    @@ -28,12 +22,8 @@

    {{ item.title }}

    {{ item.title }}

    {% if item.year %}{{ item.year }}{% endif %}
    - {% if item.genre %} -

    {% trans "Genre" %}: {{ item.genre.name|default:_("N/A") }}

    - {% endif %} - {% if item.director %} -

    {% trans "Director" %}: {{ item.director.name|default:_("N/A") }}

    - {% endif %} +

    {% trans "Género" %}: {{ item.genre.name|default:"N/A" }}

    +

    {% trans "Director" %}: {{ item.director.name|default:"N/A" }}

    {% if item.rating %} @@ -46,12 +36,11 @@

    {{ item.title }}

    {{ item.age_rating.description }} {% endif %}
    - {% if item.synopsis %} -

    {{ item.synopsis|truncatewords:15 }}

    - {% endif %} + {% if item.synopsis %}

    {{ item.synopsis|truncatewords:15 }}

    {% endif %} + {% if item.available_platforms %}
    - {% trans "Available on" %}: + {% trans "Disponible en" %}:
    {% for platform in item.available_platforms %} {{ platform.name|default:platform.port }} diff --git a/web_app/scheduler.py b/web_app/scheduler.py index 10e13b8..2e06b83 100644 --- a/web_app/scheduler.py +++ b/web_app/scheduler.py @@ -4,7 +4,6 @@ def start(): - return scheduler = BackgroundScheduler(timezone="Europe/Madrid") scheduler.add_jobstore(DjangoJobStore(), "default") diff --git a/web_app/urls.py b/web_app/urls.py index 1a0087b..a061957 100644 --- a/web_app/urls.py +++ b/web_app/urls.py @@ -11,6 +11,7 @@ path("login/", auth_views.LoginView.as_view(template_name="identify/login.html"), name="login"), path("logout/", LogoutView.as_view(), name="logout"), path('dashboard_redirect/', views.redirect_by_role, name='go_to_dashboard'), + path("api/search-content/", views.search_content_ajax, name="search_ajax"), path("user_setting/", views.user_setting, name="user_setting"), path("movie//", views.movie_detail, name="movie_detail"), diff --git a/web_app/views.py b/web_app/views.py index f7cc441..b671375 100644 --- a/web_app/views.py +++ b/web_app/views.py @@ -7,81 +7,66 @@ from django.contrib.auth.decorators import login_required from django.contrib.auth import login from django.core.paginator import Paginator +from django.template.loader import render_to_string def home(request): - movies = Movie.objects.select_related('contingut', 'contingut__genere', 'contingut__director', 'contingut__age_rating').prefetch_related('contingut__api').all() - series = Series.objects.select_related('contingut', 'contingut__genere', 'contingut__director', 'contingut__age_rating').prefetch_related('contingut__api').all() - - search_query = request.GET.get('q', '') - genre_filter = request.GET.get('genre', '') - director_filter = request.GET.get('director', '') - age_rating_filter = request.GET.get('age_rating', '') - platform_filter = request.GET.get('platform', '') # value = API port - - if search_query: - movies = movies.filter(contingut__titol__icontains=search_query) - series = series.filter(contingut__titol__icontains=search_query) - - if genre_filter: - movies = movies.filter(contingut__genere__name=genre_filter) - series = series.filter(contingut__genere__name=genre_filter) - - if director_filter: - movies = movies.filter(contingut__director__name=director_filter) - series = series.filter(contingut__director__name=director_filter) - - if age_rating_filter: - movies = movies.filter(contingut__age_rating__codi=age_rating_filter) - series = series.filter(contingut__age_rating__codi=age_rating_filter) - - if platform_filter: - movies = movies.filter(contingut__api__port=platform_filter) - series = series.filter(contingut__api__port=platform_filter) - - unique_results = [] - seen_keys = set() - - for cont in chain(movies, series): - is_movie = isinstance(cont, Movie) - type_str = 'movie' if is_movie else 'series' - key = (cont.title.lower(), type_str) - if key not in seen_keys: - cont.content_type = type_str - if is_movie: - related_continguts = Contingut.objects.filter( - titol__iexact=cont.title, - movie__isnull=False - ) - else: - related_continguts = Contingut.objects.filter( - titol__iexact=cont.title, - series__isnull=False - ) - cont.available_platforms = list( - API.objects.filter(contingut__in=related_continguts).distinct() - ) - unique_results.append(cont) - seen_keys.add(key) - paginator = Paginator(unique_results, 20) - page_number = request.GET.get('page') - page_obj = paginator.get_page(page_number) - - genres = Genre.objects.values_list('name', flat=True).distinct() - directors = Director.objects.values_list('name', flat=True).distinct() - age_ratings = AgeRating.objects.values_list('codi', flat=True).distinct() - platforms = API.objects.all() - + """Carga instantánea del esqueleto de la página.""" context = { - 'items': page_obj, - 'genres': genres, - 'directors': directors, - 'age_ratings': age_ratings, - 'platforms': platforms, - 'search_query': search_query, + 'genres': Genre.objects.values_list('name', flat=True).distinct(), + 'directors': Director.objects.values_list('name', flat=True).distinct(), + 'platforms': API.objects.all(), + # Añadimos age_ratings que faltaba en tu home.html + 'age_ratings': AgeRating.objects.values_list('codi', flat=True).distinct(), } - return render(request, "home/home.html", context) +def search_content_ajax(request): + """Procesamiento asíncrono optimizado.""" + try: + # 1. Filtros + search_query = request.GET.get('q', '') + genre_filter = request.GET.get('genre', '') + director_filter = request.GET.get('director', '') + platform_filter = request.GET.get('platform', '') + + movies = Movie.objects.select_related('contingut__genere', 'contingut__director', 'contingut__age_rating', 'contingut__api').all() + series = Series.objects.select_related('contingut__genere', 'contingut__director', 'contingut__age_rating', 'contingut__api').all() + + if search_query: + movies = movies.filter(contingut__titol__icontains=search_query) + series = series.filter(contingut__titol__icontains=search_query) + # ... aplicar otros filtros si es necesario ... + + # 2. Unión y deduplicación + all_content = list(chain(movies, series)) + unique_results = [] + seen = set() + for item in all_content: + title_key = item.contingut.titol.lower() + if title_key not in seen: + item.content_type = 'movie' if isinstance(item, Movie) else 'series' + # Calculamos las plataformas para este item específico + item.available_platforms = [m.contingut.api for m in type(item).objects.filter(contingut__titol__iexact=item.title).select_related('contingut__api') if m.contingut.api] + unique_results.append(item) + seen.add(title_key) + + # 3. Paginación + paginator = Paginator(unique_results, 20) + page_obj = paginator.get_page(request.GET.get('page', 1)) + + # 4. Renderizado (RUTAS CORREGIDAS SEGÚN TU CAPTURA) + html_cards = render_to_string('home/includes/result_fragment.html', {'items': page_obj}, request=request) + html_pagination = render_to_string('home/home_parts/paginator.html', {'items': page_obj}, request=request) + + return JsonResponse({ + 'html': html_cards, + 'pagination_html': html_pagination + }) + except Exception as e: + import logging + logging.error(f"Error en AJAX: {str(e)}") + return JsonResponse({'error': str(e)}, status=500) + def register_view(request): form = CustomUserCreationForm(request.POST or None) if form.is_valid(): From 36cbc3e7c7d7dc76ce7e7245b3dcb0f52ab9d510 Mon Sep 17 00:00:00 2001 From: Bogdan2005-19 Date: Wed, 13 May 2026 20:33:18 +0200 Subject: [PATCH 067/100] fix: render now charging properly --- Templates/home/home.html | 42 +++++++++++++++++++++------------------- web_app/views.py | 23 +++++++++++++++------- 2 files changed, 38 insertions(+), 27 deletions(-) diff --git a/Templates/home/home.html b/Templates/home/home.html index cb53107..b3f27af 100644 --- a/Templates/home/home.html +++ b/Templates/home/home.html @@ -6,7 +6,7 @@ {% endblock %} {% block content_staff_admin %} @@ -20,41 +75,109 @@

    {% trans 'Registrar Nuevo Miembro' %}

    {% for field in form %} + {% if field.name != 'subscriptions' %} +
    +
    + + + {{ field }} + + {% if field.help_text %} + + {{ field.help_text|safe }} + + {% endif %} + + {% if field.errors %} + {% for error in field.errors %} +
    + {{ error }} +
    + {% endfor %} + {% endif %} +
    +
    + {% endif %} + {% endfor %} +
    -
    - - - {{ field }} - - {% if field.help_text %} - - {{ field.help_text|safe }} - - {% endif %} - - {% if field.errors %} - {% for error in field.errors %} -
    - {{ error }} +
    - {% endfor %}
    - + {% trans 'Cancelar' %}
    + + {% endblock %} \ No newline at end of file diff --git a/users/templates/users/types/user_client.html b/users/templates/users/types/user_client.html index beefc6b..b916452 100644 --- a/users/templates/users/types/user_client.html +++ b/users/templates/users/types/user_client.html @@ -1,7 +1,7 @@ {% extends 'users/settings/user_settings.html' %} {% load i18n %} -{% block user_content %} +{% block content_user %}