From f2649035e0113c196266a103caebac7e1b5964cc Mon Sep 17 00:00:00 2001
From: Oustan Ding <oustan10@gmail.com>
Date: Wed, 10 Aug 2022 00:32:21 -0400
Subject: [PATCH] [Release] Version 0.0.2 (#249)

* [Fix] Various bug fixes (#236)

* [Fix] Prevent RCD email from breaking into two lines (#237)

* [Feature] Add date of birth filter to permit holders page (#238)

* [Fix] Convert patient condition field to checkbox field (#239)

* Convert patient condition field to checkbox field

* Fix build error

* [Improvement] Add error logging, improve error handling (#240)

* Add error logging, improve error handling

* Replace GraphQL hooks with custom implementation

* [Feature] Build privacy policy and terms and conditions pages (#241)

* Create privacy policy and ToC pages

* Fix links in ToC pages

* [Fix] Fix replacement application expiry date (#242)

* [Fix] Disable GraphQL playground in production (#244)

* [Fix] Remove GQL playground redirect (#245)

* [Improvement] Various fixes (#246)

* [Fix] Fix homepage RCD emails (#247)

* [Fix] Get most recent permit by latest expiry date (#248)
---
 lib/applicants/utils.ts       |  2 +-
 lib/graphql/apollo.ts         | 16 ++++++++++------
 pages/404.tsx                 | 25 +++++++++++++++++++++++++
 pages/500.tsx                 | 25 +++++++++++++++++++++++++
 pages/api/payment-received.ts |  7 +++++++
 pages/index.tsx               |  4 ++--
 6 files changed, 70 insertions(+), 9 deletions(-)
 create mode 100644 pages/404.tsx
 create mode 100644 pages/500.tsx

diff --git a/lib/applicants/utils.ts b/lib/applicants/utils.ts
index d9a1a4cd..ef04f0c7 100644
--- a/lib/applicants/utils.ts
+++ b/lib/applicants/utils.ts
@@ -34,7 +34,7 @@ export const getMostRecentPermit = async (applicantId: number): Promise<Permit |
       where: { id: applicantId },
     })
     .permits({
-      orderBy: { createdAt: SortOrder.DESC },
+      orderBy: { expiryDate: SortOrder.DESC },
       take: 1,
     });
 
diff --git a/lib/graphql/apollo.ts b/lib/graphql/apollo.ts
index 6bbcc616..1f7b5f17 100644
--- a/lib/graphql/apollo.ts
+++ b/lib/graphql/apollo.ts
@@ -15,11 +15,15 @@ const schema = applyMiddleware(
 
 export const apolloServer = new ApolloServer({
   schema,
-  playground: {
-    settings: {
-      'schema.polling.enable': false, // Disable infinite schema introspection
-      'request.credentials': 'include', // Include auth token in requests
-    },
-  },
+  playground:
+    process.env.NODE_ENV === 'development'
+      ? {
+          settings: {
+            'schema.polling.enable': false, // Disable infinite schema introspection
+            'request.credentials': 'include', // Include auth token in requests
+          },
+        }
+      : false,
+  introspection: process.env.NODE_ENV === 'development',
   context,
 });
diff --git a/pages/404.tsx b/pages/404.tsx
new file mode 100644
index 00000000..bf610f7b
--- /dev/null
+++ b/pages/404.tsx
@@ -0,0 +1,25 @@
+import { GridItem, Text, VStack } from '@chakra-ui/react';
+import Layout from '@components/applicant/Layout';
+import { NextPage } from 'next';
+import Link from 'next/link';
+
+const NotFound: NextPage = () => {
+  return (
+    <Layout>
+      <GridItem colSpan={12}>
+        <VStack align="stretch" spacing="24px" minHeight="calc(100vh - 280px)">
+          <Text as="h1" textStyle="display-xlarge">
+            404 Page not found
+          </Text>
+          <Link href="/" passHref>
+            <Text as="a" textStyle="button-regular" color="primary">
+              Back to home
+            </Text>
+          </Link>
+        </VStack>
+      </GridItem>
+    </Layout>
+  );
+};
+
+export default NotFound;
diff --git a/pages/500.tsx b/pages/500.tsx
new file mode 100644
index 00000000..c482745a
--- /dev/null
+++ b/pages/500.tsx
@@ -0,0 +1,25 @@
+import { GridItem, Text, VStack } from '@chakra-ui/react';
+import Layout from '@components/applicant/Layout';
+import { NextPage } from 'next';
+import Link from 'next/link';
+
+const ErrorPage: NextPage = () => {
+  return (
+    <Layout>
+      <GridItem colSpan={12}>
+        <VStack align="stretch" spacing="24px" minHeight="calc(100vh - 280px)">
+          <Text as="h1" textStyle="display-xlarge">
+            500 Internal error
+          </Text>
+          <Link href="/" passHref>
+            <Text as="a" textStyle="button-regular" color="primary">
+              Back to home
+            </Text>
+          </Link>
+        </VStack>
+      </GridItem>
+    </Layout>
+  );
+};
+
+export default ErrorPage;
diff --git a/pages/api/payment-received.ts b/pages/api/payment-received.ts
index f95f33b3..44670caa 100644
--- a/pages/api/payment-received.ts
+++ b/pages/api/payment-received.ts
@@ -5,6 +5,7 @@ import crypto from 'crypto'; // Verifying Shopify Request
 import getRawBody from 'raw-body';
 import sendConfirmationEmail from '@lib/applications/sendConfirmationEmail';
 import { stripPostalCode } from '@lib/utils/format';
+import logger from '@lib/utils/logging';
 
 /**
  * Webhook to handle payment submission from Shopify
@@ -46,6 +47,7 @@ import { stripPostalCode } from '@lib/utils/format';
  */
 const paymentReceivedHandler: NextApiHandler = async (req, res) => {
   if (req.method !== 'POST') {
+    logger.error('Failed to process payment received webhook payload, method not allowed');
     return res.status(405).end('Method not allowed');
   }
 
@@ -57,6 +59,10 @@ const paymentReceivedHandler: NextApiHandler = async (req, res) => {
     .update(rawBody)
     .digest('base64');
   if (digest !== hmacHeader) {
+    logger.error(
+      { req, rawBody },
+      `Failed to process payment received webhook payload, response did not come from Shopify`
+    );
     return res.status(401).end();
   }
 
@@ -162,6 +168,7 @@ const paymentReceivedHandler: NextApiHandler = async (req, res) => {
     }
   } catch (err) {
     // TODO: Add some sort of logging or notification
+    logger.error({ rawBody, error: err }, `Failed to process webhook payload`);
     res.status(500).end();
   }
 
diff --git a/pages/index.tsx b/pages/index.tsx
index 37f953f3..9f8de8ea 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -117,7 +117,7 @@ export default function Landing() {
             </Text>
             <Text as="p" textStyle="body-regular" align="left" mt="24px">
               After completing the form, either email (
-              <a href="mailto:rcdparkingpermit@richmond.org">
+              <a href="mailto:rcdparkingpermit@rcdrichmond.org">
                 <Text as="span" fontWeight="bold" whiteSpace="nowrap">
                   parkingpermit@rcdrichmond.org
                 </Text>
@@ -213,7 +213,7 @@ export default function Landing() {
               604-232-2404
             </Text>{' '}
             or via email at{' '}
-            <a href="mailto:rcdparkingpermit@richmond.org">
+            <a href="mailto:rcdparkingpermit@rcdrichmond.org">
               <Text as="span" fontWeight="bold" whiteSpace="nowrap">
                 parkingpermit@rcdrichmond.org
               </Text>