Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit be840e1

Browse files
Merge pull request #72 from darjeeling/fix_payment_user_id
fix payment models user_id field to `User`
2 parents 68b5184 + fea93be commit be840e1

File tree

3 files changed

+145
-1
lines changed

3 files changed

+145
-1
lines changed

‎payment/migrations/0001_initial.py‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Generated by Django 4.1.5 on 2023年05月14日 03:14
2+
3+
from django.conf import settings
4+
from django.db import migrations, models
5+
import django.db.models.deletion
6+
7+
8+
class Migration(migrations.Migration):
9+
initial = True
10+
11+
dependencies = [
12+
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
13+
]
14+
15+
operations = [
16+
migrations.CreateModel(
17+
name="PaymentHistory",
18+
fields=[
19+
(
20+
"id",
21+
models.BigAutoField(
22+
auto_created=True,
23+
primary_key=True,
24+
serialize=False,
25+
verbose_name="ID",
26+
),
27+
),
28+
("payment_key", models.CharField(max_length=32)),
29+
("status", models.IntegerField()),
30+
("create_at", models.DateTimeField(auto_now_add=True)),
31+
("update_at", models.DateTimeField(auto_now=True)),
32+
],
33+
),
34+
migrations.CreateModel(
35+
name="Payment",
36+
fields=[
37+
(
38+
"id",
39+
models.BigAutoField(
40+
auto_created=True,
41+
primary_key=True,
42+
serialize=False,
43+
verbose_name="ID",
44+
),
45+
),
46+
("payment_key", models.CharField(max_length=32)),
47+
("money", models.IntegerField()),
48+
("create_at", models.DateTimeField(auto_now_add=True)),
49+
("update_at", models.DateTimeField(auto_now=True)),
50+
(
51+
"user_id",
52+
models.ForeignKey(
53+
on_delete=django.db.models.deletion.PROTECT,
54+
to=settings.AUTH_USER_MODEL,
55+
),
56+
),
57+
],
58+
),
59+
]

‎payment/models.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
from django.db import models
2+
from django.contrib.auth import get_user_model
23

4+
User = get_user_model()
35

46
class Payment(models.Model):
57
payment_key = models.CharField(max_length=32) # TODO: uuid 처리
6-
user_id = models.ForeignKey("", on_delete=models.PROTECT)
8+
user_id = models.ForeignKey(User, on_delete=models.PROTECT)
79
money = models.IntegerField()
810
create_at = models.DateTimeField(auto_now_add=True)
911
update_at = models.DateTimeField(auto_now=True)

‎ticket/migrations/0001_initial.py‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# Generated by Django 4.1.5 on 2023年05月14日 03:14
2+
3+
from django.conf import settings
4+
from django.db import migrations, models
5+
import django.db.models.deletion
6+
import ticket.models
7+
8+
9+
class Migration(migrations.Migration):
10+
initial = True
11+
12+
dependencies = [
13+
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
14+
]
15+
16+
operations = [
17+
migrations.CreateModel(
18+
name="ConferenceTicketType",
19+
fields=[
20+
(
21+
"id",
22+
models.BigAutoField(
23+
auto_created=True,
24+
primary_key=True,
25+
serialize=False,
26+
verbose_name="ID",
27+
),
28+
),
29+
("code", models.CharField(max_length=50)),
30+
("name", models.CharField(max_length=100)),
31+
("price", models.IntegerField()),
32+
("min_price", models.IntegerField(blank=True, null=True)),
33+
("desc", models.TextField(max_length=1000)),
34+
(
35+
"day",
36+
models.CharField(
37+
choices=[("SAT", "토요일"), ("SUN", "일요일"), ("WEEKEND", "토/일요일")],
38+
max_length=10,
39+
),
40+
),
41+
],
42+
),
43+
migrations.CreateModel(
44+
name="ConferenceTicket",
45+
fields=[
46+
(
47+
"id",
48+
models.BigAutoField(
49+
auto_created=True,
50+
primary_key=True,
51+
serialize=False,
52+
verbose_name="ID",
53+
),
54+
),
55+
("bought_at", models.DateTimeField()),
56+
(
57+
"ticket_code",
58+
models.CharField(
59+
db_index=True,
60+
default=ticket.models.make_ticket_code,
61+
max_length=25,
62+
unique=True,
63+
),
64+
),
65+
("created_at", models.DateTimeField(auto_now_add=True)),
66+
("updated_at", models.DateTimeField(auto_now=True)),
67+
(
68+
"ticket_type",
69+
models.ForeignKey(
70+
on_delete=django.db.models.deletion.RESTRICT,
71+
to="ticket.conferencetickettype",
72+
),
73+
),
74+
(
75+
"user",
76+
models.ForeignKey(
77+
on_delete=django.db.models.deletion.RESTRICT,
78+
to=settings.AUTH_USER_MODEL,
79+
),
80+
),
81+
],
82+
),
83+
]

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /