From 9cec49f255f0575740c4829121f07f3148a7690d Mon Sep 17 00:00:00 2001
From: m5r <mokht@rmi.al>
Date: Sat, 25 Sep 2021 22:16:31 +0800
Subject: [PATCH] make user full name mandatory

---
 app/auth/mutations/signup.ts                     |  4 ++--
 app/auth/pages/sign-up.tsx                       |  2 +-
 app/auth/validations.ts                          |  2 +-
 app/settings/components/profile-informations.tsx | 16 ++++++++--------
 app/settings/mutations/update-user.ts            |  6 +++---
 app/users/queries/get-current-user.ts            |  2 +-
 .../migration.sql                                |  9 +++++++++
 db/schema.prisma                                 |  2 +-
 8 files changed, 26 insertions(+), 17 deletions(-)
 create mode 100644 db/migrations/20210925140956_make_full_name_mandatory/migration.sql

diff --git a/app/auth/mutations/signup.ts b/app/auth/mutations/signup.ts
index 6ebbca6..de100a1 100644
--- a/app/auth/mutations/signup.ts
+++ b/app/auth/mutations/signup.ts
@@ -4,12 +4,12 @@ import db, { GlobalRole, MembershipRole } from "../../../db";
 import { Signup } from "../validations";
 import { computeEncryptionKey } from "../../../db/_encryption";
 
-export default resolver.pipe(resolver.zod(Signup), async ({ email, password, name }, ctx) => {
+export default resolver.pipe(resolver.zod(Signup), async ({ email, password, fullName }, ctx) => {
 	const hashedPassword = await SecurePassword.hash(password.trim());
 	const encryptionKey = computeEncryptionKey(email.toLowerCase().trim()).toString("hex");
 	const user = await db.user.create({
 		data: {
-			name: name.trim(),
+			fullName: fullName.trim(),
 			email: email.toLowerCase().trim(),
 			hashedPassword,
 			role: GlobalRole.CUSTOMER,
diff --git a/app/auth/pages/sign-up.tsx b/app/auth/pages/sign-up.tsx
index 291f01a..1494629 100644
--- a/app/auth/pages/sign-up.tsx
+++ b/app/auth/pages/sign-up.tsx
@@ -40,7 +40,7 @@ const SignUp: BlitzPage = () => {
 				}
 			}}
 		>
-			<LabeledTextField name="name" label="Name" type="text" />
+			<LabeledTextField name="fullName" label="Full name" type="text" />
 			<LabeledTextField name="email" label="Email" type="email" />
 			<LabeledTextField name="password" label="Password" type="password" />
 		</Form>
diff --git a/app/auth/validations.ts b/app/auth/validations.ts
index 2710400..5b12cbb 100644
--- a/app/auth/validations.ts
+++ b/app/auth/validations.ts
@@ -3,7 +3,7 @@ import { z } from "zod";
 export const password = z.string().min(10).max(100);
 
 export const Signup = z.object({
-	name: z.string(),
+	fullName: z.string(),
 	email: z.string().email(),
 	password,
 });
diff --git a/app/settings/components/profile-informations.tsx b/app/settings/components/profile-informations.tsx
index 8f1888f..d4fbcaf 100644
--- a/app/settings/components/profile-informations.tsx
+++ b/app/settings/components/profile-informations.tsx
@@ -12,7 +12,7 @@ import useCurrentUser from "../../core/hooks/use-current-user";
 import appLogger from "../../../integrations/logger";
 
 type Form = {
-	name: string;
+	fullName: string;
 	email: string;
 };
 
@@ -30,17 +30,17 @@ const ProfileInformations: FunctionComponent = () => {
 	const [errorMessage, setErrorMessage] = useState("");
 
 	useEffect(() => {
-		setValue("name", user?.name ?? "");
+		setValue("fullName", user?.fullName ?? "");
 		setValue("email", user?.email ?? "");
 	}, [setValue, user]);
 
-	const onSubmit = handleSubmit(async ({ name, email }) => {
+	const onSubmit = handleSubmit(async ({ fullName, email }) => {
 		if (isSubmitting) {
 			return;
 		}
 
 		try {
-			await updateUserMutation({ email, name });
+			await updateUserMutation({ email, fullName });
 		} catch (error: any) {
 			logger.error(error.response, "error updating user infos");
 			setErrorMessage(error.response.data.errorMessage);
@@ -68,16 +68,16 @@ const ProfileInformations: FunctionComponent = () => {
 				<div className="shadow sm:rounded-md sm:overflow-hidden">
 					<div className="px-4 py-5 bg-white space-y-6 sm:p-6">
 						<div className="col-span-3 sm:col-span-2">
-							<label htmlFor="name" className="block text-sm font-medium leading-5 text-gray-700">
-								Name
+							<label htmlFor="fullName" className="block text-sm font-medium leading-5 text-gray-700">
+								Full name
 							</label>
 							<div className="mt-1 rounded-md shadow-sm">
 								<input
-									id="name"
+									id="fullName"
 									type="text"
 									tabIndex={1}
 									className="appearance-none block w-full px-3 py-2 border border-gray-300 rounded-md placeholder-gray-400 focus:outline-none focus:shadow-outline-primary focus:border-primary-300 transition duration-150 ease-in-out sm:text-sm sm:leading-5"
-									{...register("name")}
+									{...register("fullName")}
 									required
 								/>
 							</div>
diff --git a/app/settings/mutations/update-user.ts b/app/settings/mutations/update-user.ts
index 0d267cd..5711d27 100644
--- a/app/settings/mutations/update-user.ts
+++ b/app/settings/mutations/update-user.ts
@@ -6,17 +6,17 @@ import notifyEmailChangeQueue from "../api/queue/notify-email-change";
 
 const Body = z.object({
 	email: z.string().email(),
-	name: z.string(),
+	fullName: z.string(),
 });
 
-export default resolver.pipe(resolver.zod(Body), resolver.authorize(), async ({ email, name }, ctx) => {
+export default resolver.pipe(resolver.zod(Body), resolver.authorize(), async ({ email, fullName }, ctx) => {
 	const user = await db.user.findFirst({ where: { id: ctx.session.userId! } });
 	if (!user) throw new NotFoundError();
 
 	const oldEmail = user.email;
 	await db.user.update({
 		where: { id: user.id },
-		data: { email, name },
+		data: { email, fullName },
 	});
 
 	if (oldEmail !== email) {
diff --git a/app/users/queries/get-current-user.ts b/app/users/queries/get-current-user.ts
index 6176464..a1f7bf0 100644
--- a/app/users/queries/get-current-user.ts
+++ b/app/users/queries/get-current-user.ts
@@ -9,7 +9,7 @@ export default async function getCurrentUser(_ = null, { session }: Ctx) {
 		where: { id: session.userId },
 		select: {
 			id: true,
-			name: true,
+			fullName: true,
 			email: true,
 			role: true,
 			memberships: {
diff --git a/db/migrations/20210925140956_make_full_name_mandatory/migration.sql b/db/migrations/20210925140956_make_full_name_mandatory/migration.sql
new file mode 100644
index 0000000..2babbac
--- /dev/null
+++ b/db/migrations/20210925140956_make_full_name_mandatory/migration.sql
@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `name` on the `User` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "User" DROP COLUMN "name",
+ADD COLUMN     "fullName" TEXT NOT NULL DEFAULT E'';
diff --git a/db/schema.prisma b/db/schema.prisma
index 4b482a2..f52df53 100644
--- a/db/schema.prisma
+++ b/db/schema.prisma
@@ -69,7 +69,7 @@ model User {
   id             String     @id @default(uuid())
   createdAt      DateTime   @default(now()) @db.Timestamptz
   updatedAt      DateTime   @updatedAt @db.Timestamptz
-  name           String?
+  fullName       String     @default("")
   email          String     @unique
   hashedPassword String?
   role           GlobalRole @default(CUSTOMER)