Skip to content

Feature/years of experience #1120

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

Closed
leslyclopez11 wants to merge 8 commits into from
Closed

Feature/years of experience #1120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bce6c91
Added Drizzle to README.md
leslyclopez11 Sep 24, 2024
44b056c
Merge branch 'develop' into develop
NiallJoeMaher Sep 25, 2024
42966cb
Merge branch 'codu-code:develop' into develop
leslyclopez11 Sep 27, 2024
2be6c5e
Merge branch 'codu-code:develop' into develop
leslyclopez11 Oct 3, 2024
d9bfb08
added yearsOfExperiece
leslycatota1 Oct 8, 2024
f216eca
added yearsOfExperience ranges
leslycatota1 Oct 8, 2024
b506b6e
Merge branch 'develop' of https://github.com/codu-code/codu into develop
leslycatota1 Oct 10, 2024
94cefec
yearsOfExperience
leslycatota1 Oct 8, 2024
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
32 changes: 30 additions & 2 deletions app/(app)/alpha/additional-details/_client.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ import { Button } from "@/components/ui-components/button";
import { Heading, Subheading } from "@/components/ui-components/heading";
import { Divider } from "@/components/ui-components/divider";

export const yearsOfExperienceOptions = ["0-1", "1-3", "3-5", "5-8", "8-12", "12+"] as const;
export type YearsOfExperience = typeof yearsOfExperienceOptions[number];
type UserDetails = {
username: string;
name: string;
Expand All @@ -51,6 +53,7 @@ type UserDetails = {
levelOfStudy: string;
jobTitle: string;
workplace: string;
yearsOfExperience: YearsOfExperience;
};

export default function AdditionalSignUpDetails({
Expand All @@ -68,6 +71,7 @@ export default function AdditionalSignUpDetails({
dateOfBirth,
gender,
professionalOrStudent,
yearsOfExperience,
} = details;

let slide: number;
Expand Down Expand Up @@ -399,7 +403,7 @@ function SlideTwo({ details }: { details: UserDetails }) {
function SlideThree({ details }: { details: UserDetails }) {
const router = useRouter();

const { professionalOrStudent, workplace, jobTitle, course, levelOfStudy } =
const { professionalOrStudent, workplace, jobTitle, yearsOfExperience, course, levelOfStudy } =
details;

const {
Expand All @@ -417,6 +421,7 @@ function SlideThree({ details }: { details: UserDetails }) {
jobTitle,
course,
levelOfStudy,
yearsOfExperience,
},
});

Expand All @@ -427,7 +432,7 @@ function SlideThree({ details }: { details: UserDetails }) {
const professionalOrStudent = getValues("professionalOrStudent");

if (isError && professionalOrStudent === "Working professional") {
isError = await trigger(["workplace", "jobTitle"]);
isError = await trigger(["workplace", "jobTitle","yearsOfExperience"]);
}

if (isError && professionalOrStudent === "Current student") {
Expand Down Expand Up @@ -512,6 +517,29 @@ function SlideThree({ details }: { details: UserDetails }) {
</ErrorMessage>
)}
</Field>

<Field className="mx-4 my-4 ">
<Label>Years of experience:</Label>
<Select
id="years-of-experience"
{...register('yearsOfExperience')}
>
<option value="" disabled>
Select range
</option>
<option value="0-1">0-1 years</option>
<option value="1-3">1-3 years</option>
<option value="3-5">3-5 years</option>
<option value="5-8">5-8 years</option>
<option value="8-12">8-12 years</option>
<option value="12+">12+ years</option>
</Select>
{errors.yearsOfExperience && (
<ErrorMessage className="text-red-500">
{errors.yearsOfExperience.message}
</ErrorMessage>
)}
</Field>
</>
)}

Expand Down
7 changes: 7 additions & 0 deletions app/(app)/alpha/additional-details/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import { redirect } from "next/navigation";
import Content from "./_client";
import { getServerAuthSession } from "@/server/auth";
import { db } from "@/server/db";
import {YearsOfExperience} from "./_client";
Copy link
Contributor

@coderabbitai coderabbitai bot Oct 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Consolidate imports from the same module

To improve code clarity and organization, consider combining the imports from "./_client" into a single statement.

Apply this diff:

-import Content from "./_client";
-import {YearsOfExperience} from "./_client";
+import Content, { YearsOfExperience } from "./_client";

Committable suggestion was skipped due to low confidence.



export default async function Page() {
const session = await getServerAuthSession();
Expand All @@ -22,6 +24,7 @@ export default async function Page() {
levelOfStudy: true,
jobTitle: true,
workplace: true,
yearsOfExperience: true,
},
where: (user, { eq }) => eq(user.id, userId),
});
Expand All @@ -37,6 +40,10 @@ export default async function Page() {
levelOfStudy: details?.levelOfStudy || "",
jobTitle: details?.jobTitle || "",
workplace: details?.workplace || "",
yearsOfExperience: details?.yearsOfExperience &&
["0-1", "1-3", "3-5", "5-8", "8-12", "12+"].includes(details.yearsOfExperience)
? details.yearsOfExperience as YearsOfExperience // Cast to the union type
: "0-1",
Comment on lines +43 to +46
Copy link
Contributor

@coderabbitai coderabbitai bot Oct 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Handle unexpected yearsOfExperience values appropriately

Defaulting to "0-1" when details.yearsOfExperience contains an unexpected value might not reflect the user's actual experience. Consider handling invalid or unexpected values more explicitly, possibly by prompting the user to re-enter their information or by logging the discrepancy.

🛠️ Refactor suggestion

Simplify the yearsOfExperience assignment for better readability

The current assignment logic can be simplified to enhance readability and maintainability. Checking for details?.yearsOfExperience within the includes method suffices.

Consider applying this diff:

-yearsOfExperience: details?.yearsOfExperience && 
-  ["0-1", "1-3", "3-5", "5-8", "8-12", "12+"].includes(details.yearsOfExperience)
-    ? details.yearsOfExperience as YearsOfExperience // Cast to the union type
-    : "0-1",
+yearsOfExperience: ["0-1", "1-3", "3-5", "5-8", "8-12", "12+"].includes(details?.yearsOfExperience)
+  ? (details.yearsOfExperience as YearsOfExperience) // Cast to the union type
+  : "0-1",
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
yearsOfExperience: details?.yearsOfExperience &&
["0-1", "1-3", "3-5", "5-8", "8-12", "12+"].includes(details.yearsOfExperience)
? details.yearsOfExperience as YearsOfExperience // Cast to the union type
: "0-1",
yearsOfExperience: ["0-1", "1-3", "3-5", "5-8", "8-12", "12+"].includes(details?.yearsOfExperience)
? (details.yearsOfExperience as YearsOfExperience) // Cast to the union type
: "0-1",

};

return <Content details={detailsWithNullsRemoved} />;
Expand Down
12 changes: 12 additions & 0 deletions drizzle/0010-yearsOfExperiece
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
DO $$ BEGIN
ALTER TABLE "User" ADD COLUMN "yearsOfExperience" text;
EXCEPTION
WHEN duplicate_object THEN null;
END $$;

DO $$ BEGIN
ALTER TABLE "User" ADD CONSTRAINT "User_yearsOfExperience_check"
CHECK ("yearsOfExperience" IN ('0-1', '1-3', '3-5', '5-8', '8-12', '12+'));
EXCEPTION
WHEN duplicate_object THEN null;
END $$;
9 changes: 8 additions & 1 deletion schema/additionalUserDetails.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import z from "zod";

import { yearsOfExperienceOptions, YearsOfExperience } from "@/app/(app)/alpha/additional-details/_client";
Copy link
Contributor

@coderabbitai coderabbitai bot Oct 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Consider moving shared constants to a common file.

Importing from a client-side file (@/app/(app)/alpha/additional-details/_client) in a schema definition might lead to issues in server-side rendering or API routes. This could potentially cause errors or unexpected behavior in a server environment where client-side modules are not available.

Consider moving the yearsOfExperienceOptions and YearsOfExperience to a shared constants file that can be safely imported in both client and server environments. For example:

// shared/constants.ts
export const yearsOfExperienceOptions = [...] as const;
export type YearsOfExperience = typeof yearsOfExperienceOptions[number];

Then update the import statement:

import { yearsOfExperienceOptions, YearsOfExperience } from "@/shared/constants";

This approach ensures that these constants are accessible throughout your application without risking server-side rendering issues.

export const slideOneSchema = z.object({
name: z
.string()
Expand Down Expand Up @@ -30,6 +30,13 @@ export const slideThreeSchema = z
jobTitle: z.string().max(30, "Max length is 30 characters."),
levelOfStudy: z.string(),
course: z.string().max(30, "Max name length is 30 characters."),
yearsOfExperience: z
.string()
.optional()
.refine((val) => val === undefined || yearsOfExperienceOptions.includes(val as YearsOfExperience), {
message: "Please select a valid years of experience.",
}),

})
.superRefine((val, ctx) => {
if (
Expand Down
1 change: 1 addition & 0 deletions server/db/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ export const user = pgTable(
levelOfStudy: text("levelOfStudy"),
course: text("course"),
role: role("role").default("USER").notNull(),
yearsOfExperience: varchar("yearsOfExperience").default("0-1").notNull(),
},
(table) => {
return {
Expand Down