Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backend/feature/initial tables #199 #203

Merged
merged 4 commits into from
Oct 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions app/backend/backend/constants.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
from enum import Enum

"""
c = UserType.ADMIN
print(c) -> UserType.ADMIN
print(c.name) -> ADMIN
print(c.value) -> 0
print(c is UserType.ADMIN) -> True
"""
class UserType(Enum):
ADMIN = 0
DOCTOR = 1
MEMBER = 2
90 changes: 90 additions & 0 deletions app/backend/backend/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
# Generated by Django 4.1.2 on 2022-10-23 16:29

import django.contrib.postgres.fields
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

initial = True

dependencies = [
]

operations = [
migrations.CreateModel(
name='Category',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=50)),
('definition', models.CharField(max_length=100, null=True)),
],
),
migrations.CreateModel(
name='MemberInfo',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('firstname', models.CharField(max_length=25)),
('lastname', models.CharField(max_length=25)),
('address', models.CharField(max_length=100, null=True)),
('weight', models.DecimalField(decimal_places=1, max_digits=3, null=True)),
('height', models.DecimalField(decimal_places=1, max_digits=3, null=True)),
('age', models.IntegerField(null=True)),
('past_illnesses', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=25), null=True, size=None)),
('allergies', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=25), null=True, size=None)),
('chronic_diseases', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=25), null=True, size=None)),
('undergone_operations', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=25), null=True, size=None)),
('used_drugs', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=25), null=True, size=None)),
],
),
migrations.CreateModel(
name='User',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('password', models.CharField(max_length=200)),
('email', models.CharField(max_length=100)),
('type', models.IntegerField()),
],
),
migrations.CreateModel(
name='Admin',
fields=[
('user_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='backend.user')),
('username', models.CharField(max_length=50)),
],
bases=('backend.user',),
),
migrations.CreateModel(
name='Report',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('message', models.CharField(max_length=500)),
('reported_user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reported_user', to='backend.user')),
('reporter_user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reporter_user', to='backend.user')),
('reviewed_by', models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='reviewed_by', to='backend.admin')),
],
),
migrations.CreateModel(
name='Member',
fields=[
('user_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='backend.user')),
('username', models.CharField(max_length=50)),
('avatar', models.CharField(max_length=200)),
('banned_by', models.CharField(max_length=50, null=True)),
('info', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='backend.memberinfo')),
],
bases=('backend.user',),
),
migrations.CreateModel(
name='Doctor',
fields=[
('user_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='backend.user')),
('full_name', models.CharField(max_length=50)),
('hospital_name', models.CharField(max_length=100, null=True)),
('verified', models.BooleanField(default=False, max_length=100)),
('specialization', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='backend.category')),
],
bases=('backend.user',),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Generated by Django 4.1.2 on 2022-10-23 17:46

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('backend', '0001_initial'),
]

operations = [
migrations.RemoveField(
model_name='member',
name='avatar',
),
migrations.AlterField(
model_name='member',
name='banned_by',
field=models.CharField(default=None, max_length=50, null=True),
),
]
18 changes: 18 additions & 0 deletions app/backend/backend/migrations/0003_alter_memberinfo_height.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 4.1.2 on 2022-10-23 18:30

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('backend', '0002_remove_member_avatar_alter_member_banned_by'),
]

operations = [
migrations.AlterField(
model_name='memberinfo',
name='height',
field=models.IntegerField(null=True),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Generated by Django 4.1.2 on 2022-10-23 18:57

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('backend', '0003_alter_memberinfo_height'),
]

operations = [
migrations.AlterField(
model_name='admin',
name='username',
field=models.CharField(max_length=50, unique=True),
),
migrations.AlterField(
model_name='category',
name='name',
field=models.CharField(max_length=50, unique=True),
),
migrations.AlterField(
model_name='member',
name='username',
field=models.CharField(max_length=50, unique=True),
),
migrations.AlterField(
model_name='user',
name='email',
field=models.CharField(max_length=100, unique=True),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Generated by Django 4.1.2 on 2022-10-23 19:10

import datetime
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('backend', '0004_alter_admin_username_alter_category_name_and_more'),
]

operations = [
migrations.AddField(
model_name='report',
name='date',
field=models.DateField(default=datetime.date.today),
),
migrations.AddField(
model_name='report',
name='reviewed_date',
field=models.DateField(null=True),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 4.1.2 on 2022-10-23 20:11

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('backend', '0005_report_date_report_reviewed_date'),
]

operations = [
migrations.AlterField(
model_name='memberinfo',
name='firstname',
field=models.CharField(max_length=25, null=True),
),
migrations.AlterField(
model_name='memberinfo',
name='lastname',
field=models.CharField(max_length=25, null=True),
),
]
Empty file.
95 changes: 95 additions & 0 deletions app/backend/backend/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
# from backend.auth_system import models
# from backend.follow_system import models
# from backend.profile_management import models

from django.db import models
from django.contrib.postgres.fields import ArrayField
import datetime

class User(models.Model):
password = models.CharField(max_length=200, null=False)
email = models.CharField(max_length=100, null=False, unique=True)

type = models.IntegerField(null=False)

def __str__(self):
return self.email


class Admin(User):
# user = models.ForeignKey(User, on_delete=models.CASCADE)
username = models.CharField(max_length=50, null=False, unique=True)

def __str__(self):
return self.username

class MemberInfo(models.Model):
firstname = models.CharField(max_length=25, null=True)
lastname = models.CharField(max_length=25, null=True)
address = models.CharField(max_length=100, null=True)
weight = models.DecimalField(null=True, max_digits=3, decimal_places=1)
height = models.IntegerField(null=True)
age = models.IntegerField(null=True)

past_illnesses = ArrayField(
models.CharField(max_length=25), null=True
)
allergies = ArrayField(
models.CharField(max_length=25), null=True
)
chronic_diseases = ArrayField(
models.CharField(max_length=25), null=True
)
undergone_operations = ArrayField(
models.CharField(max_length=25), null=True
)
used_drugs = ArrayField(
models.CharField(max_length=25), null=True
)


class Member(User):
username = models.CharField(max_length=50, null=False, unique=True)
banned_by = models.CharField(max_length=50, null=True, default=None) # username of admin

info = models.ForeignKey(MemberInfo, null=False, on_delete=models.CASCADE)

def __str__(self):
retval = ""
if self.info.firstname != None:
retval += self.info.firstname + " "
if self.info.lastname != None:
retval += self.info.lastname

if retval != "":
return retval

return self.username


class Category(models.Model):
name = models.CharField(max_length=50, null=False, unique=True)
definition = models.CharField(max_length=100, null=True)


class Doctor(User):
full_name = models.CharField(max_length=50, null=False)
specialization = models.ForeignKey(Category, null=True, on_delete=models.SET_NULL)
hospital_name = models.CharField(max_length=100, null=True)
verified = models.BooleanField(max_length=100, null=False, default=False)

def __str__(self):
return self.full_name


class Report(models.Model):
reporter_user = models.ForeignKey(User, null=False, on_delete=models.CASCADE, related_name='reporter_user')
reported_user = models.ForeignKey(User, null=False, on_delete=models.CASCADE, related_name='reported_user')
message = models.CharField(max_length=500, null=False)
date = models.DateField(null=False, default=datetime.date.today)
reviewed_by = models.ForeignKey(Admin, null=True, default=None, on_delete=models.SET_NULL, related_name='reviewed_by')
reviewed_date = models.DateField(null=True)


def __str__(self):
return self.message
9 changes: 6 additions & 3 deletions app/backend/backend/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
"""

from pathlib import Path
import os


# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent
Expand All @@ -31,6 +33,7 @@
# Application definition

INSTALLED_APPS = [
'backend',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
Expand Down Expand Up @@ -78,9 +81,9 @@
'ENGINE': 'django.db.backends.postgresql',
'NAME': 'app',
'USER': 'postgres',
'PASSWORD': 'a1b2c3d4',
'HOST':'ec2-100-24-23-233.compute-1.amazonaws.com',
'PORT':'5432',
'PASSWORD': os.environ['DATABASE_PW'],
'HOST': 'ec2-100-24-23-233.compute-1.amazonaws.com',
'PORT': '5432',
}
}

Expand Down
7 changes: 7 additions & 0 deletions app/backend/backend/utils.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import django.contrib.auth.hashers

def make_password(password):
assert password
return django.contrib.auth.hashers.make_password(
password=password
)
10 changes: 10 additions & 0 deletions app/backend/tests/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Run The Tests
Staying on **app/backend**:

1. ```
source env/bin/activate
```

2. ```
python manage.py test
```
Empty file added app/backend/tests/__init__.py
Empty file.
Loading