Skip to content
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
2 changes: 1 addition & 1 deletion backend/typescript/graphql/types/reviewPageType.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { gql } from "apollo-server-express";

const reviewPageType = gql`
type ApplicationDTO {
id: Int!
id: String!
academicOrCoop: String!
academicYear: String!
email: String!
Expand Down
5 changes: 2 additions & 3 deletions backend/typescript/models/applicant.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ import ApplicantRecord from "./applicantRecord.model";
@Table({ tableName: "applicants" })
export default class Applicant extends Model {
@Column({
type: DataType.INTEGER,
type: DataType.UUIDV4,
primaryKey: true,
unique: true,
autoIncrement: true,
})
id!: number;
id!: string;

@Column({ type: DataType.STRING })
academicOrCoop!: string;
Expand Down
4 changes: 2 additions & 2 deletions backend/typescript/models/applicantRecord.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ export default class ApplicantRecord extends Model {
id!: string;

@ForeignKey(() => Applicant)
@Column({ type: DataType.INTEGER })
applicantId!: number;
@Column({ type: DataType.UUIDV4 })
applicantId!: string;

@ForeignKey(() => Position)
@Column({ type: DataType.STRING })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import IReviewPageService from "../interfaces/IReviewPageService";
import { getErrorMessage } from "../../utilities/errorUtils";
import logger from "../../utilities/logger";
import ApplicantRecord from "../../models/applicantRecord.model";
import ReviewedApplicantRecord from "../../models/reviewedApplicantRecord.model";
import Applicant from "../../models/applicant.model";

const Logger = logger(__filename);
Expand Down
4 changes: 2 additions & 2 deletions backend/typescript/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export type UserDTO = {
};

export type ApplicationDTO = {
id: number;
id: string;
academicOrCoop: string;
academicYear: string;
email: string;
Expand All @@ -58,7 +58,7 @@ export type ApplicationDTO = {
};

export type ApplicantDTO = {
id: number;
id: string;
academicOrCoop: string;
academicYear: string; // MAYBE CHANGE WITH ENUM
email: string;
Expand Down
Loading