Skip to content

Commit 71c821b

Browse files
amitkummeramitkummer
committed
Run formatter
1 parent a28deda commit 71c821b

File tree

12 files changed

+347
-207
lines changed

12 files changed

+347
-207
lines changed

‎backend/manager/manage.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
def main():
88
"""Run administrative tasks."""
9-
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'manager.settings')
9+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "manager.settings")
1010
try:
1111
from django.core.management import execute_from_command_line
1212
except ImportError as exc:
@@ -18,5 +18,5 @@ def main():
1818
execute_from_command_line(sys.argv)
1919

2020

21-
if __name__ == '__main__':
21+
if __name__ == "__main__":
2222
main()

‎backend/manager/manager/asgi.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111

1212
from django.core.asgi import get_asgi_application
1313

14-
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'manager.settings')
14+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "manager.settings")
1515

1616
application = get_asgi_application()

‎backend/manager/manager/settings.py‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -21,78 +21,78 @@
2121
# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/
2222

2323
# SECURITY WARNING: keep the secret key used in production secret!
24-
SECRET_KEY = 'django-insecure-qm652ubq7r+z%%giot4yun$!z@qtwct=%$)(m(@gkt@=&zo6xe'
24+
SECRET_KEY = "django-insecure-qm652ubq7r+z%%giot4yun$!z@qtwct=%$)(m(@gkt@=&zo6xe"
2525

2626
# SECURITY WARNING: don't run with debug turned on in production!
2727
DEBUG = True
2828

29-
ALLOWED_HOSTS = ['*']
29+
ALLOWED_HOSTS = ["*"]
3030

3131

3232
# Application definition
3333

3434
INSTALLED_APPS = [
35-
'django.contrib.admin',
36-
'django.contrib.auth',
37-
'django.contrib.contenttypes',
38-
'django.contrib.sessions',
39-
'django.contrib.messages',
40-
'django.contrib.staticfiles',
41-
'rest_framework',
42-
'tasks.apps.TasksConfig',
35+
"django.contrib.admin",
36+
"django.contrib.auth",
37+
"django.contrib.contenttypes",
38+
"django.contrib.sessions",
39+
"django.contrib.messages",
40+
"django.contrib.staticfiles",
41+
"rest_framework",
42+
"tasks.apps.TasksConfig",
4343
]
4444

4545
MIDDLEWARE = [
46-
'django.middleware.security.SecurityMiddleware',
47-
'whitenoise.middleware.WhiteNoiseMiddleware',
48-
'django.contrib.sessions.middleware.SessionMiddleware',
49-
'django.middleware.common.CommonMiddleware',
50-
'django.middleware.csrf.CsrfViewMiddleware',
51-
'django.contrib.auth.middleware.AuthenticationMiddleware',
52-
'django.contrib.messages.middleware.MessageMiddleware',
53-
'django.middleware.clickjacking.XFrameOptionsMiddleware',
46+
"django.middleware.security.SecurityMiddleware",
47+
"whitenoise.middleware.WhiteNoiseMiddleware",
48+
"django.contrib.sessions.middleware.SessionMiddleware",
49+
"django.middleware.common.CommonMiddleware",
50+
"django.middleware.csrf.CsrfViewMiddleware",
51+
"django.contrib.auth.middleware.AuthenticationMiddleware",
52+
"django.contrib.messages.middleware.MessageMiddleware",
53+
"django.middleware.clickjacking.XFrameOptionsMiddleware",
5454
]
5555

56-
ROOT_URLCONF = 'manager.urls'
56+
ROOT_URLCONF = "manager.urls"
5757

5858
TEMPLATES = [
5959
{
60-
'BACKEND': 'django.template.backends.django.DjangoTemplates',
61-
'DIRS': [],
62-
'APP_DIRS': True,
63-
'OPTIONS': {
64-
'context_processors': [
65-
'django.template.context_processors.debug',
66-
'django.template.context_processors.request',
67-
'django.contrib.auth.context_processors.auth',
68-
'django.contrib.messages.context_processors.messages',
60+
"BACKEND": "django.template.backends.django.DjangoTemplates",
61+
"DIRS": [],
62+
"APP_DIRS": True,
63+
"OPTIONS": {
64+
"context_processors": [
65+
"django.template.context_processors.debug",
66+
"django.template.context_processors.request",
67+
"django.contrib.auth.context_processors.auth",
68+
"django.contrib.messages.context_processors.messages",
6969
],
7070
},
7171
},
7272
]
7373

74-
WSGI_APPLICATION = 'manager.wsgi.application'
74+
WSGI_APPLICATION = "manager.wsgi.application"
7575

7676

7777
# Database
7878
# https://docs.djangoproject.com/en/3.2/ref/settings/#databases
7979

8080
DATABASES = {
81-
'default': {
82-
'ENGINE': 'django.db.backends.postgresql',
83-
'NAME': 'postgres',
84-
'USER': 'postgres',
85-
'PASSWORD': 'postgresSuperUserPsw',
86-
'HOST': 'manager-db',
87-
'PORT': '5432',
81+
"default": {
82+
"ENGINE": "django.db.backends.postgresql",
83+
"NAME": "postgres",
84+
"USER": "postgres",
85+
"PASSWORD": "postgresSuperUserPsw",
86+
"HOST": "manager-db",
87+
"PORT": "5432",
8888
}
8989
}
9090

9191
# If the DB environment variable is set to `sqlite`, switch from postgres to sqlite.
92-
if (os.getenv('DB') == 'sqlite'):
93-
DATABASES['default'] = {
94-
'ENGINE': 'django.db.backends.sqlite3',
95-
'NAME': 'mydatabase',
92+
if os.getenv("DB") == "sqlite":
93+
DATABASES["default"] = {
94+
"ENGINE": "django.db.backends.sqlite3",
95+
"NAME": "mydatabase",
9696
}
9797

9898

@@ -101,26 +101,26 @@
101101

102102
AUTH_PASSWORD_VALIDATORS = [
103103
{
104-
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
104+
"NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
105105
},
106106
{
107-
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
107+
"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
108108
},
109109
{
110-
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
110+
"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
111111
},
112112
{
113-
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
113+
"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
114114
},
115115
]
116116

117117

118118
# Internationalization
119119
# https://docs.djangoproject.com/en/3.2/topics/i18n/
120120

121-
LANGUAGE_CODE = 'en-us'
121+
LANGUAGE_CODE = "en-us"
122122

123-
TIME_ZONE = 'UTC'
123+
TIME_ZONE = "UTC"
124124

125125
USE_I18N = True
126126

@@ -132,9 +132,9 @@
132132
# Static files (CSS, JavaScript, Images)
133133
# https://docs.djangoproject.com/en/3.2/howto/static-files/
134134

135-
STATIC_URL = '/static/'
135+
STATIC_URL = "/static/"
136136

137137
# Default primary key field type
138138
# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
139139

140-
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
140+
DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"

‎backend/manager/manager/urls.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222
# Declaratively map DRF views to urls using DefulatRouter.
2323
# https://www.django-rest-framework.org/api-guide/routers/#defaultrouter
2424
router = DefaultRouter()
25-
router.register(r'tasks', views.TaskViewSet)
26-
router.register(r'people', views.PersonViewSet)
25+
router.register(r"tasks", views.TaskViewSet)
26+
router.register(r"people", views.PersonViewSet)
2727

28-
urlpatterns = [
29-
path('admin/', admin.site.urls),
30-
path('api/', include(router.urls))
31-
]
28+
urlpatterns = [path("admin/", admin.site.urls), path("api/", include(router.urls))]

‎backend/manager/manager/wsgi.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111

1212
from django.core.wsgi import get_wsgi_application
1313

14-
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'manager.settings')
14+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "manager.settings")
1515

1616
application = get_wsgi_application()

‎backend/manager/tasks/apps.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33

44
class TasksConfig(AppConfig):
5-
default_auto_field = 'django.db.models.BigAutoField'
6-
name = 'tasks'
5+
default_auto_field = "django.db.models.BigAutoField"
6+
name = "tasks"

‎backend/manager/tasks/migrations/0001_initial.py‎

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,53 @@ class Migration(migrations.Migration):
88

99
initial = True
1010

11-
dependencies = [
12-
]
11+
dependencies = []
1312

1413
operations = [
1514
migrations.CreateModel(
16-
name='Person',
15+
name="Person",
1716
fields=[
18-
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
19-
('name', models.CharField(max_length=1000)),
20-
('email', models.EmailField(max_length=254, unique=True)),
21-
('favoriteProgrammingLanguage', models.CharField(max_length=1000)),
17+
(
18+
"id",
19+
models.BigAutoField(
20+
auto_created=True,
21+
primary_key=True,
22+
serialize=False,
23+
verbose_name="ID",
24+
),
25+
),
26+
("name", models.CharField(max_length=1000)),
27+
("email", models.EmailField(max_length=254, unique=True)),
28+
("favoriteProgrammingLanguage", models.CharField(max_length=1000)),
2229
],
2330
),
2431
migrations.CreateModel(
25-
name='Task',
32+
name="Task",
2633
fields=[
27-
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
28-
('title', models.CharField(max_length=1000)),
29-
('details', models.CharField(max_length=1000)),
30-
('dueDate', models.DateField()),
31-
('status', models.CharField(choices=[('active', 'active'), ('done', 'done')], max_length=100)),
32-
('ownerId', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tasks.person')),
34+
(
35+
"id",
36+
models.BigAutoField(
37+
auto_created=True,
38+
primary_key=True,
39+
serialize=False,
40+
verbose_name="ID",
41+
),
42+
),
43+
("title", models.CharField(max_length=1000)),
44+
("details", models.CharField(max_length=1000)),
45+
("dueDate", models.DateField()),
46+
(
47+
"status",
48+
models.CharField(
49+
choices=[("active", "active"), ("done", "done")], max_length=100
50+
),
51+
),
52+
(
53+
"ownerId",
54+
models.ForeignKey(
55+
on_delete=django.db.models.deletion.CASCADE, to="tasks.person"
56+
),
57+
),
3358
],
3459
),
3560
]

‎backend/manager/tasks/models.py‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,26 @@
33
# Create your models here.
44
# https://docs.djangoproject.com/en/4.0/ref/models/fields/
55

6+
67
class Task(models.Model):
78
title = models.CharField(max_length=1000)
89
details = models.CharField(max_length=1000)
910
dueDate = models.DateField()
10-
status = models.CharField(max_length=100, choices=[
11-
('active', 'active'),
12-
('done', 'done'),
13-
])
14-
ownerId = models.ForeignKey('Person', on_delete=models.CASCADE)
11+
status = models.CharField(
12+
max_length=100,
13+
choices=[
14+
("active", "active"),
15+
("done", "done"),
16+
],
17+
)
18+
ownerId = models.ForeignKey("Person", on_delete=models.CASCADE)
19+
1520

1621
class Person(models.Model):
1722
name = models.CharField(max_length=1000)
1823
email = models.EmailField(unique=True)
1924
favoriteProgrammingLanguage = models.CharField(max_length=1000)
20-
25+
2126
# Computed property (field) for a person's task count.
2227
# https://docs.djangoproject.com/en/4.0/topics/db/models/#model-methods
2328
@property

‎backend/manager/tasks/serializers.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
# Create your serizliers here.
66
# https://www.django-rest-framework.org/api-guide/serializers/
77

8+
89
class TaskSerializer(serializers.ModelSerializer):
910
class Meta:
1011
model = Task
11-
fields = '__all__'
12+
fields = "__all__"
13+
1214

1315
class PersonSerializer(serializers.ModelSerializer):
1416
class Meta:
1517
model = Person
16-
fields = ['name', 'email', 'favoriteProgrammingLanguage', 'activeTaskCount']
18+
fields = ["name", "email", "favoriteProgrammingLanguage", "activeTaskCount"]

0 commit comments

Comments
 (0)