Feat/Identified vote final

packages/api/prisma/migrations/20240202093215_api/migration.sql

@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE `agenda` ADD COLUMN `isNamed` BOOLEAN NOT NULL DEFAULT false,
+    ADD COLUMN `isPublic` BOOLEAN NOT NULL DEFAULT true;

packages/api/prisma/schema.prisma

@@ -5,14 +5,17 @@ generator client {
 
 datasource db {
   provider = "mysql"
-  url      = env("DB_URL")
+  url      = env("DATABASE_URL")
 }
 
 model Agenda {
   id         Int                 @id @default(autoincrement())
   title      String
   resolution String
   content    String
+  // type       AgendaType
+  isNamed    Boolean             @default(false)
+  isPublic   Boolean             @default(true)
   startAt    DateTime?           @map("start_at")
   endAt      DateTime?           @map("end_at")
   createdAt  DateTime            @default(now()) @map("created_at")
@@ -24,6 +27,11 @@ model Agenda {
   @@map("agenda")
 }
 
+// type AgendaType {
+//   named    Boolean @default(false)
+//   private  Boolean @default(false)
+// }
+
 model User {
   id          Int                 @id @default(autoincrement())
   username    String              @unique
@@ -122,4 +130,4 @@ enum ChatType {
   notice
 
   @@map("chat_type")
-}
+}

packages/api/src/service/admin.agenda.ts

@@ -31,17 +31,27 @@ const selectAgendaDefaultFields = {
   },
 };
 
+const selectAgendaTypeFields = {
+  select: {
+    isNamed: true,
+    isPublic: true,
+  },
+};
+
 export const createAgenda = async ({
   title,
   resolution,
   content,
+  type,
   choices,
   voters,
 }: schema.AdminAgendaCreate) => {
   const createAgendaQuery: Prisma.AgendaCreateInput = {
     title,
     resolution,
     content,
+    isNamed: type.named,
+    isPublic: type.public,
     choices: {
       create: choices.map(name => ({ name })),
     },
@@ -58,13 +68,18 @@ export const createAgenda = async ({
     data: createAgendaQuery,
     select: {
       ...selectAgendaDefaultFields.select,
+      ...selectAgendaTypeFields.select,
       choices: true,
       voters: selectOnlyUser,
     },
   });
 
   const agendaVotable: PreparingAgenda = {
     ...createdAgenda,
+    type: {
+      named: createdAgenda.isNamed,
+      public: createdAgenda.isPublic,
+    },
     status: "preparing",
     choices: createdChoices,
     voters: {
@@ -117,6 +132,7 @@ export const startAgenda = async (agendaId: number, user: User) => {
       },
       select: {
         ...selectAgendaDefaultFields.select,
+        ...selectAgendaTypeFields.select,
         choices: {
           include: {
             users: true,
@@ -131,6 +147,10 @@ export const startAgenda = async (agendaId: number, user: User) => {
   const ongoingAgenda: OngoingAgenda = {
     ...updatedAgenda,
     status: "ongoing",
+    type: {
+      named: updatedAgenda.isNamed,
+      public: updatedAgenda.isPublic,
+    },
     voters: {
       voted: 0,
       total: updatedVoters.length,
@@ -163,6 +183,7 @@ export const terminateAgenda = async (agendaId: number, user: User) => {
     },
     select: {
       ...selectAgendaDefaultFields.select,
+      ...selectAgendaTypeFields.select,
       choices: {
         include: {
           users: true,
@@ -192,6 +213,10 @@ export const terminateAgenda = async (agendaId: number, user: User) => {
       // eslint-disable-next-line no-underscore-dangle
       count: choice._count.users,
     })),
+    type: {
+      named: updatedAgenda.isNamed,
+      public: updatedAgenda.isPublic,
+    },
     voters: {
       voted: updatedChoices.reduce(
         (acc, choice) => acc + choice.users.length,
@@ -254,6 +279,7 @@ export const updateAgenda = async (agendaUpdate: schema.AdminAgendaUpdate) => {
     },
     select: {
       ...selectAgendaDefaultFields.select,
+      ...selectAgendaTypeFields.select,
       choices: true,
       voters: selectOnlyUser,
     },
@@ -274,6 +300,10 @@ export const updateAgenda = async (agendaUpdate: schema.AdminAgendaUpdate) => {
       id: choice.id,
       name: choice.name,
     })),
+    type: {
+      named: updatedAgenda.isNamed,
+      public: updatedAgenda.isPublic,
+    },
     voters: {
       voted: 0,
       total: voters.length,
@@ -298,6 +328,10 @@ export const updateAgenda = async (agendaUpdate: schema.AdminAgendaUpdate) => {
       name: choice.name,
       count: 0,
     })),
+    type: {
+      named: updatedAgenda.isNamed,
+      public: updatedAgenda.isPublic,
+    },
     voters: {
       voted: [],
       total: voters.map(voter => voter.user),
@@ -344,6 +378,7 @@ export const retrieveAll = async (): Promise<schema.AdminAgenda[]> => {
     where: { deletedAt: null },
     select: {
       ...selectAgendaDefaultFields.select,
+      ...selectAgendaTypeFields.select,
       startAt: true,
       endAt: true,
       deletedAt: true,
@@ -372,6 +407,11 @@ export const retrieveAll = async (): Promise<schema.AdminAgenda[]> => {
       content: agenda.content,
       resolution: agenda.resolution,
       status,
+      // TODO: remove workaround
+      type: {
+        named: agenda.isNamed,
+        public: agenda.isPublic,
+      },
       choices: agenda.choices.map(choice => ({
         id: choice.id,
         name: choice.name,

packages/api/src/service/agenda.ts

@@ -15,7 +15,17 @@ export const retrieveAll = async (
         select: {
           id: true,
           name: true,
-          users: true,
+          users: {
+            select: {
+              userId: true,
+              choiceId: true,
+              user: {
+                select: {
+                  displayName: true,
+                },
+              },
+            },
+          },
         },
       },
     },
@@ -32,11 +42,23 @@ export const retrieveAll = async (
       title: agenda.title,
       content: agenda.content,
       resolution: agenda.resolution,
+      type: { named: agenda.isNamed, public: agenda.isPublic },
       voters: {
-        voted: agenda.choices.reduce(
-          (acc, choice) => acc + choice.users.length,
-          0,
-        ),
+        voted: agenda.isNamed
+          ? agenda.choices.reduce(
+              (acc, choice) => [
+                ...acc,
+                ...choice.users.map(u => ({
+                  displayName: u.user.displayName,
+                  choiceId: u.choiceId,
+                })),
+              ],
+              [] as { displayName: string; choiceId: number }[],
+            )
+          : agenda.choices.reduce(
+              (acc, choice) => acc + choice.users.length,
+              0,
+            ),
         total: agenda.voters.length,
       },
     };

packages/interface/src/admin/agenda/common.ts

@@ -7,22 +7,19 @@ import { User } from "@/user";
  * AdminAgendaStatus
  * some description about admin agenda status type goes here
  */
-export const AdminAgendaStatus = z.enum([...AgendaStatus.options, "preparing"]);
+export const AdminAgendaStatus = z.enum([...AgendaStatus.options]);
 export type AdminAgendaStatus = z.infer<typeof AdminAgendaStatus>;
 
 /**
  * AdminAgenda
  * some description about admin agenda schema goes here
  */
-export const AdminAgenda = AgendaBase.omit({
-  voters: true,
-  status: true,
-}).extend({
+export const AdminAgenda = AgendaBase.extend({
+  status: AdminAgendaStatus,
   voters: z.object({
     voted: z.array(User),
     total: z.array(User),
   }),
-  status: AdminAgendaStatus,
   choices: z.array(ChoiceWithResult),
 });
 export type AdminAgenda = z.infer<typeof AdminAgenda>;
@@ -35,6 +32,10 @@ export const AdminAgendaCreate = z.object({
   title: z.string().min(1).max(255),
   content: z.string().min(1).max(255),
   resolution: z.string().min(1).max(255),
+  type: z.object({
+    named: z.boolean(),
+    public: z.boolean(),
+  }),
   choices: z.array(z.string().min(1).max(255)).min(1),
   voters: z.object({
     total: z.array(z.number()),

packages/interface/src/agenda/common.ts

@@ -29,9 +29,22 @@ export const AgendaBase = z.object({
   title: z.string(),
   content: z.string(),
   resolution: z.string(),
+  type: z.object({
+    named: z.boolean(),
+    public: z.boolean(),
+  }),
   status: z.never(), // Must be overridden
   voters: z.object({
-    voted: z.number(),
+    voted: z.union([
+      z.number(),
+      z.array(
+        z.object({
+          // userId: z.number(),
+          displayName: z.string(),
+          choiceId: z.number(),
+        }),
+      ),
+    ]),
     total: z.number(),
   }),
 });

packages/web/src/components/atoms/Toggle.tsx

@@ -0,0 +1,53 @@
+import styled from "@emotion/styled";
+import { css } from "@emotion/react";
+
+type Size = number | "hug" | "fill";
+
+const calcSize = (size: Size) => {
+  if (size === "fill") return "fill";
+  if (size === "hug") return "fit-content";
+  return `${size}px`;
+};
+
+export const ToggleContainor = styled.div<{
+  w?: Size;
+  h?: Size;
+}>(
+  ({ w = "fill", h = 20 }) => css`
+    display: flex;
+    width: ${calcSize(w)};
+    height: ${calcSize(h)};
+    border-radius: 5px;
+    border: none;
+    justify-content: center;
+    align-items: center;
+    overflow: hidden;
+  `,
+);
+
+export const ToggleButton = styled.div<{
+  selected: boolean;
+  isLeft: boolean;
+}>(
+  ({ selected, isLeft = true, theme }) => css`
+    display: flex;
+    width: fill;
+    height: 100%;
+    padding: 0px;
+    border-style: solid;
+    border-width: 1px;
+    border-radius: ${isLeft ? "5px 0px 0px 5px" : "0px 5px 5px 0px"};
+    border-color: ${selected ? theme.colors.blue300 : theme.colors.gray400};
+    justify-content: center;
+    align-items: center;
+    line-height: 28px;
+    padding: 4px 5px 4px 5px;
+    background-color: ${selected ? theme.colors.blue200 : theme.colors.white};
+    transition-duration: 0.25s;
+    transition-property: background-color;
+
+    &:hover {
+      background-color: ${theme.colors.blue200};
+    }
+  `,
+);

packages/web/src/components/atoms/index.ts

@@ -21,3 +21,4 @@ export * from "./TaggersBox";
 export * from "./HyperText";
 export * from "./PresetOption";
 export * from "./TagSelect";
+export * from "./Toggle";