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

Feature/scrum 25 user management for backend #8

Merged
merged 6 commits into from
Jul 27, 2024
Merged
Changes from 1 commit
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
Prev Previous commit
SCRUM-25 update database type
germainetan committed Jul 23, 2024
commit 18d3a00b2690e1d2036eb6b7713067c1ef5d6d4c
54 changes: 27 additions & 27 deletions backend/src/config/database.types.ts
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ export type Database = {
gender: Database["public"]["Enums"]["gender_type"]
lastname: string
role: Database["public"]["Enums"]["role"]
userid: number
userid: string
}
Insert: {
age: Database["public"]["Enums"]["age_type"]
@@ -28,7 +28,7 @@ export type Database = {
gender: Database["public"]["Enums"]["gender_type"]
lastname: string
role: Database["public"]["Enums"]["role"]
userid?: number
userid: string
}
Update: {
age?: Database["public"]["Enums"]["age_type"]
@@ -38,7 +38,7 @@ export type Database = {
gender?: Database["public"]["Enums"]["gender_type"]
lastname?: string
role?: Database["public"]["Enums"]["role"]
userid?: number
userid?: string
}
Relationships: []
}
@@ -49,23 +49,23 @@ export type Database = {
motivationallevel: Database["public"]["Enums"]["motivational_level_type"]
personality: Database["public"]["Enums"]["personality_type"]
reasons: Database["public"]["Enums"]["reasons_for_attending_course_type"][]
userid: number
userid: string
}
Insert: {
attitude: Database["public"]["Enums"]["attitude_towards_learning_type"]
barriers: Database["public"]["Enums"]["barriers_to_learning_interests_type"][]
motivationallevel: Database["public"]["Enums"]["motivational_level_type"]
personality: Database["public"]["Enums"]["personality_type"]
reasons: Database["public"]["Enums"]["reasons_for_attending_course_type"][]
userid: number
userid: string
}
Update: {
attitude?: Database["public"]["Enums"]["attitude_towards_learning_type"]
barriers?: Database["public"]["Enums"]["barriers_to_learning_interests_type"][]
motivationallevel?: Database["public"]["Enums"]["motivational_level_type"]
personality?: Database["public"]["Enums"]["personality_type"]
reasons?: Database["public"]["Enums"]["reasons_for_attending_course_type"][]
userid?: number
userid?: string
}
Relationships: [
{
@@ -84,23 +84,23 @@ export type Database = {
learningpreferences: Database["public"]["Enums"]["learning_preferences_type"]
litnumproficiency: Database["public"]["Enums"]["literacy_numeracy_proficiency_type"]
priorknowledge: Database["public"]["Enums"]["prior_knowledge_skills_type"]
userid: number
userid: string
}
Insert: {
educationallevel: Database["public"]["Enums"]["educational_level_type"]
languageabilities: Database["public"]["Enums"]["language_abilities_type"]
learningpreferences: Database["public"]["Enums"]["learning_preferences_type"]
litnumproficiency: Database["public"]["Enums"]["literacy_numeracy_proficiency_type"]
priorknowledge: Database["public"]["Enums"]["prior_knowledge_skills_type"]
userid: number
userid: string
}
Update: {
educationallevel?: Database["public"]["Enums"]["educational_level_type"]
languageabilities?: Database["public"]["Enums"]["language_abilities_type"]
learningpreferences?: Database["public"]["Enums"]["learning_preferences_type"]
litnumproficiency?: Database["public"]["Enums"]["literacy_numeracy_proficiency_type"]
priorknowledge?: Database["public"]["Enums"]["prior_knowledge_skills_type"]
userid?: number
userid?: string
}
Relationships: [
{
@@ -120,7 +120,7 @@ export type Database = {
lifestage: Database["public"]["Enums"]["life_stage_type"]
race: Database["public"]["Enums"]["race_type"]
specialneeds: Database["public"]["Enums"]["special_needs_type"]
userid: number
userid: string
}
Insert: {
careerstage: Database["public"]["Enums"]["career_stage_type"]
@@ -129,7 +129,7 @@ export type Database = {
lifestage: Database["public"]["Enums"]["life_stage_type"]
race: Database["public"]["Enums"]["race_type"]
specialneeds: Database["public"]["Enums"]["special_needs_type"]
userid: number
userid: string
}
Update: {
careerstage?: Database["public"]["Enums"]["career_stage_type"]
@@ -138,7 +138,7 @@ export type Database = {
lifestage?: Database["public"]["Enums"]["life_stage_type"]
race?: Database["public"]["Enums"]["race_type"]
specialneeds?: Database["public"]["Enums"]["special_needs_type"]
userid?: number
userid?: string
}
Relationships: [
{
@@ -156,21 +156,21 @@ export type Database = {
relationshiptopeers: Database["public"]["Enums"]["relationship_to_peers_type"]
socialbackground: Database["public"]["Enums"]["social_background_type"]
tendency: Database["public"]["Enums"]["tendency_to_compete_or_cooperate_type"]
userid: number
userid: string
}
Insert: {
compliteracy: Database["public"]["Enums"]["computer_literacy_type"]
relationshiptopeers: Database["public"]["Enums"]["relationship_to_peers_type"]
socialbackground: Database["public"]["Enums"]["social_background_type"]
tendency: Database["public"]["Enums"]["tendency_to_compete_or_cooperate_type"]
userid: number
userid: string
}
Update: {
compliteracy?: Database["public"]["Enums"]["computer_literacy_type"]
relationshiptopeers?: Database["public"]["Enums"]["relationship_to_peers_type"]
socialbackground?: Database["public"]["Enums"]["social_background_type"]
tendency?: Database["public"]["Enums"]["tendency_to_compete_or_cooperate_type"]
userid?: number
userid?: string
}
Relationships: [
{
@@ -189,23 +189,23 @@ export type Database = {
courseid: string
issuedate: string | null
provider: string
userid: number
userid: string
}
Insert: {
certificateid?: number
certificateurl?: string | null
courseid: string
issuedate?: string | null
provider: string
userid: number
userid: string
}
Update: {
certificateid?: number
certificateurl?: string | null
courseid?: string
issuedate?: string | null
provider?: string
userid?: number
userid?: string
}
Relationships: [
{
@@ -230,21 +230,21 @@ export type Database = {
courseid: string
datecreated: string
role: Database["public"]["Enums"]["chat_role"]
userid: number
userid: string
}
Insert: {
chattext: string
courseid: string
datecreated?: string
role: Database["public"]["Enums"]["chat_role"]
userid: number
userid: string
}
Update: {
chattext?: string
courseid?: string
datecreated?: string
role?: Database["public"]["Enums"]["chat_role"]
userid?: number
userid?: string
}
Relationships: [
{
@@ -475,19 +475,19 @@ export type Database = {
questionno: number
quizid: number
response: string | null
userid: number
userid: string
}
Insert: {
questionno: number
quizid: number
response?: string | null
userid: number
userid: string
}
Update: {
questionno?: number
quizid?: number
response?: string | null
userid?: number
userid?: string
}
Relationships: [
{
@@ -511,19 +511,19 @@ export type Database = {
datecreated: string | null
quizid: number
score: number
userid: number
userid: string
}
Insert: {
datecreated?: string | null
quizid: number
score: number
userid: number
userid: string
}
Update: {
datecreated?: string | null
quizid?: number
score?: number
userid?: number
userid?: string
}
Relationships: [
{
12 changes: 4 additions & 8 deletions backend/src/controllers/accountsController.ts
Original file line number Diff line number Diff line change
@@ -52,9 +52,7 @@ export const getAllAccounts = async (req: Request, res: Response) => {

export const getAccountById = async (req: Request, res: Response) => {
try {
const account = await accountsService.getAccountById(
Number(req.params.id)
);
const account = await accountsService.getAccountById(req.params.id);
res.status(200).json(account);
} catch (error) {
res.status(500).json({ error: "Failed to retrieve account" });
@@ -92,7 +90,7 @@ export const updateAccount = async (req: Request, res: Response) => {
const response = await accountsService.updateAccount(account);
res.status(200).json({
status: response.status,
statusText: response.statusText,
statusText: "Account Updated Successfully",
});
} catch (error) {
res.status(500).json({ error: "Failed to update account" });
@@ -103,12 +101,10 @@ export const updateAccount = async (req: Request, res: Response) => {

export const deleteAccount = async (req: Request, res: Response) => {
try {
const response = await accountsService.deleteAccount(
Number(req.params.id)
);
const response = await accountsService.deleteAccount(req.params.id);
res.status(200).json({
status: response.status,
statusText: response.statusText,
statusText: "Account deleted Successfully",
});
} catch (error) {
res.status(500).json({ error: "Failed to delete account" });
10 changes: 5 additions & 5 deletions backend/src/models/accountsModel.ts
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ export enum Gender {
}

export interface Accounts {
userId: number;
userId: string;
firstName: string;
lastName: string;
email: string;
@@ -36,7 +36,7 @@ export interface Accounts {
}

export class Learner implements Accounts {
userId: number;
userId: string;
firstName: string;
lastName: string;
email: string;
@@ -46,7 +46,7 @@ export class Learner implements Accounts {
gender: Gender;

constructor(
userId: number,
userId: string,
firstName: string,
lastName: string,
email: string,
@@ -95,7 +95,7 @@ export class Learner implements Accounts {
}

export class Admin implements Accounts {
userId: number;
userId: string;
firstName: string;
lastName: string;
email: string;
@@ -105,7 +105,7 @@ export class Admin implements Accounts {
gender: Gender;

constructor(
userId: number,
userId: string,
firstName: string,
lastName: string,
email: string,
10 changes: 6 additions & 4 deletions backend/src/services/accountsService.ts
Original file line number Diff line number Diff line change
@@ -11,11 +11,12 @@ import {
/* CREATE */

export async function createLearnerAccount(learner: Learner) {
const { firstName, lastName, email, dateCreated, age, gender } = learner;
const { userId, firstName, lastName, email, dateCreated, age, gender } = learner;

const { data, error } = await supabase
.from("accounts")
.insert({
userid: userId,
firstname: firstName,
lastname: lastName,
email: email,
@@ -35,11 +36,12 @@ export async function createLearnerAccount(learner: Learner) {
}

export async function createAdminAccount(admin: Admin) {
const { firstName, lastName, email, dateCreated, age, gender } = admin;
const { userId, firstName, lastName, email, dateCreated, age, gender } = admin;

const { data, error } = await supabase
.from("accounts")
.insert({
userid: userId,
firstname: firstName,
lastname: lastName,
email: email,
@@ -71,7 +73,7 @@ export async function getAllAccounts() {
}
}

export async function getAccountById(userid: number): Promise<Learner> {
export async function getAccountById(userid: string): Promise<Learner> {
const { data, error } = await supabase
.from("accounts")
.select("*")
@@ -169,7 +171,7 @@ export async function updateAccount(account: Accounts) {

/* DELETE */

export async function deleteAccount(userid: number) {
export async function deleteAccount(userid: string) {
const { status, statusText, error } = await supabase
.from("accounts")
.delete()