From 74f11dae2a01f0fd6521ab5b78d73c85ab325d00 Mon Sep 17 00:00:00 2001
From: Jeremy Kahn <jeremyckahn@gmail.com>
Date: Sat, 20 Aug 2022 14:20:51 -0500
Subject: [PATCH] feat: assign userId

---
 src/Bootstrap.tsx                   | 10 ++++++++--
 src/components/Room/Room.test.tsx   | 16 +++++++++++-----
 src/components/Room/Room.tsx        | 13 +++++++++----
 src/models/chat.ts                  |  1 +
 src/pages/PublicRoom/PublicRoom.tsx |  8 ++++++--
 5 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/Bootstrap.tsx b/src/Bootstrap.tsx
index a85f811..aacf45e 100644
--- a/src/Bootstrap.tsx
+++ b/src/Bootstrap.tsx
@@ -1,17 +1,23 @@
-import React from 'react'
+import { useState } from 'react'
 import { Routes, Route } from 'react-router-dom'
+import { v4 as uuid } from 'uuid'
 
 import { Home } from './pages/Home/'
 import { PublicRoom } from './pages/PublicRoom/'
 
 function Bootstrap() {
+  const [userId] = useState(uuid())
+
   return (
     <div className="Chitchatter">
       <Routes>
         {['/', '/index.html'].map(path => (
           <Route key={path} path={path} element={<Home />} />
         ))}
-        <Route path="/public/:roomId" element={<PublicRoom />} />
+        <Route
+          path="/public/:roomId"
+          element={<PublicRoom userId={userId} />}
+        />
       </Routes>
     </div>
   )
diff --git a/src/components/Room/Room.test.tsx b/src/components/Room/Room.test.tsx
index 1a82a51..482e179 100644
--- a/src/components/Room/Room.test.tsx
+++ b/src/components/Room/Room.test.tsx
@@ -5,6 +5,8 @@ import { MemoryRouter as Router, Route, Routes } from 'react-router-dom'
 
 import { Room } from './'
 
+const stubUserId = 'user-id'
+
 const mockGetUuid = jest.fn()
 const mockMessagedSender = jest.fn()
 
@@ -42,7 +44,7 @@ describe('Room', () => {
   test('is available', () => {
     render(
       <RouteStub>
-        <Room />
+        <Room userId={stubUserId} />
       </RouteStub>
     )
   })
@@ -50,7 +52,7 @@ describe('Room', () => {
   test('send button is disabled', () => {
     render(
       <RouteStub>
-        <Room />
+        <Room userId={stubUserId} />
       </RouteStub>
     )
 
@@ -61,7 +63,7 @@ describe('Room', () => {
   test('inputting text enabled send button', () => {
     render(
       <RouteStub>
-        <Room />
+        <Room userId={stubUserId} />
       </RouteStub>
     )
 
@@ -74,7 +76,7 @@ describe('Room', () => {
   test('sending a message clears the text input', () => {
     render(
       <RouteStub>
-        <Room />
+        <Room userId={stubUserId} />
       </RouteStub>
     )
 
@@ -88,7 +90,10 @@ describe('Room', () => {
   test('message is sent to peer', () => {
     render(
       <RouteStub>
-        <Room getUuid={mockGetUuid.mockImplementation(() => 'abc123')} />
+        <Room
+          getUuid={mockGetUuid.mockImplementation(() => 'abc123')}
+          userId={stubUserId}
+        />
       </RouteStub>
     )
 
@@ -97,6 +102,7 @@ describe('Room', () => {
     userEvent.type(textInput, 'hello')
     userEvent.click(sendButton)
     expect(mockMessagedSender).toHaveBeenCalledWith({
+      authorId: stubUserId,
       text: 'hello',
       timeSent: 100,
       id: 'abc123',
diff --git a/src/components/Room/Room.tsx b/src/components/Room/Room.tsx
index 195c9ba..93eec37 100644
--- a/src/components/Room/Room.tsx
+++ b/src/components/Room/Room.tsx
@@ -13,9 +13,11 @@ import { UnsentMessage, ReceivedMessage } from 'models/chat'
 export interface RoomProps {
   appId?: string
   getUuid?: typeof uuid
+  userId: string
 }
 
 export function Room({
+  userId,
   appId = `${encodeURI(window.location.origin)}_${process.env.REACT_APP_NAME}`,
   getUuid = uuid,
 }: RoomProps) {
@@ -45,7 +47,12 @@ export function Room({
     event: React.SyntheticEvent<HTMLFormElement>
   ) => {
     event.preventDefault()
-    sendMessage({ text: textMessage, timeSent: Date.now(), id: getUuid() })
+    sendMessage({
+      authorId: userId,
+      text: textMessage,
+      timeSent: Date.now(),
+      id: getUuid(),
+    })
     setTextMessage('')
   }
 
@@ -59,9 +66,7 @@ export function Room({
   return (
     <div className="p-4">
       <Typography>Room ID: {roomId}</Typography>
-      <Typography>
-        Open this page in another tab and open the console.
-      </Typography>
+      <Typography>Open this page in another tab.</Typography>
       <form onSubmit={handleMessageSubmit} className="max-w-xl mt-8">
         <FormControl fullWidth>
           <TextField
diff --git a/src/models/chat.ts b/src/models/chat.ts
index a9907db..a733995 100644
--- a/src/models/chat.ts
+++ b/src/models/chat.ts
@@ -2,6 +2,7 @@ export interface UnsentMessage {
   id: string
   text: string
   timeSent: number
+  authorId: string
 }
 
 export interface ReceivedMessage extends UnsentMessage {
diff --git a/src/pages/PublicRoom/PublicRoom.tsx b/src/pages/PublicRoom/PublicRoom.tsx
index 1e805ed..73502cd 100644
--- a/src/pages/PublicRoom/PublicRoom.tsx
+++ b/src/pages/PublicRoom/PublicRoom.tsx
@@ -1,5 +1,9 @@
 import { Room } from 'components/Room'
 
-export function PublicRoom() {
-  return <Room />
+interface PublicRoomProps {
+  userId: string
+}
+
+export function PublicRoom({ userId }: PublicRoomProps) {
+  return <Room userId={userId} />
 }