From 84fba29b05dc1dfbaf0518a6ed964405ff6afad3 Mon Sep 17 00:00:00 2001
From: iubns <iubns@naver.com>
Date: Tue, 25 Aug 2026 15:26:37 +0900
Subject: [PATCH 1/3] =?UTF-8?q?update:=20=EC=88=98=EB=A0=A8=ED=9A=8C=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EB=AA=A9=EB=A1=9D=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/Header/index.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/components/Header/index.tsx b/client/src/components/Header/index.tsx
index bbbae74..2ef478d 100644
--- a/client/src/components/Header/index.tsx
+++ b/client/src/components/Header/index.tsx
@@ -77,6 +77,7 @@ export default function Header() {
       path: "/leader/attendance",
       type: "menu",
     })
+    /*
     DrawerItems.push({
       title: "순원 수련회 접수 조회",
       icon: <HowToRegIcon fontSize="small" sx={{ color: "#667eea" }} />,
@@ -90,6 +91,7 @@ export default function Header() {
       path: "/leader/retreat-attendance-for-same-age",
       type: "menu",
     })
+    */
 
     if (authUserData?.role.VillageLeader) {
       DrawerItems.push({

From 9cce18d5e77bb1c42afdfe35f2fe5fd7d0b32ba1 Mon Sep 17 00:00:00 2001
From: iubns <iubns@naver.com>
Date: Tue, 25 Aug 2026 18:10:01 +0900
Subject: [PATCH 2/3] =?UTF-8?q?update:=20=EC=83=88=EA=B0=80=EC=A1=B1=20UI?=
 =?UTF-8?q?=20=20=EA=B0=9C=ED=8E=B8=20=EB=B0=8F=20=EA=B6=8C=ED=95=9C=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newcomer/management/NewcomerFilter.tsx    | 186 +++++++++---------
 .../newcomer/management/NewcomerForm.tsx      |   2 +-
 .../newcomer/management/NewcomerTable.tsx     |   3 +-
 .../app/leader/newcomer/management/page.tsx   |  28 +--
 server/src/entity/types.ts                    |   8 +
 server/src/routes/newcomer/newcomerRouter.ts  |  68 ++++++-
 server/src/util/util.ts                       |   3 +
 7 files changed, 185 insertions(+), 113 deletions(-)

diff --git a/client/src/app/leader/newcomer/management/NewcomerFilter.tsx b/client/src/app/leader/newcomer/management/NewcomerFilter.tsx
index 995ae49..211e4d9 100644
--- a/client/src/app/leader/newcomer/management/NewcomerFilter.tsx
+++ b/client/src/app/leader/newcomer/management/NewcomerFilter.tsx
@@ -1,4 +1,4 @@
-import { Box, Button, MenuItem, Stack, TextField } from "@mui/material"
+import { Box, Button, MenuItem, Select, Stack, TextField } from "@mui/material"
 
 interface NewcomerFilterProps {
   filterName: string
@@ -36,15 +36,102 @@ export default function NewcomerFilter({
       bgcolor="#fafafa"
       boxShadow="0 2px 4px rgba(0,0,0,0.1)"
     >
-      <Stack
-        direction="row"
-        alignItems="center"
-        justifyContent="space-between"
-        mb="16px"
-      >
+      <Stack direction="row" alignItems="center" justifyContent="space-between">
         <Box fontWeight="bold" fontSize="16px" color="#333">
-          필터
+          조회 조건
         </Box>
+
+        <Stack
+          flex={1}
+          gap="12px"
+          direction="row"
+          justifyContent="flex-start"
+          alignItems="center"
+          borderLeft="1px solid #aaa"
+          mx="24px"
+          pl="12px"
+        >
+          <Stack direction="row" alignItems="center" gap="12px">
+            <Box width="32px" fontSize="14px" textAlign="right">
+              이름:
+            </Box>
+            <TextField
+              size="small"
+              placeholder="이름 검색"
+              value={filterName}
+              onChange={(e) => setFilterName(e.target.value)}
+              variant="outlined"
+              sx={{ flex: 1 }}
+            />
+          </Stack>
+
+          <Stack direction="row" alignItems="center" gap="12px">
+            <Box width="32px" fontSize="14px" textAlign="right">
+              성별:
+            </Box>
+            <Select
+              size="small"
+              value={filterGender}
+              onChange={(e) =>
+                setFilterGender(e.target.value as "" | "man" | "woman")
+              }
+              variant="outlined"
+              sx={{ flex: 1 }}
+              displayEmpty
+            >
+              <MenuItem value="">전체</MenuItem>
+              <MenuItem value="man">남</MenuItem>
+              <MenuItem value="woman">여</MenuItem>
+            </Select>
+          </Stack>
+
+          <Stack direction="row" alignItems="center" gap="12px">
+            <Box width="32px" fontSize="14px" textAlign="right">
+              상태:
+            </Box>
+            <Select
+              size="small"
+              value={filterStatus}
+              onChange={(e) => setFilterStatus(e.target.value)}
+              variant="outlined"
+              sx={{ flex: 1 }}
+              displayEmpty
+            >
+              <MenuItem value="">전체</MenuItem>
+              <MenuItem value="NORMAL">활동중</MenuItem>
+              <MenuItem value="PROMOTED">등반</MenuItem>
+              <MenuItem value="PENDING">보류</MenuItem>
+              <MenuItem value="DELETED">삭제</MenuItem>
+            </Select>
+          </Stack>
+
+          <Stack direction="row" alignItems="center" gap="12px">
+            <Box width="32px" fontSize="14px" textAlign="right">
+              생년:
+            </Box>
+            <TextField
+              size="small"
+              placeholder="최소"
+              value={filterMinYear}
+              onChange={(e) => setFilterMinYear(e.target.value)}
+              variant="outlined"
+              type="number"
+              sx={{ width: "90px" }}
+            />
+            <Box fontSize="12px" color="gray">
+              ~
+            </Box>
+            <TextField
+              size="small"
+              placeholder="최대"
+              value={filterMaxYear}
+              onChange={(e) => setFilterMaxYear(e.target.value)}
+              variant="outlined"
+              type="number"
+              sx={{ width: "90px" }}
+            />
+          </Stack>
+        </Stack>
         <Button
           size="small"
           onClick={clearFilters}
@@ -58,89 +145,6 @@ export default function NewcomerFilter({
           초기화
         </Button>
       </Stack>
-
-      <Stack gap="12px">
-        <Stack direction="row" alignItems="center" gap="12px">
-          <Box width="60px" fontSize="14px">
-            이름:
-          </Box>
-          <TextField
-            size="small"
-            placeholder="이름 검색"
-            value={filterName}
-            onChange={(e) => setFilterName(e.target.value)}
-            variant="outlined"
-            sx={{ flex: 1 }}
-          />
-        </Stack>
-
-        <Stack direction="row" alignItems="center" gap="12px">
-          <Box width="60px" fontSize="14px">
-            성별:
-          </Box>
-          <TextField
-            select
-            size="small"
-            value={filterGender}
-            onChange={(e) =>
-              setFilterGender(e.target.value as "" | "man" | "woman")
-            }
-            variant="outlined"
-            sx={{ flex: 1 }}
-          >
-            <MenuItem value="">전체</MenuItem>
-            <MenuItem value="man">남</MenuItem>
-            <MenuItem value="woman">여</MenuItem>
-          </TextField>
-        </Stack>
-
-        <Stack direction="row" alignItems="center" gap="12px">
-          <Box width="60px" fontSize="14px">
-            상태:
-          </Box>
-          <TextField
-            select
-            size="small"
-            value={filterStatus}
-            onChange={(e) => setFilterStatus(e.target.value)}
-            variant="outlined"
-            sx={{ flex: 1 }}
-          >
-            <MenuItem value="">전체</MenuItem>
-            <MenuItem value="NORMAL">활동중</MenuItem>
-            <MenuItem value="PROMOTED">등반</MenuItem>
-            <MenuItem value="PENDING">보류</MenuItem>
-            <MenuItem value="DELETED">삭제</MenuItem>
-          </TextField>
-        </Stack>
-
-        <Stack direction="row" alignItems="center" gap="12px">
-          <Box width="60px" fontSize="14px">
-            생년:
-          </Box>
-          <TextField
-            size="small"
-            placeholder="최소"
-            value={filterMinYear}
-            onChange={(e) => setFilterMinYear(e.target.value)}
-            variant="outlined"
-            type="number"
-            sx={{ width: "90px" }}
-          />
-          <Box fontSize="12px" color="gray">
-            ~
-          </Box>
-          <TextField
-            size="small"
-            placeholder="최대"
-            value={filterMaxYear}
-            onChange={(e) => setFilterMaxYear(e.target.value)}
-            variant="outlined"
-            type="number"
-            sx={{ width: "90px" }}
-          />
-        </Stack>
-      </Stack>
     </Stack>
   )
 }
diff --git a/client/src/app/leader/newcomer/management/NewcomerForm.tsx b/client/src/app/leader/newcomer/management/NewcomerForm.tsx
index 458ecbd..9092535 100644
--- a/client/src/app/leader/newcomer/management/NewcomerForm.tsx
+++ b/client/src/app/leader/newcomer/management/NewcomerForm.tsx
@@ -68,7 +68,7 @@ export default function NewcomerForm({
       flex={1}
       gap="12px"
       p="16px"
-      m="12px"
+      fontSize="14px"
       border="1px solid #e0e0e0"
       borderRadius="12px"
       bgcolor="#ffffff"
diff --git a/client/src/app/leader/newcomer/management/NewcomerTable.tsx b/client/src/app/leader/newcomer/management/NewcomerTable.tsx
index 5a541ba..f6dc141 100644
--- a/client/src/app/leader/newcomer/management/NewcomerTable.tsx
+++ b/client/src/app/leader/newcomer/management/NewcomerTable.tsx
@@ -61,7 +61,8 @@ export default function NewcomerTable({
       width="50%"
       flex={1}
       border="1px solid #ccc"
-      maxHeight="calc(100vh - 100px)"
+      borderRadius="8px"
+      maxHeight="calc(100vh - 230px)"
       overflow="auto"
     >
       <Box p="8px" bgcolor="#f5f5f5" fontSize="14px">
diff --git a/client/src/app/leader/newcomer/management/page.tsx b/client/src/app/leader/newcomer/management/page.tsx
index b2a211f..d10a623 100644
--- a/client/src/app/leader/newcomer/management/page.tsx
+++ b/client/src/app/leader/newcomer/management/page.tsx
@@ -325,7 +325,20 @@ export default function NewcomerManagement() {
 
   return (
     <Stack>
-      <Stack direction="row" p="12px" gap="12px">
+      <NewcomerFilter
+        filterName={filterName}
+        setFilterName={setFilterName}
+        filterGender={filterGender}
+        setFilterGender={setFilterGender}
+        filterMinYear={filterMinYear}
+        setFilterMinYear={setFilterMinYear}
+        filterMaxYear={filterMaxYear}
+        setFilterMaxYear={setFilterMaxYear}
+        filterStatus={filterStatus}
+        setFilterStatus={setFilterStatus}
+        clearFilters={clearFilters}
+      />
+      <Stack direction="row" px="12px" gap="12px">
         <NewcomerTable
           newcomerList={newcomerList}
           filteredNewcomerList={filteredNewcomers}
@@ -335,19 +348,6 @@ export default function NewcomerManagement() {
           onNewcomerSelect={setSelectedNewcomer}
         />
         <Stack width="40%">
-          <NewcomerFilter
-            filterName={filterName}
-            setFilterName={setFilterName}
-            filterGender={filterGender}
-            setFilterGender={setFilterGender}
-            filterMinYear={filterMinYear}
-            setFilterMinYear={setFilterMinYear}
-            filterMaxYear={filterMaxYear}
-            setFilterMaxYear={setFilterMaxYear}
-            filterStatus={filterStatus}
-            setFilterStatus={setFilterStatus}
-            clearFilters={clearFilters}
-          />
           <NewcomerForm
             selectedNewcomer={selectedNewcomer}
             onDataChange={onChangeData}
diff --git a/server/src/entity/types.ts b/server/src/entity/types.ts
index f64117f..e776912 100644
--- a/server/src/entity/types.ts
+++ b/server/src/entity/types.ts
@@ -32,6 +32,10 @@ export enum PermissionType {
   retreatEditTeamScore = "retreatEditTeamScore",
   retreatDeleteUser = "retreatDeleteUser",
   retreatMediaManage = "retreatMediaManage",
+
+  // 새가족 관련 권한
+  MANAGE_NEWCOMER_INFORMATION = "MANAGE_NEWCOMER_INFORMATION",
+  MANAGE_NEWCOMER_EDUCATION = "MANAGE_NEWCOMER_EDUCATION",
 }
 
 export function permissionTypeToString(
@@ -68,6 +72,10 @@ export function permissionTypeToString(
       return "수련회 참가자 삭제"
     case PermissionType.retreatMediaManage:
       return "수련회 미디어 관리"
+    case PermissionType.MANAGE_NEWCOMER_INFORMATION:
+      return "새가족 정보 관리"
+    case PermissionType.MANAGE_NEWCOMER_EDUCATION:
+      return "새가족 교육 관리"
     default:
       return "기타"
   }
diff --git a/server/src/routes/newcomer/newcomerRouter.ts b/server/src/routes/newcomer/newcomerRouter.ts
index a05442c..a790aa1 100644
--- a/server/src/routes/newcomer/newcomerRouter.ts
+++ b/server/src/routes/newcomer/newcomerRouter.ts
@@ -8,8 +8,12 @@ import {
   userDatabase,
   worshipScheduleDatabase,
 } from "../../model/dataSource"
-import { checkJwt } from "../../util/util"
-import { EducationLecture, NewcomerStatus } from "../../entity/types"
+import { checkJwt, hasPermission, hasPermissionFromReq } from "../../util/util"
+import {
+  EducationLecture,
+  NewcomerStatus,
+  PermissionType,
+} from "../../entity/types"
 
 const router = express.Router()
 
@@ -35,6 +39,16 @@ router.post("/", async (req, res) => {
     return
   }
 
+  const hasPermission = await hasPermissionFromReq(
+    req,
+    PermissionType.MANAGE_NEWCOMER_INFORMATION,
+  )
+
+  if (!hasPermission) {
+    res.status(403).send({ error: "권한이 없습니다." })
+    return
+  }
+
   const {
     name,
     yearOfBirth,
@@ -122,6 +136,16 @@ router.put("/:id", async (req, res) => {
     return
   }
 
+  const hasPermission = await hasPermissionFromReq(
+    req,
+    PermissionType.MANAGE_NEWCOMER_INFORMATION,
+  )
+
+  if (!hasPermission) {
+    res.status(403).send({ error: "권한이 없습니다." })
+    return
+  }
+
   const { id } = req.params
   const {
     name,
@@ -223,6 +247,16 @@ router.delete("/:id", async (req, res) => {
     return
   }
 
+  const hasPermission = await hasPermissionFromReq(
+    req,
+    PermissionType.MANAGE_NEWCOMER_INFORMATION,
+  )
+
+  if (!hasPermission) {
+    res.status(403).send({ error: "권한이 없습니다." })
+    return
+  }
+
   const { id } = req.params
 
   try {
@@ -246,6 +280,16 @@ router.get("/", async (req, res) => {
     return
   }
 
+  const hasPermission = await hasPermissionFromReq(
+    req,
+    PermissionType.MANAGE_NEWCOMER_INFORMATION,
+  )
+
+  if (!hasPermission) {
+    res.status(403).send({ error: "권한이 없습니다." })
+    return
+  }
+
   try {
     const status = req.query.status as NewcomerStatus | undefined
 
@@ -310,6 +354,16 @@ router.get("/education", async (req, res) => {
     return
   }
 
+  const hasPermission = await hasPermissionFromReq(
+    req,
+    PermissionType.MANAGE_NEWCOMER_EDUCATION,
+  )
+
+  if (!hasPermission) {
+    res.status(403).send({ error: "권한이 없습니다." })
+    return
+  }
+
   try {
     const status = req.query.status as NewcomerStatus | undefined
 
@@ -334,6 +388,12 @@ router.get("/education", async (req, res) => {
       order: {
         createdAt: "DESC",
       },
+      select: {
+        id: true,
+        name: true,
+        yearOfBirth: true,
+        gender: true,
+      },
     })
 
     // 최근 8주간의 예배 스케줄 조회
@@ -382,13 +442,9 @@ router.get("/education", async (req, res) => {
         name: newcomer.name,
         yearOfBirth: newcomer.yearOfBirth,
         gender: newcomer.gender,
-        phone: newcomer.phone,
-        address: newcomer.address,
-        occupation: newcomer.occupation,
         visitPath: newcomer.visitPath,
         registrationMotivation: newcomer.registrationMotivation,
         faithLevel: newcomer.faithLevel,
-        previousChurch: newcomer.previousChurch,
         carNumber: newcomer.carNumber,
         birthday: newcomer.birthday,
         registrationDate: newcomer.registrationDate,
diff --git a/server/src/util/util.ts b/server/src/util/util.ts
index ef3ed27..c51b145 100644
--- a/server/src/util/util.ts
+++ b/server/src/util/util.ts
@@ -16,6 +16,9 @@ export const hashCode = function (content: string) {
     .digest("hex")
 }
 
+/**
+ * @deprecated use hasPermissionFromReq instead
+ */
 export async function hasPermission(
   token: string | undefined,
   permissionType: PermissionType,

From 2fa1451aa1c6a575e708cf004e50c10791eed0de Mon Sep 17 00:00:00 2001
From: iubns <iubns@naver.com>
Date: Thu, 27 Aug 2026 10:12:32 +0900
Subject: [PATCH 3/3] =?UTF-8?q?update:=20=EB=8C=80=EC=8B=9C=EB=B3=B4?=
 =?UTF-8?q?=EB=93=9C=20=EC=B6=9C=EC=84=9D=20=EB=AF=B8=EB=93=B1=EB=A1=9D=20?=
 =?UTF-8?q?=EB=A7=88=EC=9D=84=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/app/admin/page.tsx        | 66 ++++++++++++++++++++++++++++
 server/src/routes/admin/dashboard.ts | 47 +++++++++++++++++++-
 2 files changed, 112 insertions(+), 1 deletion(-)

diff --git a/client/src/app/admin/page.tsx b/client/src/app/admin/page.tsx
index 58d6557..910de29 100644
--- a/client/src/app/admin/page.tsx
+++ b/client/src/app/admin/page.tsx
@@ -25,6 +25,7 @@ import AttendanceChart from "@/app/admin/AttendanceChart"
 
 interface DashboardData {
   totalUsers: number
+  communityUsers: number
   totalCommunities: number
   statistics: {
     weekly: {
@@ -64,6 +65,11 @@ interface DashboardData {
     date: string
     memo: string
   }>
+  villagesWithoutAttendance: Array<{
+    leader: { id: string; name: string }
+    villageId: number
+    villageName: string
+  }>
   lastUpdated: string
 }
 
@@ -179,6 +185,26 @@ function index() {
                   </Typography>
                   <Typography variant="body2" color="text.secondary">
                     등록된 인원
+                    <br />
+                    (장결 포함)
+                  </Typography>
+                </Stack>
+              </Stack>
+            </CardContent>
+          </Card>
+
+          <Card sx={{ flex: 1 }}>
+            <CardContent>
+              <Stack direction="row" alignItems="center" spacing={2}>
+                <PeopleIcon sx={{ fontSize: 40, color: "#1976d2" }} />
+                <Stack>
+                  <Typography variant="h4" fontWeight="bold">
+                    {dashboardData.communityUsers}
+                  </Typography>
+                  <Typography variant="body2" color="text.secondary">
+                    등록된 인원
+                    <br />
+                    (장결 재외)
                   </Typography>
                 </Stack>
               </Stack>
@@ -235,6 +261,46 @@ function index() {
         </Stack>
 
         <Stack direction={{ xs: "column", md: "row" }} spacing={3}>
+          <Box
+            sx={{
+              width: { xs: "100%", md: 180 },
+              flexShrink: 0,
+              pt: { xs: 0, md: 2 },
+            }}
+          >
+            <Typography textAlign="center" variant="subtitle2" gutterBottom>
+              출석 미등록 마을
+            </Typography>
+            <Stack
+              width="100%"
+              direction="row"
+              gap="4px"
+              overflow="none"
+              display="flex"
+              flexWrap="wrap"
+            >
+              {dashboardData.villagesWithoutAttendance.map((village) => (
+                <Stack
+                  bgcolor="white"
+                  key={village.villageId}
+                  border={1}
+                  borderColor="divider"
+                  p={1}
+                  borderRadius="8px"
+                >
+                  <Typography variant="body2" noWrap>
+                    {village.villageName}
+                  </Typography>
+                </Stack>
+              ))}
+            </Stack>
+            {dashboardData.villagesWithoutAttendance.length === 0 && (
+              <Typography variant="caption" color="text.secondary">
+                없음
+              </Typography>
+            )}
+          </Box>
+
           <Card sx={{ flex: 1 }}>
             <CardContent>
               <Typography variant="h6" fontWeight="bold" gutterBottom>
diff --git a/server/src/routes/admin/dashboard.ts b/server/src/routes/admin/dashboard.ts
index ec740b2..56094d5 100644
--- a/server/src/routes/admin/dashboard.ts
+++ b/server/src/routes/admin/dashboard.ts
@@ -57,6 +57,12 @@ router.get("/", async (req: Request, res: Response) => {
         name: Not(IsNull()),
       },
     })
+    const communityUsers = await userDatabase.count({
+      where: {
+        community: Not(IsNull()),
+        name: Not(IsNull()),
+      },
+    })
     const totalCommunities = await communityDatabase.count()
 
     // 이번 주 예배 일정 조회
@@ -83,7 +89,7 @@ router.get("/", async (req: Request, res: Response) => {
     const weeklyAttendance =
       weeklySchedules.length > 0
         ? await attendDataDatabase.find({
-            relations: ["worshipSchedule", "user"],
+            relations: ["worshipSchedule", "user", "user.community"],
             where: {
               worshipSchedule: {
                 id: In(weeklySchedules.map((s) => s.id)),
@@ -105,6 +111,43 @@ router.get("/", async (req: Request, res: Response) => {
           })
         : []
 
+    // 출석 등록하지 않은 마을 정보
+    const areaWithAttendance = await communityDatabase.find({
+      where: {
+        parent: IsNull(),
+      },
+      relations: {
+        parent: true,
+      },
+    })
+    const villageIdsWithAttendance = await communityDatabase.find({
+      where: {
+        parent: In(areaWithAttendance.map((area) => area.id)),
+      },
+      relations: {
+        parent: true,
+        leader: true,
+      },
+    })
+
+    const attendanceVillageIds = new Set(
+      weeklyAttendance
+        .map((attendance) => attendance.user?.community?.id)
+        .filter((villageId): villageId is number => villageId !== undefined),
+    )
+    const villagesWithoutAttendance = villageIdsWithAttendance
+      .filter((village) => !attendanceVillageIds.has(village.id))
+      .map((village) => ({
+        villageId: village.id,
+        villageName: village.name,
+        leader: village.leader
+          ? {
+              id: village.leader.id,
+              name: village.leader.name,
+            }
+          : null,
+      }))
+
     // 새가족 등록자 수 계산 함수
     const countNewFamilyRegistrants = async (scheduleIds: number[]) => {
       if (scheduleIds.length === 0) return 0
@@ -258,6 +301,7 @@ router.get("/", async (req: Request, res: Response) => {
 
     const dashboardData = {
       totalUsers,
+      communityUsers,
       totalCommunities,
       statistics: {
         weekly: weeklyStats,
@@ -265,6 +309,7 @@ router.get("/", async (req: Request, res: Response) => {
         last4Weeks: last4WeeksStats,
       },
       recentAbsentees: absenteeInfo,
+      villagesWithoutAttendance,
       lastUpdated: new Date().toISOString(),
     }