From 0b8cdc77a120912fcce7275b782fc1ed7665da66 Mon Sep 17 00:00:00 2001
From: Trey t <treytartt@fastmail.com>
Date: Mon, 17 Jul 2023 19:26:18 -0500
Subject: [PATCH] WIP

---
 db.sqlite3                                    | Bin 2052096 -> 2052096 bytes
 equipment/serializers.py                      |   9 +++-
 exercise/serializers.py                       |   5 +++
 superset/__init__.py                          |   0
 superset/admin.py                             |  22 ++++++++++
 superset/apps.py                              |   6 +++
 superset/migrations/0001_initial.py           |  38 ++++++++++++++++
 ...duration_supersetexercise_reps_and_more.py |  28 ++++++++++++
 superset/migrations/0003_superset_order.py    |  18 ++++++++
 ...er_superset_order_alter_superset_rounds.py |  25 +++++++++++
 .../migrations/0005_supersetexercise_order.py |  19 ++++++++
 superset/migrations/__init__.py               |   0
 superset/models.py                            |  41 ++++++++++++++++++
 superset/serializers.py                       |  27 ++++++++++++
 superset/tests.py                             |   3 ++
 superset/views.py                             |   3 ++
 werkout_api/settings.py                       |   3 +-
 workout/serializers.py                        |  32 +++++++++-----
 18 files changed, 266 insertions(+), 13 deletions(-)
 create mode 100644 superset/__init__.py
 create mode 100644 superset/admin.py
 create mode 100644 superset/apps.py
 create mode 100644 superset/migrations/0001_initial.py
 create mode 100644 superset/migrations/0002_supersetexercise_duration_supersetexercise_reps_and_more.py
 create mode 100644 superset/migrations/0003_superset_order.py
 create mode 100644 superset/migrations/0004_alter_superset_order_alter_superset_rounds.py
 create mode 100644 superset/migrations/0005_supersetexercise_order.py
 create mode 100644 superset/migrations/__init__.py
 create mode 100644 superset/models.py
 create mode 100644 superset/serializers.py
 create mode 100644 superset/tests.py
 create mode 100644 superset/views.py

diff --git a/db.sqlite3 b/db.sqlite3
index a9c3f9c9b0d63ebfd04c1b45c01e231ba63049df..ee12763dd944b9178cf9a6638a885ab2e979ddce 100644
GIT binary patch
delta 4544
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
Ma{=G0of}R61?h-bAOHXW

delta 4663
zcmZu!4OmlWmQF&Fd%q+%KZM+S^K+9MQdC4F0RaIK0wVZ>KvT6U2vH)W27(Yq`-3IH
zAZ=$Ikg-Rdis;N#J3HIz*llK3J7cHaXUEn~wLiO~yWPR*GwV*PKCn*bX=mE*eqSJN
z+ee<~gq!3$?>XOl-gCY$gOdY;lLMnx!!?OS`l&=Bc?4Sk+xf9Y1?Fp##jSz@zmw~3
z;a6!u_cz^NbThhJ=L{Ej>kQsK_`~@P_=PLPFDBb77g?EJ;ggt{3*(fyNP6m=p)J7Z
zwSI{Ue?Rx9{S2aZlkwbz+%l=OeEhS;2c@0k&*arfE#vR!<<Mm+yw1XOjZ^N0>MmwL
zyO;T%Hlh6ihVn4yy2>FvtyB5>IMsL+V$&Jkb7I?16z5*w;C(c$lQ}d_UAc-EzN$HQ
z=)>?I(kx5}sEg7<{E?eUgx;1OKA2{Z6a&>Jb0_x6<lChCkN9PYBmT6`3771GL?fw^
zD1WNBAw}9&NtGt9zM%RX$rakP9lBy^kt8&3XtN)xlJ`JkEvtc1m3&R&v|4^nDx-&?
zXF9!fTx{!3bl0&jNa1Fh{N2PBM*d@&T(?NF7kfUI_=Q~FtbqSe$uFDm9@TSvL|5*i
zxSci9Xb`5;<YpMHWoful%T5gI<->Z#D|#h0=xoRA{~23wwoKBy_<sks|H0OY?Gaco
zs{90X<Hs&+A+U`px1f*k;|#V>_79FJu~FD)YzUhQn;M%28-q=YO@~d7&5#%zOW(Iw
zen@^>0vFp%RZ!WcSPBRHrhFJQnlfN|(8MRE2IUXRFtz8UiQ5@Q&MJRiX_J7aGGkq0
zgWLEO`RX?^82n?Je7{&^#Fmi|i%e6Oel{rAC**qetGvugiAq{7kq<Df>Z7X5DptlK
zFTGD%PW4kelJvA;;wn@q`K+jvypP{rfkVgGYl%Nsu^qCsXyv1DRw;LkPv;_FYT3hb
zi9|-~?U5yhpJVmXM0kQ7lP1{J>>WiKPu&Enk@Y0fM>Afc(ppcJ!;@RtV#xIyGZKXl
zvu{x+r^J&N^#@1gAg`p}ldX3^XPw0bUsO^Ka9>hC0Kf8>5gc#k5#)NQem1s6ogwjh
z%N#UKBO0N?`n+6847?vxMmTf9B!|0R$_4*9rc4LJZ&d;e{s{3feb%gp>j#x)FjP?!
zT)aYM!WbKcISgOa;Pf*4;Y6vGg9ocAJ5-D-v*7t=K?}=ksG&rq)_PHjhBb(U&K2N_
z-sXb;KBUY8SskAa$LgrM#DKxJS;od9bTYkr(Dj1A48ho^ya~QMtSpABi)jJ$zcwqt
zwwhWFHLIw9G!4z8h|?+o&F-n8LC9MLyVf}}V01z$hk>KYWpM4sycVXPv#fyJPiO;N
zcoV02lonKQzKPMm^j5VRt{+uSpy(E*5rb7bpiVS9p<*p1!s_Rgn8+Ek5_&eN7`XCB
zs}|Oct9ZD`A_Ytq(Jo+|W?e>XtAZp_!jL>LxvRXwe2_W?(`+7MJ&x%<retBJo~noP
zZJZh|AJJK%XOUhBx1LtUx%R+Nwwz$B|NjCxh27xfh2&<G@Wh0&5-Ma4C3Hn>2u9QC
z#nAJS<tv#eK0nFopLL^u)>&}^q&CREoAEF)n7P0kVS2)<fLm@PP*wfCJ%K<U?0T2Z
zhv{G1)o|-yttxoOgBHS_^9&ES47v{0P*%K@Wa4o^ho5snZa&IXbhih)JK&~9SO$0e
z+%9lGLn}Z$fGBt@A3euKcgIVJkAoyY<dtn^igTjiv8jz9+K?RntpM4PuQMFz>kM`W
zz*}m@8e4*_@H%HPf%_?13Hl|-XO2A{UrI#gBU~nh8WouNOl%X}$V4o>w*=XrEkZ76
zI&aQ^GY|3>IDXnp!`p?ZV3yb~mY^T7F>AayRgoki*-j=)0!`oLIA|<F4hWlcER5yS
zJcz|e1M+niD?D9<_L`!ucoETobB;>7%OsS*%qHyEU5p&6>hQK+zt|Y=3&2d4)eWx}
zqf9o|94{o{@<{PW-euKHE(0EwjfK3WSSpsK$ZGKRc8R{-fk2Pwi}VH}+dJX*QnW_4
z)(`FjRu<})qDkDQ@g+$l(g@!|>Mud!eL$uct4d)(3DPUq`X41#GTdd1@L~x%PVy=s
zXf-KaRC}0$xxC&lMI!u`*V$kyiUrQ+IT)DS!O>tJM_3qRR*Z2T*VoSpE1@xFrC_O9
z*9wzmNW;Y*j^`8HhPnOH*-pXS5QAuyiiN^unBN-~ofB@1XdE!H2kBv8Ida08a$N54
zGPIA2ZH#-8{&TzhhW}W3%Kt1&voQ4?ivA|ZaZ{{3?k4`(L?ncz>>L5lDAvruC(DsY
z*9CjTwZR<`xWZwT=;qmJ_^<+*py@YSD@>;&6}T%9yi$o8q&kn2@JujjnJnBhO`CWY
zB3|T3FUZ~Ke^gxC-`x=q>-~}5;2ya82FF95Ozj5Nu6u!tt&T4yd3aJy`*n=htL~3+
z!l|lFx|@a;#B-B0kn$w8-jI_AH_q@p7*-IG)?n7IAFvccLk%vLdj<N~7<I=N5q%b<
zq*hxEO_yzExKM*VJS&kAY`-!a;Z6;zHbzV1ImyK-HPvpKUEH%WwfKWq%~|kYm(V=8
zz7m;C(Te!Oq(@3I+e?I+S@|!n#Xcuyv_>*N1o-ezlos~XqEc>17tbc!C{I-*P|Y;p
z;eFyGs|jXmapsk)5TDi=?19&IVsiNeo~2<*ql714z>3hnh{xf=Rk*ngb?9GIQB8aS
z$)L;uw+Hx4*tZIYy}Al<pucR(gfoYgN@2S{^qoLobZ>k<iR&U2Osb#-t2>HiN0}gF
zHFBzYLcxf*y1%QZZ?<x+7PAUoT#fSKwNkqP-@U6XWn)e8c?6{_wd2})0r$um3U@rW
z207T3A<|VMo?ZQ+_CT-L*c<4>-9PmKZ-?7!P#F}hK}Xq`E1pGQ$OKGEvU;arVnAv!
zv#@h55>ZvKw_RKj?&yQDkeY>;zEmq<s)d@HUoRY|7-$8KmTwRD2H-5Ot$-=FP6ZP&
za{)hOia$WW>j^j!N{h24ml-m`Yc-g*@7E(c-0&Jj7<&(k{ONUQJv{aoRt=wjsyzmq
z*C8tx9f-S<RHamt{WYp`8oo)@YeN(V_o3?9M%1oxr4Xvk3>aJj2m2e5sP<usLIH72
zcOU?l?sA2e9ihOUa4#;VlN8gH65u^AzUf<DULU{2KI^rwGcMjM3E8f<DW{ql_RVhh
z@0;*;ou6qrxT@eRaP;S99@;)oso=B^ElgZ$LO+yp`?}%|f{>dk>iTM?i5Z5b@8dzs
zK7<^oDjbP~yTtW9(EPMD69$zuzLsr3<&b$3pG?1RK{}Xx6Il|EKZLraT&yu}CwR$$
zLo!-ZBH%-5c3AA+fE?O}ZK2?<{($(<?qFY}4^BK`b3p$_lq2^ABM~@TqBFv)8_<!A
zXl+~|jQCQbt*y?68@ZUrYa4N=oc%)Ug3mXi7Jf()w~>%F%-rp!uqnHQ88U!0jB9@C
zVN&x=$OZ#yYX(eu)J5>ur;q`>=S^1l{ok~sP$ySw;mJ*i&WM)8t;v|F+Ew6~-Yh!@
z3pS@>&MZ=68aJb2F18_VA%RmTAj<AwipgFHcQ-fVGq5fY2#ITg+jsVX^c0;9THY)?
z+l;5`nm^f1aHj?LYW@~9Vv22zn+Z}=O13^PV<Pt=4l0{*VE-Rz3v{<28jLIP4RSDB
zqk+HMt~Nl=U6z4MQA;D7X-3;kF-x2$I9YSmq_gvw0+{?A9``3(aBHm&cZk7mu`vW!
zW$H{Q?c|L2%D9`4b;dd3okP4y?KW;C``I;1<gd3PJGCMl>cQ6%nAGFipK3*`VQMS-
z+3*xQJjD%9@xxQ*;VH{2Q&zb?P0us}HEng`oBIN0f8&={Y&L8{qVY@n%lQepn>`@a
z6ceUNEY4{L?@2okS3Im7{>j5y;hizP37TKVpM~>Tjq%BmM@VgoNr!yHqa>eo%r4G;
zoM&MAWxHzDBbqxBBraKV5~BU{LGKcHIG@jo>biixU5tcDD}wuDD-UOEoB+B4cAhc1
zXrwdgIH!Yqj-dip)O^h`0AtUn3zAM;tZk%&(C15uC(9`m;^}_lr*;<XOK^^FAJn_x
zr5b#RXe(k1fq%-f75=x7ZRTRFBRi6=sqX)}YpgKk>W=V=Z@HqVd?Y|p^?>6vJ_J50
zV#W0OV0Unvzq?(m4*9$KIs>5)_?N13RME7N_T*Xt#M8VJb{5}%aecNmhg&hSourg^
zud7VthlUYOcvu!bEoSY875!b?wqbD5x82_p35L7D-#}%6{yLUh`vWR7zR|I#j8V<V
zHWD;1rK)TvID`0hP+G!@)Lg1?_=h<8FGegjRa8CVC+kZD_{Cc`C%lQ5vAzi24mn)B
z-8=F0T#08UiMQCUazf?16a^JI4kaJkHqu6NF2gw|r+@8E0pC=7vpF}HvW_%=XeUS$
zv=J({2s)T}2Va@GAICpd^yMl&40<UAY%F8v!xJip0A24gdU$DwF~C27zTFfX7-^kF
zC;GzyeDzEjG`@wK^kNw+!dJ^!yze--7>=E$O`!S=X;EjOFS00kP)(JwZ?Lhxk*x%x
zI;E>@FOw^Qso&uVQ&rApLS#A1!`Uhe2f8<Cd~L^PI85asCH#8@ZuItY_A(di8EHvk
y%xQ&AVhlmk1Ncb$`Eu4Z3)0j~vG)bpcSOGketA?s0C|5ktKoYUEc<+=L;rsPXE|s9

diff --git a/equipment/serializers.py b/equipment/serializers.py
index caa50f5..a08767a 100644
--- a/equipment/serializers.py
+++ b/equipment/serializers.py
@@ -1,13 +1,18 @@
 from rest_framework import serializers
 from .models import *
 
-class EquipmentSerializer(serializers.ModelSerializer):    
+class EquipmentSerializer(serializers.ModelSerializer):   
     class Meta:
         model = Equipment
         fields = '__all__'
 
 
 class WorkoutEquipmentSerializer(serializers.ModelSerializer):    
+    name = serializers.SerializerMethodField()
+
     class Meta:
         model = WorkoutEquipment
-        fields = '__all__'
\ No newline at end of file
+        fields = '__all__'
+
+    def get_name(self, obj):
+        return obj.equipment.name
\ No newline at end of file
diff --git a/exercise/serializers.py b/exercise/serializers.py
index 3f09e51..20b084f 100644
--- a/exercise/serializers.py
+++ b/exercise/serializers.py
@@ -6,9 +6,14 @@ from muscle.serializers import ExerciseMuscleSerializer
 from equipment.serializers import WorkoutEquipmentSerializer
 
 class ExerciseMuscleSerializer(serializers.ModelSerializer):
+    name = serializers.SerializerMethodField()
+
     class Meta:
         model = ExerciseMuscle
         fields = '__all__'
+    
+    def get_name(self, obj):
+        return obj.muscle.name
 
 class ExerciseSerializer(serializers.ModelSerializer):
     muscles = serializers.SerializerMethodField()
diff --git a/superset/__init__.py b/superset/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/superset/admin.py b/superset/admin.py
new file mode 100644
index 0000000..5301cae
--- /dev/null
+++ b/superset/admin.py
@@ -0,0 +1,22 @@
+from django.contrib import admin
+from import_export.admin import ImportExportModelAdmin
+from .models import *
+
+# Register your models here.
+@admin.register(SupersetExercise)
+class SupersetExerciseAdmin(ImportExportModelAdmin):
+    search_fields = ['exercise']
+
+
+class SupersetExerciseInline(admin.StackedInline):
+    model = SupersetExercise
+    ordering = ("pk",)
+    extra = 0
+
+@admin.register(Superset)
+class SupersetAdmin(ImportExportModelAdmin):
+    list_display = ("name", "workout", "order", "rounds",)
+    ordering = ("order",)
+    inlines = [
+        SupersetExerciseInline,
+    ]
\ No newline at end of file
diff --git a/superset/apps.py b/superset/apps.py
new file mode 100644
index 0000000..73bf8c2
--- /dev/null
+++ b/superset/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class SupersetConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'superset'
diff --git a/superset/migrations/0001_initial.py b/superset/migrations/0001_initial.py
new file mode 100644
index 0000000..b549b08
--- /dev/null
+++ b/superset/migrations/0001_initial.py
@@ -0,0 +1,38 @@
+# Generated by Django 4.2.2 on 2023-07-17 18:54
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('exercise', '0006_alter_exercise_name'),
+        ('workout', '0011_alter_completedworkout_notes'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Superset',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('name', models.CharField(blank=True, max_length=255, null=True)),
+                ('rounds', models.IntegerField(blank=True, max_length=3, null=True)),
+                ('workout', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='workout.workout')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='SupersetExercise',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('exercise', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='superset_exercise_exercise', to='exercise.exercise')),
+                ('superset', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='superset_exercise_exercise', to='superset.superset')),
+            ],
+        ),
+    ]
diff --git a/superset/migrations/0002_supersetexercise_duration_supersetexercise_reps_and_more.py b/superset/migrations/0002_supersetexercise_duration_supersetexercise_reps_and_more.py
new file mode 100644
index 0000000..3ab743f
--- /dev/null
+++ b/superset/migrations/0002_supersetexercise_duration_supersetexercise_reps_and_more.py
@@ -0,0 +1,28 @@
+# Generated by Django 4.2.2 on 2023-07-17 18:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('superset', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='supersetexercise',
+            name='duration',
+            field=models.IntegerField(blank=True, max_length=4, null=True),
+        ),
+        migrations.AddField(
+            model_name='supersetexercise',
+            name='reps',
+            field=models.IntegerField(blank=True, max_length=4, null=True),
+        ),
+        migrations.AddField(
+            model_name='supersetexercise',
+            name='weight',
+            field=models.IntegerField(blank=True, max_length=4, null=True),
+        ),
+    ]
diff --git a/superset/migrations/0003_superset_order.py b/superset/migrations/0003_superset_order.py
new file mode 100644
index 0000000..29335db
--- /dev/null
+++ b/superset/migrations/0003_superset_order.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.2 on 2023-07-17 18:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('superset', '0002_supersetexercise_duration_supersetexercise_reps_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='superset',
+            name='order',
+            field=models.IntegerField(blank=True, max_length=3, null=True),
+        ),
+    ]
diff --git a/superset/migrations/0004_alter_superset_order_alter_superset_rounds.py b/superset/migrations/0004_alter_superset_order_alter_superset_rounds.py
new file mode 100644
index 0000000..b6640f1
--- /dev/null
+++ b/superset/migrations/0004_alter_superset_order_alter_superset_rounds.py
@@ -0,0 +1,25 @@
+# Generated by Django 4.2.2 on 2023-07-17 18:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('superset', '0003_superset_order'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='superset',
+            name='order',
+            field=models.IntegerField(default=1, max_length=3),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='superset',
+            name='rounds',
+            field=models.IntegerField(default=1, max_length=3),
+            preserve_default=False,
+        ),
+    ]
diff --git a/superset/migrations/0005_supersetexercise_order.py b/superset/migrations/0005_supersetexercise_order.py
new file mode 100644
index 0000000..78a5679
--- /dev/null
+++ b/superset/migrations/0005_supersetexercise_order.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.2.2 on 2023-07-17 19:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('superset', '0004_alter_superset_order_alter_superset_rounds'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='supersetexercise',
+            name='order',
+            field=models.IntegerField(default=1, max_length=3),
+            preserve_default=False,
+        ),
+    ]
diff --git a/superset/migrations/__init__.py b/superset/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/superset/models.py b/superset/models.py
new file mode 100644
index 0000000..9412a48
--- /dev/null
+++ b/superset/models.py
@@ -0,0 +1,41 @@
+from django.db import models
+from workout.models import Workout
+from exercise.models import Exercise
+
+# Create your models here.
+class Superset(models.Model):
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+    name = models.CharField(max_length=255, blank=True, null=True)
+
+    workout = models.ForeignKey(
+      Workout,
+      on_delete=models.CASCADE
+    )
+
+    rounds = models.IntegerField(max_length=3, blank=False, null=False)
+    order = models.IntegerField(max_length=3, blank=False, null=False)
+
+    def __str__(self):
+        return self.name #+ " : " + self.description + " | by: " + self.registered_user.nick_name
+    
+class SupersetExercise(models.Model):
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+    
+    exercise = models.ForeignKey(
+      Exercise,
+      on_delete=models.CASCADE,
+      related_name='superset_exercise_exercise'
+    )
+
+    superset = models.ForeignKey(
+      Superset,
+      on_delete=models.CASCADE,
+      related_name='superset_exercise_exercise'
+    )
+
+    weight = models.IntegerField(null=True, blank=True, max_length=4)
+    reps = models.IntegerField(null=True, blank=True, max_length=4)
+    duration = models.IntegerField(null=True, blank=True, max_length=4)
+    order = models.IntegerField(max_length=3, blank=False, null=False)
\ No newline at end of file
diff --git a/superset/serializers.py b/superset/serializers.py
new file mode 100644
index 0000000..d301d7b
--- /dev/null
+++ b/superset/serializers.py
@@ -0,0 +1,27 @@
+from rest_framework import serializers
+from .models import *
+from exercise.models import Exercise
+from exercise.serializers import ExerciseSerializer
+
+class SupersetExerciseSerializer(serializers.ModelSerializer):
+    exercise = serializers.SerializerMethodField()
+
+    class Meta:
+        model = SupersetExercise
+        fields = '__all__'
+    
+    def get_exercise(self, obj): 
+        data = ExerciseSerializer(obj.exercise, many=False).data
+        return data
+
+class SupersetSerializer(serializers.ModelSerializer):
+    exercises = serializers.SerializerMethodField()
+    
+    class Meta:
+        model = Superset
+        fields = '__all__'
+    
+    def get_exercises(self, obj): 
+        objs = SupersetExercise.objects.filter(superset=obj).order_by('order')
+        data = SupersetExerciseSerializer(objs, many=True).data
+        return data
diff --git a/superset/tests.py b/superset/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/superset/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/superset/views.py b/superset/views.py
new file mode 100644
index 0000000..91ea44a
--- /dev/null
+++ b/superset/views.py
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
diff --git a/werkout_api/settings.py b/werkout_api/settings.py
index e121700..c0eb1e7 100644
--- a/werkout_api/settings.py
+++ b/werkout_api/settings.py
@@ -40,7 +40,8 @@ INSTALLED_APPS = [
     'workout',
     'muscle',
     'scripts',
-    'video'
+    'video',
+    'superset'
 ]
 
 MIDDLEWARE = [
diff --git a/workout/serializers.py b/workout/serializers.py
index ba89425..490740a 100644
--- a/workout/serializers.py
+++ b/workout/serializers.py
@@ -6,6 +6,8 @@ from muscle.models import ExerciseMuscle
 from equipment.models import WorkoutEquipment
 from video.models import Video
 from video.serializers import VideoSerializer
+from superset.serializers import SupersetSerializer
+from superset.models import Superset, SupersetExercise
 
 class WorkoutExerciseSerializer(serializers.ModelSerializer):
     exercise = ExerciseSerializer(read_only=True)
@@ -49,20 +51,30 @@ class WorkoutSerializer(serializers.ModelSerializer):
         # depth = 1
     
     def get_muscles(self, obj): 
-        exercises = WorkoutExercise.objects.filter(workout=obj).values_list('exercise__id')
-        muscles_names = ExerciseMuscle.objects.filter(exercise__id__in=exercises).values_list('muscle__name', flat=True)
+        superset_ids = Superset.objects.filter(workout=obj).values_list('id')
+        exercise_ids = SupersetExercise.objects.filter(superset__id__in=superset_ids).values_list('exercise__id')
+        muscles_names = ExerciseMuscle.objects.filter(exercise__id__in=exercise_ids).values_list('muscle__name', flat=True)
         return list(set(muscles_names))
     
+        # muscles_names = ExerciseMuscle.objects.filter(exercise__id__in=exercises).values_list('muscle__name', flat=True)
+        # return list(set(muscles_names))
+    
     def get_equipment(self, obj): 
-        exercises = WorkoutExercise.objects.filter(workout=obj).values_list('exercise__id')
-        equipment_names = WorkoutEquipment.objects.filter(exercise__id__in=exercises).values_list('equipment__name', flat=True)
+        superset_ids = Superset.objects.filter(workout=obj).values_list('id')
+        exercise_ids = SupersetExercise.objects.filter(superset__id__in=superset_ids).values_list('exercise__id')        
+        equipment_names = WorkoutEquipment.objects.filter(exercise__id__in=exercise_ids).values_list('equipment__name', flat=True)
         return list(set(equipment_names))
     
     def get_exercise_count(self, obj): 
-        return WorkoutExercise.objects.filter(workout=obj).count()
+        returnValue = 0
+        supersets = Superset.objects.filter(workout=obj)
+        for superset in supersets: 
+            exercise_count = SupersetExercise.objects.filter(superset=superset).count()
+            returnValue += (superset.rounds * exercise_count)
+        return returnValue
 
 class WorkoutDetailSerializer(serializers.ModelSerializer):
-    exercises = serializers.SerializerMethodField()
+    supersets = serializers.SerializerMethodField()
     registered_user = serializers.SerializerMethodField()
     male_videos = serializers.SerializerMethodField()
     female_videos = serializers.SerializerMethodField()
@@ -70,12 +82,12 @@ class WorkoutDetailSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Workout
-        fields = ('id', 'name', 'description', 'exercises', 'registered_user', 'male_videos', 'female_videos', 'both_videos')
+        fields = ('id', 'name', 'description', 'supersets', 'registered_user', 'male_videos', 'female_videos', 'both_videos')
         depth = 1
    
-    def get_exercises(self, obj): 
-        objs = WorkoutExercise.objects.filter(workout=obj).order_by('created_at')
-        data = WorkoutExerciseSerializer(objs, many=True).data
+    def get_supersets(self, obj): 
+        objs = Superset.objects.filter(workout=obj).order_by('order')
+        data = SupersetSerializer(objs, many=True).data
         return data
     
     def get_registered_user(self, obj):