From e3b6b0d860a4ccfb64d9108ae1846e05a05a63c0 Mon Sep 17 00:00:00 2001
From: ykdojo <yksu4p@gmail.com>
Date: Sat, 27 Aug 2022 18:51:32 -0700
Subject: [PATCH 1/6] feat: change the way recency is asked

---
 src/pages/api/submit_question.ts |  2 +-
 src/pages/submit.tsx             | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/pages/api/submit_question.ts b/src/pages/api/submit_question.ts
index 9eed00f..a17d753 100644
--- a/src/pages/api/submit_question.ts
+++ b/src/pages/api/submit_question.ts
@@ -13,7 +13,7 @@ export default function handler(req: NextApiRequest, res: NextApiResponse<Data>)
 	// 	position: "b",
 	// 	question: "a",
 	// 	question-details: "",
-	// 	recency: "Within the past week",
+	// 	recency-weeks: "2",
 	// 	stay-anonymous: false
 	// }
 	const data = JSON.parse(req.body);
diff --git a/src/pages/submit.tsx b/src/pages/submit.tsx
index 362fdef..a976a29 100644
--- a/src/pages/submit.tsx
+++ b/src/pages/submit.tsx
@@ -97,21 +97,22 @@ const Submit: NextPage<UserProps> = ({ session }) => {
 									</div>
 
 									<div className='sm:col-span-3'>
-										<label htmlFor='recency' className='block text-sm font-medium text-gray-700'>
+										<label htmlFor='recency-weeks' className='block text-sm font-medium text-gray-700'>
 											How recently was this asked?
 										</label>
 										<div className='mt-1'>
 											<select
-												id='recency'
-												{...register('recency', { required: true })}
+												id='recency-weeks'
+												{...register('recency-weeks', { required: true })}
 												className='block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm'
 											>
-												<option>Within the past week</option>
-												<option>Within the past month</option>
-												<option>1-2 months ago</option>
-												<option>3-6 months ago</option>
-												<option>7-12 months ago</option>
-												<option>1+ year ago</option>
+												{/* value is estimated # weeks since the question was asked */}
+												<option value='1'>Within the past week</option>
+												<option value='2'>Within the past month</option>
+												<option value='6'>1-2 months ago</option>
+												<option value='18'>3-6 months ago</option>
+												<option value='38'>7-12 months ago</option>
+												<option value='60'>1+ year ago</option>
 											</select>
 										</div>
 									</div>

From e3344ea3473a69e421c3b3e1dd195b574d29c837 Mon Sep 17 00:00:00 2001
From: ykdojo <yksu4p@gmail.com>
Date: Sat, 27 Aug 2022 20:18:04 -0700
Subject: [PATCH 2/6] feat: slight improvement in question submission backend

still not quite working though.
---
 .env.template                    |  1 +
 src/pages/api/submit_question.ts | 38 +++++++++++++++++++++++++++-----
 src/pages/submit.tsx             | 12 +++++-----
 3 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/.env.template b/.env.template
index bc7ec1c..3e1404c 100644
--- a/.env.template
+++ b/.env.template
@@ -1,2 +1,3 @@
 NEXT_PUBLIC_SUPABASE_URL=YOUR_SUPABASE_URL
 NEXT_PUBLIC_SUPABASE_ANON_KEY=YOUR_SUPABASE_ANON_KEY
+NEXT_PUBLIC_SUPABASE_SERVICE_KEY=YOUR_SUPABASE_SERVICE_KEY
diff --git a/src/pages/api/submit_question.ts b/src/pages/api/submit_question.ts
index a17d753..5730f74 100644
--- a/src/pages/api/submit_question.ts
+++ b/src/pages/api/submit_question.ts
@@ -1,3 +1,15 @@
+import { createClient, SupabaseClient } from '@supabase/supabase-js';
+
+const supabaseUrl: string = process.env.NEXT_PUBLIC_SUPABASE_URL || '';
+const supabaseAnonKey: string = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY || '';
+const supabaseServiceKey: string = process.env.NEXT_PUBLIC_SUPABASE_SERVICE_KEY || '';
+
+export const supabase: SupabaseClient = createClient(supabaseUrl, supabaseAnonKey);
+export const supabaseSecret: SupabaseClient = createClient(supabaseUrl, supabaseServiceKey);
+
+// TODO: working on this now.
+// Next: try service role: https://github.com/ykdojo/defaang/issues/108
+
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from 'next';
 
@@ -5,21 +17,37 @@ type Data = {
 	temp_message: string;
 };
 
-export default function handler(req: NextApiRequest, res: NextApiResponse<Data>) {
+export default async function handler(req: NextApiRequest, res: NextApiResponse<Data>) {
 	// data format:
 	// {
 	// 	company: "a",
 	// 	location: "a",
 	// 	position: "b",
 	// 	question: "a",
-	// 	question-details: "",
+	// 	question_details: "",
 	// 	recency-weeks: "2",
-	// 	stay-anonymous: false
+	// 	stay_anonymous: false
 	// }
-	const data = JSON.parse(req.body);
+	const input_data = JSON.parse(req.body);
 	const jwt = req.headers.authentication;
+	const asked_date = new Date(new Date().setDate(new Date().getDate() - Number(input_data['recency-weeks']) * 7));
+
+	input_data['asked_date'] = asked_date;
+	delete input_data['recency-weeks'];
+
+	const response = await supabase.auth.api.getUserByCookie(req);
+	debugger;
+
+	const { data, error } = await supabaseSecret.from('questions').insert([input_data]);
+
+	console.log('input_data');
+	console.log(input_data);
+	console.log('data');
+	console.log(data);
+	console.log('error');
+	console.log(error);
 
-	debugger; // TODO: remove this and insert data in Supabase.
+	// debugger;
 
 	res.status(200).json({ temp_message: 'hello' });
 }
diff --git a/src/pages/submit.tsx b/src/pages/submit.tsx
index a976a29..a2e0105 100644
--- a/src/pages/submit.tsx
+++ b/src/pages/submit.tsx
@@ -132,13 +132,13 @@ const Submit: NextPage<UserProps> = ({ session }) => {
 									</div>
 
 									<div className='sm:col-span-6'>
-										<label htmlFor='question-details' className='block text-sm font-medium text-gray-700'>
+										<label htmlFor='question_details' className='block text-sm font-medium text-gray-700'>
 											Question details
 										</label>
 										<div className='mt-1'>
 											<textarea
-												id='question-details'
-												{...register('question-details')}
+												id='question_details'
+												{...register('question_details')}
 												rows={3}
 												className='block w-full rounded-md border border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm'
 												defaultValue={''}
@@ -149,14 +149,14 @@ const Submit: NextPage<UserProps> = ({ session }) => {
 								<div className='relative mt-6 flex'>
 									<div className='flex h-5 items-center'>
 										<input
-											id='stay-anonymous'
-											{...register('stay-anonymous')}
+											id='stay_anonymous'
+											{...register('stay_anonymous')}
 											type='checkbox'
 											className='h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-500'
 										/>
 									</div>
 									<div className='ml-3 text-sm'>
-										<label htmlFor='stay-anonymous' className='font-medium text-gray-700'>
+										<label htmlFor='stay_anonymous' className='font-medium text-gray-700'>
 											Stay anonymous
 										</label>
 									</div>

From 1b4fc017af258eed94fe0dc78c4929ecdfcddc94 Mon Sep 17 00:00:00 2001
From: ykdojo <yksu4p@gmail.com>
Date: Sat, 27 Aug 2022 23:21:48 -0700
Subject: [PATCH 3/6] feat: inserting a question into a table works

---
 src/pages/api/submit_question.ts | 35 ++++++++++++--------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/pages/api/submit_question.ts b/src/pages/api/submit_question.ts
index 5730f74..0e8a87d 100644
--- a/src/pages/api/submit_question.ts
+++ b/src/pages/api/submit_question.ts
@@ -1,22 +1,18 @@
-import { createClient, SupabaseClient } from '@supabase/supabase-js';
-
-const supabaseUrl: string = process.env.NEXT_PUBLIC_SUPABASE_URL || '';
-const supabaseAnonKey: string = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY || '';
-const supabaseServiceKey: string = process.env.NEXT_PUBLIC_SUPABASE_SERVICE_KEY || '';
-
-export const supabase: SupabaseClient = createClient(supabaseUrl, supabaseAnonKey);
-export const supabaseSecret: SupabaseClient = createClient(supabaseUrl, supabaseServiceKey);
-
-// TODO: working on this now.
-// Next: try service role: https://github.com/ykdojo/defaang/issues/108
-
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from 'next';
+import { createClient, SupabaseClient } from '@supabase/supabase-js';
 
 type Data = {
 	temp_message: string;
 };
 
+// TODO: move the following somewhere else.
+const supabaseUrl: string = process.env.NEXT_PUBLIC_SUPABASE_URL || '';
+const supabaseAnonKey: string = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY || '';
+const supabaseServiceKey: string = process.env.NEXT_PUBLIC_SUPABASE_SERVICE_KEY || '';
+const supabase: SupabaseClient = createClient(supabaseUrl, supabaseAnonKey);
+const supabaseSecret: SupabaseClient = createClient(supabaseUrl, supabaseServiceKey);
+
 export default async function handler(req: NextApiRequest, res: NextApiResponse<Data>) {
 	// data format:
 	// {
@@ -35,19 +31,14 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
 	input_data['asked_date'] = asked_date;
 	delete input_data['recency-weeks'];
 
-	const response = await supabase.auth.api.getUserByCookie(req);
-	debugger;
+	const { data: user, userError } = await supabase.auth.api.getUser(jwt);
+	const id = user.identities[0]['id'];
 
-	const { data, error } = await supabaseSecret.from('questions').insert([input_data]);
+	input_data['created_by'] = id;
 
-	console.log('input_data');
-	console.log(input_data);
-	console.log('data');
-	console.log(data);
-	console.log('error');
-	console.log(error);
+	const { data, error } = await supabaseSecret.from('questions').insert([input_data]);
 
-	// debugger;
+	// TODO: send back a proper reseponse here.
 
 	res.status(200).json({ temp_message: 'hello' });
 }

From a7e07ac73c2bc99463e20d5e652212f9be30c7c4 Mon Sep 17 00:00:00 2001
From: ykdojo <yksu4p@gmail.com>
Date: Sat, 27 Aug 2022 23:37:45 -0700
Subject: [PATCH 4/6] dx: convert submit_question from TS to JS

---
 .../{submit_question.ts => submit_question.js}  | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)
 rename src/pages/api/{submit_question.ts => submit_question.js} (62%)

diff --git a/src/pages/api/submit_question.ts b/src/pages/api/submit_question.js
similarity index 62%
rename from src/pages/api/submit_question.ts
rename to src/pages/api/submit_question.js
index 0e8a87d..e44c3cd 100644
--- a/src/pages/api/submit_question.ts
+++ b/src/pages/api/submit_question.js
@@ -1,19 +1,14 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
-import type { NextApiRequest, NextApiResponse } from 'next';
 import { createClient, SupabaseClient } from '@supabase/supabase-js';
 
-type Data = {
-	temp_message: string;
-};
-
 // TODO: move the following somewhere else.
-const supabaseUrl: string = process.env.NEXT_PUBLIC_SUPABASE_URL || '';
-const supabaseAnonKey: string = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY || '';
-const supabaseServiceKey: string = process.env.NEXT_PUBLIC_SUPABASE_SERVICE_KEY || '';
-const supabase: SupabaseClient = createClient(supabaseUrl, supabaseAnonKey);
-const supabaseSecret: SupabaseClient = createClient(supabaseUrl, supabaseServiceKey);
+const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || '';
+const supabaseAnonKey = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY || '';
+const supabaseServiceKey = process.env.NEXT_PUBLIC_SUPABASE_SERVICE_KEY || '';
+const supabase = createClient(supabaseUrl, supabaseAnonKey);
+const supabaseSecret = createClient(supabaseUrl, supabaseServiceKey);
 
-export default async function handler(req: NextApiRequest, res: NextApiResponse<Data>) {
+export default async function handler(req, res) {
 	// data format:
 	// {
 	// 	company: "a",

From 73e988fcf1acb92e40efa5d0472031c07bd8aa14 Mon Sep 17 00:00:00 2001
From: ykdojo <yksu4p@gmail.com>
Date: Sat, 27 Aug 2022 23:44:26 -0700
Subject: [PATCH 5/6] fix: next env public -> private

---
 .env.template                    | 2 +-
 src/pages/api/submit_question.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.template b/.env.template
index 3e1404c..ab94b56 100644
--- a/.env.template
+++ b/.env.template
@@ -1,3 +1,3 @@
 NEXT_PUBLIC_SUPABASE_URL=YOUR_SUPABASE_URL
 NEXT_PUBLIC_SUPABASE_ANON_KEY=YOUR_SUPABASE_ANON_KEY
-NEXT_PUBLIC_SUPABASE_SERVICE_KEY=YOUR_SUPABASE_SERVICE_KEY
+NEXT_PRIVATE_SUPABASE_SERVICE_KEY=YOUR_SUPABASE_SERVICE_KEY
diff --git a/src/pages/api/submit_question.js b/src/pages/api/submit_question.js
index e44c3cd..2d87086 100644
--- a/src/pages/api/submit_question.js
+++ b/src/pages/api/submit_question.js
@@ -4,7 +4,7 @@ import { createClient, SupabaseClient } from '@supabase/supabase-js';
 // TODO: move the following somewhere else.
 const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || '';
 const supabaseAnonKey = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY || '';
-const supabaseServiceKey = process.env.NEXT_PUBLIC_SUPABASE_SERVICE_KEY || '';
+const supabaseServiceKey = process.env.NEXT_PRIVATE_SUPABASE_SERVICE_KEY || '';
 const supabase = createClient(supabaseUrl, supabaseAnonKey);
 const supabaseSecret = createClient(supabaseUrl, supabaseServiceKey);
 

From 8fe1ab4dcedd0f0e0eee83d896e24d997e969bbb Mon Sep 17 00:00:00 2001
From: ykdojo <yksu4p@gmail.com>
Date: Sat, 27 Aug 2022 23:52:30 -0700
Subject: [PATCH 6/6] dx: better error message

---
 src/pages/api/submit_question.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pages/api/submit_question.js b/src/pages/api/submit_question.js
index 2d87086..4067fa6 100644
--- a/src/pages/api/submit_question.js
+++ b/src/pages/api/submit_question.js
@@ -33,7 +33,9 @@ export default async function handler(req, res) {
 
 	const { data, error } = await supabaseSecret.from('questions').insert([input_data]);
 
-	// TODO: send back a proper reseponse here.
-
-	res.status(200).json({ temp_message: 'hello' });
+	if (error) {
+		res.status(500).json({ error });
+	} else {
+		res.status(200).json({ message: 'success!' });
+	}
 }