From 0a21e9180c7d20dc623fa15c17aaf0cf88c59b3b Mon Sep 17 00:00:00 2001
From: Sophie Morris <sm02810@surrey.ac.uk>
Date: Tue, 30 Apr 2024 12:59:33 +0100
Subject: [PATCH] migration error fixed
---
docker-compose.yml | 6 ++---
.../__pycache__/models.cpython-312.pyc | Bin 1998 -> 2000 bytes
.../migrations/0002_alter_post_author.py | 21 ++++++++++++++++++
.../0002_alter_post_author.cpython-312.pyc | Bin 0 -> 1095 bytes
post/postapp/models.py | 2 +-
.../__pycache__/models.cpython-312.pyc | Bin 1488 -> 1499 bytes
.../migrations/0002_alter_profile_user.py | 21 ++++++++++++++++++
.../0002_alter_profile_user.cpython-312.pyc | Bin 0 -> 1110 bytes
profiles/profileapp/models.py | 2 +-
9 files changed, 47 insertions(+), 5 deletions(-)
create mode 100644 post/postapp/migrations/0002_alter_post_author.py
create mode 100644 post/postapp/migrations/__pycache__/0002_alter_post_author.cpython-312.pyc
create mode 100644 profiles/profileapp/migrations/0002_alter_profile_user.py
create mode 100644 profiles/profileapp/migrations/__pycache__/0002_alter_profile_user.cpython-312.pyc
diff --git a/docker-compose.yml b/docker-compose.yml
index a5f4351..3917893 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
main:
build: .
container_name: main
- command: bash -c "python main/manage.py makemigrations && python main/manage.py migrate && python main/manage.py runserver 0.0.0.0:8000"
+ command: bash -c "python main/manage.py makemigrations contact && python main/manage.py migrate contact && python main/manage.py runserver 0.0.0.0:8000"
volumes:
- .:/usr/src/app
ports:
@@ -22,7 +22,7 @@ services:
posts:
build: .
container_name: posts
- command: bash -c "python post/manage.py makemigrations && python post/manage.py migrate && python post/manage.py runserver 0.0.0.0:8002"
+ command: bash -c "python post/manage.py makemigrations postapp && python post/manage.py migrate postapp && python post/manage.py runserver 0.0.0.0:8002"
volumes:
- .:/usr/src/app
ports:
@@ -32,7 +32,7 @@ services:
profiles:
build: .
container_name: profiles
- command: bash -c "python profiles/manage.py makemigrations && python profiles/manage.py migrate && python profiles/manage.py runserver 0.0.0.0:8003"
+ command: bash -c "python profiles/manage.py makemigrations profileapp && python profiles/manage.py migrate profileapp && python profiles/manage.py runserver 0.0.0.0:8003"
volumes:
- .:/usr/src/app
ports:
diff --git a/post/postapp/__pycache__/models.cpython-312.pyc b/post/postapp/__pycache__/models.cpython-312.pyc
index b3b0be386a52a1398d3ee4aca6ecbffeb8c09e11..51a720ee18be893acf95c9c6999c182cd6fccf30 100644
GIT binary patch
delta 361
zcmX@de}SL(G%qg~0}zzmF-Utok@x3BSx!c|$pVbQENhrnGf&QByezEAbc-`TFFqwT
zC$%K?7E4}fPR`~qra(pxc4x<6XGa&;$s3pp6-0oBtYjz>1yV)AAc6x%fEdLMlO0*4
zIqeSGU5JRe!W%m|gC&7cbn{6Tb;f#5p!_YKqSTzklGK#=yu{qpA|9Ynh$eFpNU8|r
zzFVwGIf;4MnvA!25=%?+<MZ;%;}cU-{51KC#6W7qL4*W|U<MJAAOh?FX%LGQL`VUN
zTO7fzA@P2pK0ZY<ATe1Wp?QlvIX|x?HLs*d9wep!BGf<x!Y>*iuEyj}wjwsLpvGiI
e_5^vbD5}a|95%W6DWy57c15O>8`!;AK*|A6l2Wt)
delta 387
zcmcb>e~zE`G%qg~0}zz=u%-Q;$orFv4a5V2&kB<T7=zhT7}qeZW|^GMcv)&C^DWN&
zy!e#VoYa!kTP%5{IXSmjlX4RCvN!uO1u}AS1iOaB`-S@WOkT!Z=q?5{V<kh8IFKq5
z1rZ!D0>mh81`;g{4|wG|!mjhmUF4OUQE^?~{Gz=10kh-w2kkFJ#a+nAxx$+}IhrMb
zQGD|r7InsYkV9|r6s6`QmZYY{=OyN*7V!avLW($nq$cAnp2X6U{P?{5^7zD*6hBS=
zA_<^)ktB$a0ujt0LK;MXoN$ZX*)iDJ(Z#ih6(l4BB4j~?9Egwy61Uis^Ycnl^Gb>o
zK|)eWAW{QFAbh0-;%ZIqW-DR?3u;YfW>1g@i=wLh#bJ}1pHiBWYFA`7xryD21*9AR
D-(g)<
diff --git a/post/postapp/migrations/0002_alter_post_author.py b/post/postapp/migrations/0002_alter_post_author.py
new file mode 100644
index 0000000..6280997
--- /dev/null
+++ b/post/postapp/migrations/0002_alter_post_author.py
@@ -0,0 +1,21 @@
+# Generated by Django 3.2.25 on 2024-04-30 11:56
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('postapp', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='post',
+ name='author',
+ field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+ ),
+ ]
diff --git a/post/postapp/migrations/__pycache__/0002_alter_post_author.cpython-312.pyc b/post/postapp/migrations/__pycache__/0002_alter_post_author.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..9933760febd76b396f139e7f0341f8bc0f5d60e7
GIT binary patch
literal 1095
zcmZuwJ#W)M7(Rc*vE7u0C<1~gw4~5vNdj9WR5kPi3T=_ncJXp@bJyU=v4icXWI-Tx
zVC>evP}KeanD_xKSRgq%kQkWQBDGyQAnxp>MM^xpe%|LEzxVpN_r8petAIXlewKC~
z^8oy2$>53g!AX^Z1AqYHOwi;sj$@cN`KF)=O;HoWTrgvr#DgaQiF*LWu+X?ND0KNg
z5+ba{J3?Oi!;(BlWEXp$Vb$F{Pt>MScXZFNEtg158)4I3uU!@ZK<OtZe<?Ts7-$><
z8qWi|qx`=x!Z_AQ46{dE#38QEYw_^g<gg0yNT6#<BRyhG#AA&c!+aw(g1b3_yEV*>
z?)5k}aP3$cpgN~bbmDoLC~E_|sCV&}?Rt8vMG~b_=>aq>!!vY~h>RwZ-u7PF&SqX9
zqSZD{qSzLs_F@kc-m@vKhIT_sZ(=H8F}7o16RqcyM1~;`AyFZuy0(caPC)pot(!~>
zp(D~iB58M*cA#(5b%a~kLfEQx9CqwvqO!I56mD%SRpHu;#idn}xKJ3_C2Ga=u(Ql|
zblB(-b=h{XQMaDs4v|npx9T?G(KeC8uIYr3_(El4p|ZF{RJ(=yQ}Y3wFlW!_ifz{^
zx=yV~`zbOD!oZTt5i3%o9zvaM44DK*CKXy8Cr*omfen@G(Xa=45>RsQ)j*#0<=I0y
z$j$q?`EPQiD`$H#AuYXK?InP6n<*xJd9r(bvU@etO=b7*2dS)|${waaUi+N+lnKf!
zet9J*SN(D|C~JOM`wHs;-1Xt^_tfjtxTvT-K}t#Qo;g#4Ht1oGMJ5z#wzU&ks`MGO
z9l9U+mboAc(FH0D40G5ZMt^pPp|JQgMd$LP=uqdJdo*RY!@WyGPvAK2Oak2WFOd5I
WrcR}CPTE(4<cy!3IRi8aYy1Ol&j!!{
literal 0
HcmV?d00001
diff --git a/post/postapp/models.py b/post/postapp/models.py
index dba99f4..aa61962 100644
--- a/post/postapp/models.py
+++ b/post/postapp/models.py
@@ -7,7 +7,7 @@ alphanumeric = RegexValidator(r'^[0-9a-zA-Z]*$', '') #Just in case
class post(models.Model):
#login profile
- author = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.SET_NULL, null =True, blank = True) #Needs improvement, compare to others
+ author = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, null=True) #Needs improvement, compare to others
description = models.TextField()
created_at = models.DateTimeField(auto_now = True) #Simple enough
updated_at = models.DateTimeField(auto_now=True)
diff --git a/profiles/profileapp/__pycache__/models.cpython-312.pyc b/profiles/profileapp/__pycache__/models.cpython-312.pyc
index 41a804132f9af6db93c383808b0b7895b99f8b4d..50e21fa9f74055cde921399edb3781277f79fda4 100644
GIT binary patch
delta 311
zcmcb>eVd#2G%qg~0}$liF-S9?$a{LCEGOfp$w!%0C$lr^u%$4rVOq^R*_=_4k#TY)
zqdJgmWRw>P(PX;CnV%P*lA4oRl6s3JuQVrT@;XK}My}0Q8TA<%`6jb68!89`ja|u5
zBm$(0gg^v4j9>*aiv1>sG0U-Ch>X3$9XGk0S&va<@-pU~a=bt}O-7)ZiMgpo0w9Hq
zKtcgxg7D;87Hv0>iGG^wMWR5uNDM@Xg9sKNaf{PABeBRWGc_lrNDU+iazv3lh(NeQ
s5yVxT{EkI~4J@cQS%x)C9xRHg@)w6qZhlH>PO4pz&g6-#)+`|90OEi_{r~^~
delta 332
zcmcc3eSw?zG%qg~0}z-oi=^pH<UP&B0^$L|=M9rDFsn{xXVhU?!?>DhvL&M;Bh%z)
zMs+==HLR<dAc~@RQrKD;qIfIWH92mv2NdO}W#*)6GT!3M&x=n<%}Fgu4Vk=+QH_yv
z^Ib-LMn>Mryv&9QLO{JM8H$8~RFNQvV22T`Kt{3m<Tz$I<}2L6lbe|J7=<TqWZo&q
z1C#(7%aWIvn_9#VQpE@)6d>A#CU>xCyMc`J(_}9a0n$aHAVLg8fV^{y(>Wut$SpH9
zC#6UgBnWarksOFXI6?u$RhayfMS~42s4!WbHB25XimLJ#hfQvNN@-52U6J<WIjq(!
GAmsoQYeOpl
diff --git a/profiles/profileapp/migrations/0002_alter_profile_user.py b/profiles/profileapp/migrations/0002_alter_profile_user.py
new file mode 100644
index 0000000..443bfb7
--- /dev/null
+++ b/profiles/profileapp/migrations/0002_alter_profile_user.py
@@ -0,0 +1,21 @@
+# Generated by Django 3.2.25 on 2024-04-30 11:56
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('profileapp', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='profile',
+ name='user',
+ field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+ ),
+ ]
diff --git a/profiles/profileapp/migrations/__pycache__/0002_alter_profile_user.cpython-312.pyc b/profiles/profileapp/migrations/__pycache__/0002_alter_profile_user.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e13b393d8545a72731544a234e997cf8ebe70cb1
GIT binary patch
literal 1110
zcmZuwO>fgc5M6)9b`u(+N(Drrppqt+Byf&Uqkce9+DdJ6u~e;`coR8t>|i@WDG~yy
z2adh<FBG*u08ab>E?6KrT97z!;ufjxr3b{W9k)oy9>#Cpj%R1z%zjCw6hPLSpQYwH
z3&3yc#7h`~vuy&7fDUxV1RX|Y7>Zew?QkmB;Z;8LIa5$Y7CZwwe*km=aqSy%qU-Mo
z7hyHg=knqo>f{+LxybVjtL5fdtaOZ)qj`pHxmfJjIx^kO#&rS!<dJjsmw+RHfXe7V
zWm!N@l>QHlFcR9yarT6XIGt&+Y9jnMJszdAI!E^8_RNGm9!<4xjq~ly1n$lR?(R4@
zxz<x5R_#=bQHxQh`-!}S<&9V_s$JKyn}&(BZWkv@rP5<)ScYe4CQgiYFyC{LvzzBI
zZ}m(Q%eDoH#K=RK^=v{bq2$ogI*5c&D>Myc>YMpAmSD(3h!qG)T+c)VCn0><(@Yu*
zp~I6~;TiW8DM71~eI0d?r6a4+cWCSJbfvcY9M*PLx8cUt%4!uSuObZOVx?kw$XTN&
zI&}PSYRf{qHZdWGMZK+AEgQ3X9ZO;1WKeKoxw5ldSy{!3-9@9}`2fzSz?W;qp6e7{
zr%@y&6-P3-F`(S_z!iyRPoPFifTKuA^(u7xPJ$#04V^L9Bjx}MMIh(iD}l7=ON+-+
zkX!O|OW&l*K*|mUZbp1t9VUT%k4DV-(%fKnesFVkkjWlqgG|=XWRF)qu6<trv>ueJ
zez_WyYks*Fl=uAd-q(6NsPFsr{qLFA=Lud`hMbrY-@S0=<1$F^ry?;54clr)>dGTV
zuZN9@B)ok^7NYl5h=p_LTt+v$Pf?is0YR5iIqL6I=Miz~V{so6GvpYCxex*K;1|gK
X0Q2W!iV+W$AidzH7cKyC!W{nqwtfwU
literal 0
HcmV?d00001
diff --git a/profiles/profileapp/models.py b/profiles/profileapp/models.py
index 117dd85..652dff3 100644
--- a/profiles/profileapp/models.py
+++ b/profiles/profileapp/models.py
@@ -3,7 +3,7 @@ from django.db import models
from django.conf import settings
class Profile(models.Model):
- user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
+ user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, null=True)
bio = models.TextField(blank=True)
profile_picture = models.ImageField(upload_to='profile_pics/', blank=True)
--
GitLab