From 2b8f74eb064cbcf45fcb52e83ea1836fe90cb510 Mon Sep 17 00:00:00 2001
From: Babit Shrestha <babit.shrestha@cas.com.np>
Date: Sun, 12 Jan 2025 01:41:27 +0545
Subject: [PATCH] Added ServiceRequestModel

---
 sahara/db.sqlite3                             | Bin 139264 -> 151552 bytes
 sahara/main/__pycache__/admin.cpython-312.pyc | Bin 1185 -> 1282 bytes
 .../main/__pycache__/models.cpython-312.pyc   | Bin 5057 -> 7232 bytes
 sahara/main/admin.py                          |   5 +-
 ...lter_user_bio_alter_user_price_and_more.py |  49 ++++++++++++++++++
 ..._alter_user_price_and_more.cpython-312.pyc | Bin 0 -> 3146 bytes
 sahara/main/models.py                         |  14 ++++-
 7 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 sahara/main/migrations/0003_service_alter_user_bio_alter_user_price_and_more.py
 create mode 100644 sahara/main/migrations/__pycache__/0003_service_alter_user_bio_alter_user_price_and_more.cpython-312.pyc

diff --git a/sahara/db.sqlite3 b/sahara/db.sqlite3
index 39db2272fceacd06aed4cfc8a8343215e892373c..08c69f92898d1f90f4cc257a7131b1b42bcdb8e4 100644
GIT binary patch
delta 2398
zcma)8TWl0n7@jjb-I=}2o-K4)+GXkKlqFr;+L`WdFF=u{HiiH#HvutbnB6&PN4ghg
zw*`Dz)@Y0np)fJ4F%hD?YQTNi7$4O5WHm^5(+6Xsz9G>!5<~RNUdZevfhPSkbN>JP
z&-Y*E|M%iI+{K%YwLtd?ilRc~zwtMFZ6pFt+&O&%a(z5G^f_gN^@eGuT$a3}&Qm9S
zU6k)!Jf&!9Q4}L`4(qF063fbR9_#W7d6g4d#`>DotNOGmr!qPo7sq3xqBJT=NSfXe
zi|r7no{vVS$H$}PFZ*ux0Jm{!Y!`>%eX0xaZsX&z2=E#A$A<k}I_D&OIGCW|L-+&y
z1%3|SfQhnKoQGjQ;|l|mQ=N{E&#vHHp7S!kfc2a;F28WWhInkSdnB)i=O6LE^Y{1)
z{}Er{ad`j*`9d!PB7j@f@VQ2Cb#ExZfJwlqcp2w$i>|+>OD-wt#a7+c%?ywLr>JTR
zD7b+EA;4O%+S0R=0b#&4UlQo49yWXL>t?_pU@dNY%l-3zf*uYk6#NVR4A<dj@B?@W
zUVut@K->qzn>dE@h1>H4S#ln*oR=@j-+O3kpd>+hlW`_}Blx6l<Ids|@KVK@c+4Mk
zI2;G#HM6@ei^&&R2H6mtGuSoB3o}rIN%$H(0T09daE_$;u}AE(0l=ZE?61nLRT(rT
zyQL}vRoPdSz2%h~SNGVE^O3>+CVAbv-J4twUF)t7T?yB)^AYiR+gXrM7X>0Sor*WB
zq>-6uRPPW}FKVoxKqljzt7?L3m1u))t-+c~QowbmCa$Jw#f=3CPTJX_8B7eRWh+3~
zLI9!BrY32PWqW|wgeCU%=B{aHzrC+!*u)xlVB1UV28XS^)k3d)`oXQFt(&Gx>>&`e
zGwbyGG=1&LQsw#~kOh^)DR3NAP97y+5>3TR?;Qg(<;UO@ut$3A{+9-ftIX!g-s9kF
z$FOZ1)lDgs`zzPCF1vG@n`W=r|F!S6cXg%dvo_f_!k+;@f^C#Sj~J3SRw(Y7V*RNI
zD5kWuiqD%p+wxU4UgfNwS=CfBkTg}En3%$1RGjEwADTTf7e6+K_RYUIcM=I5EG!-i
z?JfnhFy9d-pdq0#9xYsia4|H=`d=k6?0aeqgt|06twdtcWR+N<dBAOZcJ3BW&%{_$
z2~lB!^}j-h&NYY@+OnNo)^Iv+=6Gr%qDE9n?U2F2r}J$0(~0J;>RdN7`^28m6h+n_
z3V}BV^GaeFTkp3%4;XQJBU?{kX)Ot2#=6}zH7<tH{K7Fb|MGzYBS=tjE~#tTyp~A|
zXjRe4x1tY8qG?17!u(;1Gk2vFH7+xf^DTFT_4oIKcNQy3668QBl>pC`?j}IAbUgtA
zr8^0*xst-*5B3lN_4yY@K~ZWXGhN%4i*Ij;vHnN|yt}`Re|?}>!>At#W;CAWcBlq5
zp)BectEBzO-WACFN@^)(*&1S_DVH)Ux`4EF9xr0O#A6U>w3l2{?VdqmnB=7H(aead
z<gwM4mXnpN+1*&JDf3#27}Rp9lUnF!astZZ^ZCXhK_oM&thq!9B$3HjxD6rUiB2}J
zYWG>IyYZ{-Xrq+md3)oz^p6I@jjYrsfN_&PQu!|f9BZF)e|s6|^URWUG3nV@T(Fyq
zjEeOJ9UK=2)WE^gvWLEGJjnDI_tI!%^QNmB7(<y`4ZYj^K|*;=K?&vVi{C-xr-Jm!
GZS+4>XYmLC

delta 617
zcmZozz}awsV}i6`FaraF5)?B5X^V+E#*D!m6Xx@Ci1PyZB3wHsvkPc$R#fQZ+PqV0
zfe0hl<S2a`4hjBC46Ka2T$AVN8#9VbzND`$&X!lq1=PXD-_5}Pj{h|OE&g@<-TX5*
z3l@~~Pwuv_WR~EQpUm!H2sG<C?`C<wr;Gw@{9O$EZ~1TXpW<K3KZCyusJ4uMb65OH
zK4wM+#mQlLTc*E~W8xNW%wQB?XtZ@S6_@4Y<n(m}NowSu1xs!!U{PR};4hubJ^^U7
zfi3^$()s-k%o02ali44DEYslGobYBzGBY1@_;mIFMp-82@QGbH+b0Du7BFsRVrpk%
zVPIgKJ>4LgQGfcL5JtYur&tWR_5DJ9d^ABJz|XA0z_*O|32z|JZtjEJY+RNcmh63O
zzuBDFSXuL!!<ki>fnc(uz-IdvWj%IrO-;rQ#*)OOoYcJ3^7#1N#LT?-(&E%2R35u?
zkgH>et3rsQlaH%{5?FG3e=?&l<MekKj9k+nr7)^Yw@+mhn=X;bD8N%tl$o5Wq+n;O
zV4yjjF_qDhUDH~hP268|azBd%D^Rzg{&c-$Mk7uUpbO;X8QaUZXC^Zi6KUA?+*HOV
z>>F3CXWCZ4$T5M1Uy&~w7;yf40*%gWe87NbFqM?$<lyjioE)0BRgkMOh7lwRkB-Ue
Y`R8~+aSsBFK&-e~u;DQO<n#500DIV`%m4rY

diff --git a/sahara/main/__pycache__/admin.cpython-312.pyc b/sahara/main/__pycache__/admin.cpython-312.pyc
index bf855af0f572909c1bda0603f5b4cd36d783257a..125b2d4a9f00fae40c6207fe401e38362ebdb185 100644
GIT binary patch
delta 484
zcmZ3;*~G<rnwOW00SH>oG^KBw$ScXXVWPS^OD<a!+eAO{diGStECG--D##K><%4*s
ztf}m)nIPhf3?%4dTg?d5RmrZ&@e;(*WW2?in36kjov1j|Etb&Y)S_E_!Kp=MnaQa^
zsfDGf#U&F@-Ao2Kyoeh_@PG&q*Y6fvT4riaO0gyrn173-AhEc(JijQViZ>v&s5n0_
zF-O5OFD)M^57&8%8z_~VSzMf%pI5BOT*MDDjTc1lO=e@#<wmk+vK^C@4nzth4^pYg
zbc;PX2WU%baS<r2fCeBbnB2m2f{hcTmUD6tb3czVm<c5OG`S|fWp-v`hsYVSh?ppW
zm|z7eK-Mn~o80`A(wtPgA}t^n6iCI+K;i>4BO~Ko28Fu}`u7>sCs(p4NL^vjy1~HO
V&eh0uok92_gYX2us|?CulK{AIU8w*7

delta 378
zcmZqTTFA+JnwOW00SFkEHl;UB<dtMBo2aht!N|bG;Lec3+QN{+mdd=E8Ki=NA&M=P
zF^dnvMkccak$DhyDr+j+YNm-7blDkiv4j?<7EKmmys5wmlq>?-SHuk>KwQ6DY-yRP
zIVr`OOhufNd70!@;PSV)15%4}GmDEe^Ye-|nTtSH7x91y-pK(>x`C*s-Qp}rEG{n3
zFG?{)FpZ$<L7G6?HJNU)C+7gwr4|?QgZRwI3MQXpI>E*PQp+)U4s$<`5|{}j{4_Zy
zo3l7Ga!hVu5iwB&34`U7fvjH~Ho5sJr8%i~MVde^BM=uG0*MdIjEszT85Hg^=-*|K
Pn0$gof#WKJ7FZtu6W>W;

diff --git a/sahara/main/__pycache__/models.cpython-312.pyc b/sahara/main/__pycache__/models.cpython-312.pyc
index 250731b0801a53df5ab1e1558884e9a329241ff0..1aff89dff4cd2037184efd855a1989f8cfb93c43 100644
GIT binary patch
delta 2721
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

delta 948
zcmZ9KO-vI}5XbjzKiO`#AGEc!d=#X>Hi9u2Ma7R`02L+i;K9b&6m}`dwoTr)3G@JH
zFp<PW$wXs3dGSDM^w6s&8WT0~0>KZm9#C%{yht?BlW&#=g?ISn&CGx1y*F>3_q=GA
z-n!ia$JUS6*D~j&MJY_~FSbv$Tgw*oa$M5SbAz1Xn&%WzwWzkTwd${(cFPh($jizv
zOCL{`pw~X)H>|p<jZrVtP#?k%Pwbtr!XJmP_Be4>oQ_rgKoBD>46>az;Ql{7nvIAi
z2HnmOGZ$?JpU_QOp<lSiZ*Y}$;VL09NQ<RLKNHE0%}O!0H*AIcq?$7<#R-LW!f&y~
z-pt%I3eD~g(hX<ai!}-6SR%u+9R@7%4!jGMO${P|Km|4PB-|kcXq2KP0beXZq1py+
zV+|e$;*}XmBtn^Ka3#HPQ>wE$A6d%;o_cnZ8u;vq!@5V<7gSuykRmGX44>S^b82`i
zr%sXPxnxA~Fh&(GWBs&G_QMHpXs=8RA)B5`X=*N07-yD4QOD9ntuP?-hHXSk=Oztn
zuBd6>-mv3knDN%Tuq)NZ!b5M*&_Rq4itZ(1HcKaLA2Z)*I8rISKvSubctKZbSJk@6
z1iHvD$E|s4Z<Q8G%g#EQfEM57(7!($L{+sG-1W7QOYn>_fyaic$C~PG!u|e^+0^#>
zvkSA!&PKEI!*T=dVNrSraTtLEX$bw<^n^Arp=yfx6r<+kc$#k7TQ@SqzI<L&)45H5
z8)mm6;%14{*>pz55WM$aKY|}?IPxP`)X{=YPoZoGaSpL#5_-{xK$-p>?$q86u8Mo+
z`qzZWjkb?MWJQQP7=0%spf7M%G$#nv!*T##MLu+yLuBUfDE!CSo6RdlO+7|crpI3D
VN8wYnl~}=B9}<3YVbWyw<u4GT)35*l

diff --git a/sahara/main/admin.py b/sahara/main/admin.py
index bab3cf1..9e6ec17 100644
--- a/sahara/main/admin.py
+++ b/sahara/main/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
-from .models import User  # Import your custom User model
+from .models import User,ServiceRequest  # Import your custom User model
 
 class CustomUserAdmin(UserAdmin):
     model = User
@@ -34,4 +34,5 @@ class CustomUserAdmin(UserAdmin):
     list_filter = ('is_staff', 'is_superuser', 'is_active')
 
 # Register your custom User model with the custom UserAdmin class
-admin.site.register(User, CustomUserAdmin)
\ No newline at end of file
+admin.site.register(User, CustomUserAdmin)
+admin.site.register(ServiceRequest)
\ No newline at end of file
diff --git a/sahara/main/migrations/0003_service_alter_user_bio_alter_user_price_and_more.py b/sahara/main/migrations/0003_service_alter_user_bio_alter_user_price_and_more.py
new file mode 100644
index 0000000..13d182e
--- /dev/null
+++ b/sahara/main/migrations/0003_service_alter_user_bio_alter_user_price_and_more.py
@@ -0,0 +1,49 @@
+# Generated by Django 5.1.4 on 2025-01-11 19:54
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0002_user_bio_user_member_since_user_price_user_profile_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Service',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=20)),
+                ('description', models.CharField(blank=True, max_length=100, null=True)),
+            ],
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='bio',
+            field=models.CharField(blank=True, max_length=200, null=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='price',
+            field=models.PositiveBigIntegerField(blank=True, null=True),
+        ),
+        migrations.CreateModel(
+            name='ServiceRequest',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('agreed_price', models.DecimalField(decimal_places=2, default=0, max_digits=999)),
+                ('service_hour', models.PositiveIntegerField(default=1)),
+                ('agreed_on', models.DateField(auto_now_add=True)),
+                ('is_approved', models.DateTimeField(blank=True, null=True)),
+                ('remarks', models.TextField(blank=True, null=True)),
+                ('is_completed', models.BooleanField(default=False)),
+                ('completed_date', models.DateTimeField(blank=True, null=True)),
+                ('client', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='client', to=settings.AUTH_USER_MODEL)),
+                ('service', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='service', to='main.service')),
+                ('service_provider', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='service_provider', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]
diff --git a/sahara/main/migrations/__pycache__/0003_service_alter_user_bio_alter_user_price_and_more.cpython-312.pyc b/sahara/main/migrations/__pycache__/0003_service_alter_user_bio_alter_user_price_and_more.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..2fcfeeb6fd417087015406a626ec927d81f377e7
GIT binary patch
literal 3146
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
T<sXFX$e0xw`wpfs@96jufBy({

literal 0
HcmV?d00001

diff --git a/sahara/main/models.py b/sahara/main/models.py
index fb77b44..fe61cac 100644
--- a/sahara/main/models.py
+++ b/sahara/main/models.py
@@ -104,7 +104,19 @@ class User(AbstractBaseUser, PermissionsMixin):
 
 class ServiceRequest(models.Model):
     client = models.ForeignKey(User,on_delete=models.CASCADE,related_name="client")
-    service_provider = models.ForeignKey(User,on_delete=models.CASCADE,related_name="client")
+    service_provider = models.ForeignKey(User,on_delete=models.CASCADE,related_name="service_provider")
     agreed_price = models.DecimalField(max_digits=999,decimal_places=2 , default=0)
+    service_hour = models.PositiveIntegerField(default=1)
     agreed_on =  models.DateField(auto_now_add=True)
+    is_approved = models.DateTimeField(blank=True, null=True)
+    remarks = models.TextField(blank=True, null=True)
     is_completed = models.BooleanField(default=False)
+    completed_date = models.DateTimeField(null=True,blank=True)
+    service = models.ForeignKey(Service, on_delete=models.CASCADE, related_name="service")
+
+    def __str__(self):
+        return self.service.name 
+
+    @property
+    def get_full_price(self):
+        return self.agreed_price * self.service_hour
\ No newline at end of file