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.

Sign up for GitHub

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

Jump to bottom

[Improvement] Update Database schemas #24

Merged
merged 7 commits into from
Jul 15, 2021
Merged

[Improvement] Update Database schemas #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2fdba0c
Add address line 2 to db schemas
angeladietz Jul 8, 2021
00b214a
Add custom gender field to db schemas
angeladietz Jul 9, 2021
df71d57
Add acceptedTOC field to db schema
angeladietz Jul 9, 2021
6fa13fd
Generate graphql types
angeladietz Jul 9, 2021
f1ff3c4
Restore employee prisma schema
angeladietz Jul 10, 2021
1cab24e
Update schema.prisma
angeladietz Jul 14, 2021
6834958
Use camel case instead of snake case
angeladietz Jul 15, 2021
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
10 changes: 8 additions & 2 deletions lib/applicants/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@ type Applicant {
lastName: String!
dateOfBirth: Date!
gender: Gender!
customGender: String
email: String
phone: String!
province: Province!
city: String!
address: String!
addressLine1: String!
addressLine2: String
postalCode: String!
rcdUserId: Int
acceptedTOC: Date
# status: ApplicantStatus
# applications: [Application!]
# guardian: Guardian
Expand All @@ -27,13 +30,16 @@ input CreateApplicantInput {
lastName: String!
dateOfBirth: Date!
gender: Gender!
customGender: String
email: String
phone: String!
province: Province!
city: String!
address: String!
addressLine1: String!
addressLine2: String
postalCode: String!
rcdUserId: Int
acceptedTOC: Date
# status: ApplicantStatus
# applications: [Application!]
# guardian: Guardian
Expand Down
20 changes: 14 additions & 6 deletions lib/applications/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ type Application {
lastName: String!
dateOfBirth: Date!
gender: Gender!
customGender: String
email: String!
phone: String!
province: Province!
city: String!
address: String!
addressLine1: String!
addressLine2: String
postalCode: String!
notes: String
rcdUserId: Int
Expand All @@ -28,7 +30,8 @@ type Application {
#Physician Information
physicianName: String!
physicianMspNumber: Int!
physicianAddress: String!
physicianAddressLine1: String!
physicianAddressLine2: String
physicianCity: String!
physicianProvince: Province!
physicianPostalCode: String!
Expand All @@ -48,7 +51,8 @@ type Application {
guardianPhone: String
guardianProvince: Province
guardianCity: String
guardianAddress: String
guardianAddressLine1: String
guardianAddressLine2: String
guardianPostalCode: String
guardianRelationship: String
guardianNotes: String
Expand All @@ -61,11 +65,13 @@ input CreateApplicationInput {
lastName: String!
dateOfBirth: Date!
gender: Gender!
customGender: String
email: String!
phone: String!
province: Province!
city: String!
address: String!
addressLine1: String!
addressLine2: String
postalCode: String!
notes: String
rcdUserId: Int
Expand All @@ -83,7 +89,8 @@ input CreateApplicationInput {
#Physician Information
physicianName: String!
physicianMspNumber: Int!
physicianAddress: String!
physicianAddressLine1: String!
physicianAddressLine2: String
physicianCity: String!
physicianProvince: Province!
physicianPostalCode: String!
Expand All @@ -103,7 +110,8 @@ input CreateApplicationInput {
guardianPhone: String
guardianProvince: Province
guardianCity: String
guardianAddress: String
guardianAddressLine1: String
guardianAddressLine2: String
guardianPostalCode: String
guardianRelationship: String
guardianNotes: String
Expand Down
67 changes: 57 additions & 10 deletions lib/graphql/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,16 @@ export type Applicant = {
lastName: Scalars['String'];
dateOfBirth: Scalars['Date'];
gender: Gender;
customGender?: Maybe<Scalars['String']>;
email?: Maybe<Scalars['String']>;
phone: Scalars['String'];
province: Province;
city: Scalars['String'];
address: Scalars['String'];
addressLine1: Scalars['String'];
addressLine2?: Maybe<Scalars['String']>;
postalCode: Scalars['String'];
rcdUserId?: Maybe<Scalars['Int']>;
acceptedTOC?: Maybe<Scalars['Date']>;
};

export enum ApplicantStatus {
Expand All @@ -57,11 +60,13 @@ export type Application = {
lastName: Scalars['String'];
dateOfBirth: Scalars['Date'];
gender: Gender;
customGender?: Maybe<Scalars['String']>;
email: Scalars['String'];
phone: Scalars['String'];
province: Province;
city: Scalars['String'];
address: Scalars['String'];
addressLine1: Scalars['String'];
addressLine2?: Maybe<Scalars['String']>;
postalCode: Scalars['String'];
notes?: Maybe<Scalars['String']>;
rcdUserId?: Maybe<Scalars['Int']>;
Expand All @@ -77,7 +82,8 @@ export type Application = {
/** Physician Information */
physicianName: Scalars['String'];
physicianMspNumber: Scalars['Int'];
physicianAddress: Scalars['String'];
physicianAddressLine1: Scalars['String'];
physicianAddressLine2?: Maybe<Scalars['String']>;
physicianCity: Scalars['String'];
physicianProvince: Province;
physicianPostalCode: Scalars['String'];
Expand All @@ -95,7 +101,8 @@ export type Application = {
guardianPhone?: Maybe<Scalars['String']>;
guardianProvince?: Maybe<Province>;
guardianCity?: Maybe<Scalars['String']>;
guardianAddress?: Maybe<Scalars['String']>;
guardianAddressLine1?: Maybe<Scalars['String']>;
guardianAddressLine2?: Maybe<Scalars['String']>;
guardianPostalCode?: Maybe<Scalars['String']>;
guardianRelationship?: Maybe<Scalars['String']>;
guardianNotes?: Maybe<Scalars['String']>;
Expand All @@ -107,13 +114,16 @@ export type CreateApplicantInput = {
lastName: Scalars['String'];
dateOfBirth: Scalars['Date'];
gender: Gender;
customGender?: Maybe<Scalars['String']>;
email?: Maybe<Scalars['String']>;
phone: Scalars['String'];
province: Province;
city: Scalars['String'];
address: Scalars['String'];
addressLine1: Scalars['String'];
addressLine2?: Maybe<Scalars['String']>;
postalCode: Scalars['String'];
rcdUserId?: Maybe<Scalars['Int']>;
acceptedTOC?: Maybe<Scalars['Date']>;
};

export type CreateApplicantResult = {
Expand All @@ -128,11 +138,13 @@ export type CreateApplicationInput = {
lastName: Scalars['String'];
dateOfBirth: Scalars['Date'];
gender: Gender;
customGender?: Maybe<Scalars['String']>;
email: Scalars['String'];
phone: Scalars['String'];
province: Province;
city: Scalars['String'];
address: Scalars['String'];
addressLine1: Scalars['String'];
addressLine2?: Maybe<Scalars['String']>;
postalCode: Scalars['String'];
notes?: Maybe<Scalars['String']>;
rcdUserId?: Maybe<Scalars['Int']>;
Expand All @@ -148,7 +160,8 @@ export type CreateApplicationInput = {
/** Physician Information */
physicianName: Scalars['String'];
physicianMspNumber: Scalars['Int'];
physicianAddress: Scalars['String'];
physicianAddressLine1: Scalars['String'];
physicianAddressLine2?: Maybe<Scalars['String']>;
physicianCity: Scalars['String'];
physicianProvince: Province;
physicianPostalCode: Scalars['String'];
Expand All @@ -166,7 +179,8 @@ export type CreateApplicationInput = {
guardianPhone?: Maybe<Scalars['String']>;
guardianProvince?: Maybe<Province>;
guardianCity?: Maybe<Scalars['String']>;
guardianAddress?: Maybe<Scalars['String']>;
guardianAddressLine1?: Maybe<Scalars['String']>;
guardianAddressLine2?: Maybe<Scalars['String']>;
guardianPostalCode?: Maybe<Scalars['String']>;
guardianRelationship?: Maybe<Scalars['String']>;
guardianNotes?: Maybe<Scalars['String']>;
Expand All @@ -189,11 +203,26 @@ export type CreateEmployeeResult = {
ok: Scalars['Boolean'];
};

export type CreatePermitInput = {
rcdPermitId: Scalars['Int'];
expiryDate: Scalars['Date'];
receiptId?: Maybe<Scalars['Int']>;
active: Scalars['Boolean'];
applicationId: Scalars['Int'];
applicantId: Scalars['Int'];
};

export type CreatePermitResult = {
__typename?: 'CreatePermitResult';
ok: Scalars['Boolean'];
};

export type CreatePhysicianInput = {
firstName: Scalars['String'];
lastName: Scalars['String'];
mspNumber: Scalars['Int'];
address: Scalars['String'];
addressLine1: Scalars['String'];
addressLine2?: Maybe<Scalars['String']>;
city: Scalars['String'];
province: Province;
postalCode: Scalars['String'];
Expand Down Expand Up @@ -233,6 +262,7 @@ export type Mutation = {
createEmployee: CreateEmployeeResult;
createPhysician: CreatePhysicianResult;
createApplication: CreateApplicationResult;
createPermit: CreatePermitResult;
};

export type MutationCreateApplicantArgs = {
Expand All @@ -251,6 +281,10 @@ export type MutationCreateApplicationArgs = {
input: CreateApplicationInput;
};

export type MutationCreatePermitArgs = {
input: CreatePermitInput;
};

export enum PaymentType {
Mastercard = 'MASTERCARD',
Visa = 'VISA',
Expand All @@ -261,12 +295,24 @@ export enum PaymentType {
MoneyOrder = 'MONEY_ORDER',
}

export type Permit = {
__typename?: 'Permit';
id: Scalars['ID'];
rcdPermitId: Scalars['Int'];
expiryDate: Scalars['Date'];
receiptId?: Maybe<Scalars['Int']>;
active: Scalars['Boolean'];
applicationId: Scalars['Int'];
applicantId: Scalars['Int'];
};

export type Physician = {
__typename?: 'Physician';
firstName: Scalars['String'];
lastName: Scalars['String'];
mspNumber: Scalars['Int'];
address: Scalars['String'];
addressLine1: Scalars['String'];
addressLine2?: Maybe<Scalars['String']>;
city: Scalars['String'];
province: Province;
postalCode: Scalars['String'];
Expand Down Expand Up @@ -308,6 +354,7 @@ export type Query = {
employees?: Maybe<Array<Employee>>;
physicians?: Maybe<Array<Physician>>;
applications?: Maybe<Array<Application>>;
permits?: Maybe<Array<Permit>>;
};

export enum Role {
Expand Down
6 changes: 4 additions & 2 deletions lib/physicians/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ type Physician {
firstName: String!
lastName: String!
mspNumber: Int!
address: String!
addressLine1: String!
addressLine2: String
city: String!
province: Province!
postalCode: String!
Expand All @@ -15,7 +16,8 @@ input CreatePhysicianInput {
firstName: String!
lastName: String!
mspNumber: Int!
address: String!
addressLine1: String!
addressLine2: String
city: String!
province: Province!
postalCode: String!
Expand Down
21 changes: 15 additions & 6 deletions prisma/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,17 @@ model Applicant {
lastName String @map("last_name") @db.VarChar(255)
dateOfBirth DateTime @map("date_of_birth") @db.Date
gender Gender
customGender String? @map("custom_gender") @db.VarChar(255)
email String? @unique @db.VarChar(255)
phone String @db.VarChar(50)
province Province
city String @db.VarChar(255)
address String @db.VarChar(255)
addressLine1 String @map("address_line_1") @db.VarChar(255)
addressLine2 String? @map("address_line_2") @db.VarChar(255)
postalCode String @map("postal_code") @db.Char(6)
rcdUserId Int? @unique @map("rcd_user_id")
status ApplicantStatus?
acceptedTOC DateTime? @map("accepted_toc") @db.Timestamptz(6)
createdAt DateTime @default(now()) @map("created_at") @db.Timestamptz(6)
updatedAt DateTime @default(now()) @updatedAt @map("updated_at") @db.Timestamptz(6)
applications Application[]
Expand All @@ -39,11 +42,13 @@ model Application {
lastName String @map("last_name") @db.VarChar(255)
dateOfBirth DateTime @map("date_of_birth") @db.Date
gender Gender
customGender String? @map("custom_gender") @db.VarChar(255)
email String? @db.VarChar(255)
phone String @db.VarChar(50)
province Province
city String @db.VarChar(255)
address String @db.VarChar(255)
addressLine1 String @map("address_line_1") @db.VarChar(255)
addressLine2 String? @map("address_line_2") @db.VarChar(255)
postalCode String @map("postal_code") @db.Char(6)
notes String?
rcdUserId Int? @map("rcd_user_id")
Expand All @@ -57,7 +62,8 @@ model Application {
aid Aid[]
physicianName String @map("physician_name") @db.VarChar(255)
physicianMspNumber Int @map("physician_msp_number")
physicianAddress String @map("physician_address") @db.VarChar(255)
physicianAddressLine1 String @map("physician_address_line_1") @db.VarChar(255)
physicianAddressLine2 String? @map("physician_address_line_2") @db.VarChar(255)
physicianCity String @map("physician_city") @db.VarChar(255)
physicianProvince Province @map("physician_province")
physicianPostalCode String @map("physician_postal_code") @db.Char(6)
Expand All @@ -73,7 +79,8 @@ model Application {
guardianPhone String? @map("guardian_phone") @db.VarChar(50)
guardianProvince Province? @map("guardian_province")
guardianCity String? @map("guardian_city") @db.VarChar(255)
guardianAddress String? @map("guardian_address") @db.VarChar(255)
guardianAddressLine1 String? @map("guardian_address_line_1") @db.VarChar(255)
guardianAddressLine2 String? @map("guardian_address_line_2") @db.VarChar(255)
guardianPostalCode String? @map("guardian_postal_code") @db.Char(6)
guardianRelationship String? @map("guardian_relationship") @db.VarChar(50)
guardianNotes String? @map("guardian_notes")
Expand Down Expand Up @@ -103,7 +110,8 @@ model Guardian {
firstName String @map("first_name") @db.VarChar(255)
middleName String? @map("middle_name") @db.VarChar(255)
lastName String @map("last_name") @db.VarChar(255)
address String @db.VarChar(255)
addressLine1 String @map("address_line_1") @db.VarChar(255)
addressLine2 String? @map("address_line_2") @db.VarChar(255)
city String @db.VarChar(255)
province Province
postalCode String @map("postal_code") @db.Char(6)
Expand Down Expand Up @@ -158,7 +166,8 @@ model Physician {
firstName String @map("first_name") @db.VarChar(255)
lastName String @map("last_name") @db.VarChar(255)
mspNumber Int @unique @map("msp_number")
address String @db.VarChar(255)
addressLine1 String @map("address_line_1") @db.VarChar(255)
addressLine2 String? @map("address_line_2") @db.VarChar(255)
city String @db.VarChar(255)
province Province
postalCode String @map("postal_code") @db.Char(6)
Expand Down
Loading