atridad/pollo
1
0
Fork 0
Code Activity Actions

Undo votes change... it was bad.

Browse source
This commit is contained in:
Atridad Lahiji 2023-06-12 23:32:57 -06:00
parent 2ab0720591
commit 45c29294f9
No known key found for this signature in database
2 changed files with 30 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/pages/room/[id].tsx
View file

@ -27,6 +27,7 @@ import { FaShieldAlt } from "react-icons/fa";
import { RiVipCrownFill } from "react-icons/ri"; import { RiVipCrownFill } from "react-icons/ri";
import Link from "next/link"; import Link from "next/link";
import { downloadCSV } from "~/utils/helpers"; import { downloadCSV } from "~/utils/helpers";
import { User } from "@prisma/client";
export const getServerSideProps: GetServerSideProps = async (ctx) => { export const getServerSideProps: GetServerSideProps = async (ctx) => {
const session = await getServerAuthSession(ctx); const session = await getServerAuthSession(ctx);
@ -47,18 +48,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
}; };
}; };
// interface ExtendedVote extends Vote {
// value: string;
// room: typeof Room;
// id: string;
// createdAt: Date;
// userId: string;
// owner: {
// name: string | null;
// };
// roomId: string;
// }
const Room: NextPage = () => { const Room: NextPage = () => {
return ( return (
<> <>
@ -86,9 +75,6 @@ const RoomBody: React.FC = () => {
const { data: roomFromDb, refetch: refetchRoomFromDb } = const { data: roomFromDb, refetch: refetchRoomFromDb } =
api.room.get.useQuery({ id: roomId }); api.room.get.useQuery({ id: roomId });
const { data: votesFromDb, refetch: refetchVotesFromDb } =
api.vote.getAllByRoomId.useQuery({ roomId });
const setVoteInDb = api.vote.set.useMutation({}); const setVoteInDb = api.vote.set.useMutation({});
const setRoomInDb = api.room.set.useMutation({}); const setRoomInDb = api.room.set.useMutation({});
@ -104,13 +90,8 @@ const RoomBody: React.FC = () => {
{ {
channelName: `${env.NEXT_PUBLIC_APP_ENV}-${roomId}`, channelName: `${env.NEXT_PUBLIC_APP_ENV}-${roomId}`,
}, },
({ name }) => { () => {
if (name === "ROOM_UPDATE") {
void refetchVotesFromDb();
void refetchRoomFromDb(); void refetchRoomFromDb();
} else if (name === "VOTE_UPDATE") {
void refetchVotesFromDb();
}
} }
); );
@ -155,8 +136,8 @@ const RoomBody: React.FC = () => {
const getVoteForCurrentUser = () => { const getVoteForCurrentUser = () => {
if (roomFromDb && sessionData) { if (roomFromDb && sessionData) {
return ( return (
votesFromDb && roomFromDb.votes &&
votesFromDb.find((vote) => vote.userId === sessionData.user.id) roomFromDb.votes.find((vote) => vote.userId === sessionData.user.id)
); );
} else { } else {
return null; return null;
@ -186,7 +167,7 @@ const RoomBody: React.FC = () => {
}; };
const downloadLogs = () => { const downloadLogs = () => {
if (roomFromDb && votesFromDb) { if (roomFromDb) {
// const element = document.createElement("a"); // const element = document.createElement("a");
const jsonObject = roomFromDb?.logs const jsonObject = roomFromDb?.logs
.map((item) => { .map((item) => {
@ -204,7 +185,7 @@ const RoomBody: React.FC = () => {
userId: roomFromDb.owner.id, userId: roomFromDb.owner.id,
roomId: roomFromDb.id, roomId: roomFromDb.id,
scale: roomScale, scale: roomScale,
votes: votesFromDb.map((vote) => { votes: roomFromDb.votes.map((vote) => {
return { return {
name: vote.owner.name, name: vote.owner.name,
value: vote.value, value: vote.value,
@ -231,7 +212,13 @@ const RoomBody: React.FC = () => {
const voteString = ( const voteString = (
visible: boolean, visible: boolean,
votes: typeof votesFromDb, votes: {
id: string;
userId: string;
owner: User;
roomId: string;
value: string;
}[],
presenceItem: PresenceItem presenceItem: PresenceItem
) => { ) => {
const matchedVote = votes?.find( const matchedVote = votes?.find(
@ -334,10 +321,9 @@ const RoomBody: React.FC = () => {
</p> </p>
{roomFromDb && {roomFromDb &&
votesFromDb &&
voteString( voteString(
roomFromDb.visible, roomFromDb.visible,
votesFromDb, roomFromDb.votes,
presenceItem.data presenceItem.data
)} )}
</li> </li>
@ -435,7 +421,7 @@ const RoomBody: React.FC = () => {
false, false,
true, true,
roomFromDb.storyName === storyNameText || roomFromDb.storyName === storyNameText ||
votesFromDb?.length === 0 roomFromDb.votes.length === 0
? false ? false
: true : true
) )
@ -448,7 +434,7 @@ const RoomBody: React.FC = () => {
} }
> >
{roomFromDb.storyName === storyNameText || {roomFromDb.storyName === storyNameText ||
votesFromDb?.length === 0 ? ( roomFromDb.votes.length === 0 ? (
<> <>
<IoReloadOutline className="text-xl mr-1" /> Reset <IoReloadOutline className="text-xl mr-1" /> Reset
</> </>
@ -460,9 +446,9 @@ const RoomBody: React.FC = () => {
</button> </button>
</div> </div>
{votesFromDb && {roomFromDb.votes &&
(roomFromDb.logs.length > 0 || (roomFromDb.logs.length > 0 ||
votesFromDb.length > 0) && ( roomFromDb.votes.length > 0) && (
<div> <div>
<button <button
onClick={() => downloadLogs()} onClick={() => downloadLogs()}

11
src/server/api/routers/room.ts
View file

@ -75,6 +75,15 @@ export const roomRouter = createTRPCRouter({
visible: true, visible: true,
scale: true, scale: true,
owner: true, owner: true,
votes: {
select: {
id: true,
owner: true,
roomId: true,
userId: true,
value: true,
},
},
}, },
}); });
}), }),
@ -198,6 +207,8 @@ export const roomRouter = createTRPCRouter({
roomId: input.roomId, roomId: input.roomId,
}, },
}); });
await publishToChannel(`${input.roomId}`, "VOTE_UPDATE", "UPDATE");
} }
const newRoom = await ctx.prisma.room.update({ const newRoom = await ctx.prisma.room.update({