Compare commits
35 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a04592499c | |||
| f569211967 | |||
| c8306e2ac7 | |||
| bad2f47ffe | |||
| 943fe9c819 | |||
| 7b819f4ab0 | |||
| 6a5740ec68 | |||
| 3c8f30af6d | |||
| 7e3b4e2229 | |||
| 67bd5dc666 | |||
| 84161ee2d9 | |||
| 5aec36b155 | |||
| 3ab8971025 | |||
| db30e71e0a | |||
| e4c2758dea | |||
| 75661aa0ef | |||
| 3303ba2e96 | |||
| 43c2ff6ad9 | |||
| a7bb8d7149 | |||
| 791ce6d526 | |||
| 61083a5bb1 | |||
| 66fb86d23c | |||
| 16f7c6097c | |||
| 7232635ed0 | |||
| b42b98d560 | |||
| f216660afa | |||
| b31b43e30e | |||
| 86bd9ef8ff | |||
| 2fd9984a45 | |||
| 91330ec94c | |||
| 08102c8684 | |||
| e2472b7ea1 | |||
| 033883aac5 | |||
| d2cfcd90f0 | |||
| 42e73fa694 |
@@ -3,3 +3,10 @@ ASPNETCORE_URLS=http://0.0.0.0:5001
|
||||
ConnectionStrings__Default=Host=localhost;Database=taxbaikdb;Username=taxbaik;Password=change-me
|
||||
Jwt__SecretKey=dev-secret-key-change-in-production-min-32-chars!
|
||||
Admin__PasswordResetToken=change-this-reset-token
|
||||
Authentication__Google__ClientId=
|
||||
Authentication__Google__ClientSecret=
|
||||
Authentication__Naver__ClientId=
|
||||
Authentication__Naver__ClientSecret=
|
||||
Authentication__Kakao__ClientId=
|
||||
Authentication__Kakao__ClientSecret=
|
||||
# CI deploy trigger requires a real push on master.
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
name: TaxBaik CI/CD
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
@@ -38,18 +39,29 @@ jobs:
|
||||
JWT_SECRET_KEY="${{ secrets.TAXBAIK_JWT_SECRET_KEY }}"
|
||||
TELEGRAM_BOT_TOKEN="${{ secrets.TAXBAIK_TELEGRAM_BOT_TOKEN }}"
|
||||
TELEGRAM_CHAT_ID="${{ secrets.TAXBAIK_TELEGRAM_CHAT_ID }}"
|
||||
TELEGRAM_INQUIRY_CHAT_ID="${{ secrets.TAXBAIK_TELEGRAM_INQUIRY_CHAT_ID }}"
|
||||
TELEGRAM_SYSTEM_CHAT_ID="${{ secrets.TAXBAIK_TELEGRAM_SYSTEM_CHAT_ID }}"
|
||||
[ -z "$JWT_SECRET_KEY" ] && { echo "Missing TAXBAIK_JWT_SECRET_KEY" >&2; exit 1; }
|
||||
[ -z "$TELEGRAM_BOT_TOKEN" ] && { echo "Missing TAXBAIK_TELEGRAM_BOT_TOKEN" >&2; exit 1; }
|
||||
[ -z "$TELEGRAM_CHAT_ID" ] && { echo "Missing TAXBAIK_TELEGRAM_CHAT_ID" >&2; exit 1; }
|
||||
[ -z "$TELEGRAM_INQUIRY_CHAT_ID" ] && TELEGRAM_INQUIRY_CHAT_ID="$TELEGRAM_CHAT_ID"
|
||||
[ -z "$TELEGRAM_SYSTEM_CHAT_ID" ] && TELEGRAM_SYSTEM_CHAT_ID="-5585148480"
|
||||
JWT_SECRET_KEY="$JWT_SECRET_KEY" \
|
||||
TELEGRAM_BOT_TOKEN="$TELEGRAM_BOT_TOKEN" \
|
||||
TELEGRAM_CHAT_ID="$TELEGRAM_CHAT_ID" \
|
||||
TELEGRAM_INQUIRY_CHAT_ID="$TELEGRAM_INQUIRY_CHAT_ID" \
|
||||
TELEGRAM_SYSTEM_CHAT_ID="$TELEGRAM_SYSTEM_CHAT_ID" \
|
||||
python3 -c '
|
||||
import json, os, pathlib
|
||||
pathlib.Path("./publish/appsettings.Production.json").write_text(
|
||||
json.dumps({
|
||||
"Jwt": {"SecretKey": os.environ["JWT_SECRET_KEY"]},
|
||||
"Telegram": {"BotToken": os.environ["TELEGRAM_BOT_TOKEN"], "ChatId": os.environ["TELEGRAM_CHAT_ID"]}
|
||||
"Telegram": {
|
||||
"BotToken": os.environ["TELEGRAM_BOT_TOKEN"],
|
||||
"ChatId": os.environ["TELEGRAM_CHAT_ID"],
|
||||
"InquiryChatId": os.environ["TELEGRAM_INQUIRY_CHAT_ID"],
|
||||
"SystemChatId": os.environ["TELEGRAM_SYSTEM_CHAT_ID"]
|
||||
}
|
||||
}, ensure_ascii=False, indent=2),
|
||||
encoding="utf-8"
|
||||
)'
|
||||
@@ -98,6 +110,34 @@ jobs:
|
||||
COMMIT=$(git rev-parse --short HEAD)
|
||||
DEPLOY_HOST="${{ secrets.DEPLOY_HOST }}"
|
||||
DEPLOY_USER="${{ secrets.DEPLOY_USER }}"
|
||||
TELEGRAM_BOT_TOKEN="${{ secrets.TAXBAIK_TELEGRAM_BOT_TOKEN }}"
|
||||
TELEGRAM_SYSTEM_CHAT_ID="${{ secrets.TAXBAIK_TELEGRAM_SYSTEM_CHAT_ID }}"
|
||||
TELEGRAM_CHAT_ID="${TELEGRAM_SYSTEM_CHAT_ID:--5585148480}"
|
||||
|
||||
send_telegram() {
|
||||
local text="$1"
|
||||
if [ -z "$TELEGRAM_BOT_TOKEN" ]; then
|
||||
echo "Skipping Telegram notification: missing TAXBAIK_TELEGRAM_BOT_TOKEN" >&2
|
||||
return 0
|
||||
fi
|
||||
|
||||
curl -fsS -X POST "https://api.telegram.org/bot${TELEGRAM_BOT_TOKEN}/sendMessage" \
|
||||
-d "chat_id=${TELEGRAM_CHAT_ID}" \
|
||||
--data-urlencode "text=${text}" \
|
||||
-d "parse_mode=HTML" >/dev/null || true
|
||||
}
|
||||
|
||||
notify_failure() {
|
||||
local exit_code=$?
|
||||
send_telegram "❌ <b>TaxBaik 배포 실패</b>
|
||||
|
||||
커밋: <code>${COMMIT}</code>
|
||||
시간: <code>${TIMESTAMP}</code>
|
||||
단계: CI/CD deploy"
|
||||
exit "$exit_code"
|
||||
}
|
||||
|
||||
trap notify_failure ERR
|
||||
|
||||
echo "=== Deploying TaxBaik $COMMIT ($TIMESTAMP) ==="
|
||||
|
||||
@@ -179,3 +219,9 @@ jobs:
|
||||
REMOTE
|
||||
|
||||
echo "✓ 배포 완료: taxbaik_${TIMESTAMP} @ $DEPLOY_HOST"
|
||||
send_telegram "✅ <b>TaxBaik 배포 완료</b>
|
||||
|
||||
커밋: <code>${COMMIT}</code>
|
||||
시간: <code>${TIMESTAMP}</code>
|
||||
대상: <code>${DEPLOY_HOST}</code>
|
||||
채널: <code>${TELEGRAM_CHAT_ID}</code>"
|
||||
|
||||
@@ -1093,6 +1093,219 @@ Admin 로그인 페이지만 [AllowAnonymous]:
|
||||
- **메모이제이션**: `OnParametersSet` vs `OnInitializedAsync` 구분
|
||||
- **API 캐싱**: 변경이 없으면 `IMemoryCache` 사용 (5분 TTL)
|
||||
|
||||
### 8.7 Blazor 페이지 추가 표준 가이드 ✅ (2026-06-28 갱신)
|
||||
|
||||
**목표**: 모든 관리자 페이지가 일관된 구조와 UX를 유지하도록 강제
|
||||
|
||||
#### 필수 구조 (기존 Dashboard 패턴 준수)
|
||||
|
||||
**Step 1: 페이지 헤더 (`<section class="admin-page-hero">`)**
|
||||
```razor
|
||||
@page "/admin/새페이지"
|
||||
@attribute [Authorize]
|
||||
@inject INewPageClient NewPageClient
|
||||
@inject NavigationManager Nav
|
||||
|
||||
<PageTitle>페이지 제목</PageTitle>
|
||||
|
||||
<!-- 반드시 포함할 요소 -->
|
||||
<section class="admin-page-hero">
|
||||
<div>
|
||||
<MudText Typo="Typo.caption" Class="admin-eyebrow">카테고리</MudText>
|
||||
<MudText Typo="Typo.h4" Class="admin-page-title">페이지 제목</MudText>
|
||||
<MudText Typo="Typo.body2" Class="admin-page-subtitle">한 줄 설명</MudText>
|
||||
</div>
|
||||
<MudButton Variant="Variant.Filled" Color="Color.Primary" StartIcon="@Icons.Material.Filled.Add" OnClick="OpenCreateDialog">
|
||||
새 항목 추가
|
||||
</MudButton>
|
||||
</section>
|
||||
```
|
||||
|
||||
**Step 2: 콘텐츠 영역**
|
||||
```razor
|
||||
<!-- 로딩 상태 -->
|
||||
@if (items == null)
|
||||
{
|
||||
<MudProgressCircular Indeterminate="true" Class="mt-4" />
|
||||
}
|
||||
<!-- 빈 상태 -->
|
||||
else if (items.Count == 0)
|
||||
{
|
||||
<MudAlert Severity="Severity.Info" Class="mt-4">데이터가 없습니다.</MudAlert>
|
||||
}
|
||||
<!-- 데이터 그리드 -->
|
||||
else
|
||||
{
|
||||
<MudDataGrid T="YourEntity"
|
||||
Items="@items"
|
||||
Dense="true"
|
||||
Hover="true"
|
||||
Striped="true"
|
||||
Virtualize="true"
|
||||
RowsPerPage="30"
|
||||
Class="admin-grid mt-4">
|
||||
<Columns>
|
||||
<!-- 필수: 컬럼 정의 -->
|
||||
</Columns>
|
||||
</MudDataGrid>
|
||||
}
|
||||
```
|
||||
|
||||
**Step 3: 모달 다이얼로그 (Create/Edit)**
|
||||
```razor
|
||||
<MudDialog @bind-IsVisible="isDialogOpen" Options="new DialogOptions { MaxWidth = MaxWidth.Small, FullWidth = true }">
|
||||
<TitleContent>
|
||||
<MudText Typo="Typo.h6">@(isEditMode ? "항목 수정" : "새 항목 추가")</MudText>
|
||||
</TitleContent>
|
||||
<DialogContent>
|
||||
<MudForm @ref="form">
|
||||
<!-- 폼 필드 -->
|
||||
</MudForm>
|
||||
</DialogContent>
|
||||
<DialogActions>
|
||||
<MudButton OnClick="CloseDialog">취소</MudButton>
|
||||
<MudButton Color="Color.Primary" OnClick="SaveItem">저장</MudButton>
|
||||
</DialogActions>
|
||||
</MudDialog>
|
||||
```
|
||||
|
||||
**Step 4: @code 섹션 구조**
|
||||
```csharp
|
||||
@code {
|
||||
private List<YourEntity>? items;
|
||||
private List<RelatedEntity> relatedItems = [];
|
||||
private Dictionary<int, string> itemMap = new();
|
||||
|
||||
private MudForm? form;
|
||||
private bool isDialogOpen;
|
||||
private bool isEditMode;
|
||||
private YourEntity? editingItem;
|
||||
private YourItemForm itemForm = new();
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
await LoadData();
|
||||
}
|
||||
|
||||
private async Task LoadData()
|
||||
{
|
||||
try
|
||||
{
|
||||
items = await YourItemClient.GetAllAsync();
|
||||
// 필요시 관련 데이터 로드
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Snackbar.Add($"데이터 로드 실패: {ex.Message}", Severity.Error);
|
||||
}
|
||||
}
|
||||
|
||||
private void OpenCreateDialog()
|
||||
{
|
||||
isEditMode = false;
|
||||
editingItem = null;
|
||||
itemForm = new();
|
||||
isDialogOpen = true;
|
||||
}
|
||||
|
||||
private async Task OpenEditDialog(YourEntity item)
|
||||
{
|
||||
isEditMode = true;
|
||||
editingItem = item;
|
||||
itemForm = new YourItemForm { /* 초기화 */ };
|
||||
isDialogOpen = true;
|
||||
}
|
||||
|
||||
private async Task SaveItem()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (isEditMode)
|
||||
{
|
||||
await YourItemClient.UpdateAsync(editingItem!.Id, /* params */);
|
||||
Snackbar.Add("항목이 업데이트되었습니다.", Severity.Success);
|
||||
}
|
||||
else
|
||||
{
|
||||
var newId = await YourItemClient.CreateAsync(/* params */);
|
||||
if (newId > 0)
|
||||
{
|
||||
Snackbar.Add("항목이 추가되었습니다.", Severity.Success);
|
||||
}
|
||||
}
|
||||
CloseDialog();
|
||||
await LoadData();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Snackbar.Add($"저장 실패: {ex.Message}", Severity.Error);
|
||||
}
|
||||
}
|
||||
|
||||
private async Task DeleteItem(int id)
|
||||
{
|
||||
var parameters = new DialogParameters();
|
||||
parameters.Add("Title", "삭제 확인");
|
||||
parameters.Add("Message", "이 항목을 삭제하시겠습니까?");
|
||||
|
||||
var dialog = await DialogService.ShowAsync<ConfirmDialog>("", parameters);
|
||||
var result = await dialog.Result;
|
||||
|
||||
if (result?.Canceled ?? true)
|
||||
return;
|
||||
|
||||
try
|
||||
{
|
||||
await YourItemClient.DeleteAsync(id);
|
||||
Snackbar.Add("항목이 삭제되었습니다.", Severity.Success);
|
||||
await LoadData();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Snackbar.Add($"삭제 실패: {ex.Message}", Severity.Error);
|
||||
}
|
||||
}
|
||||
|
||||
private void CloseDialog()
|
||||
{
|
||||
isDialogOpen = false;
|
||||
isEditMode = false;
|
||||
editingItem = null;
|
||||
itemForm = new();
|
||||
}
|
||||
|
||||
private class YourItemForm
|
||||
{
|
||||
// DTO 필드
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### 체크리스트 (모든 페이지)
|
||||
|
||||
- [ ] @page 지시문 확인
|
||||
- [ ] @attribute [Authorize] 추가
|
||||
- [ ] @inject로 필요한 Client 주입
|
||||
- [ ] <PageTitle> 추가
|
||||
- [ ] <section class="admin-page-hero"> (캡션, 제목, 부제, 추가 버튼)
|
||||
- [ ] 로딩 상태 (MudProgressCircular)
|
||||
- [ ] 빈 상태 (MudAlert)
|
||||
- [ ] MudDataGrid (Dense=true, Virtualize=true, RowsPerPage=30, admin-grid 클래스)
|
||||
- [ ] MudDialog (Create/Edit 모달)
|
||||
- [ ] ConfirmDialog (Delete 확인)
|
||||
- [ ] @code 섹션: OnInitializedAsync → LoadData() 패턴
|
||||
- [ ] 모든 에러 처리 (try-catch, Snackbar 메시지)
|
||||
- [ ] CloseDialog() 메서드로 모달 상태 초기화
|
||||
|
||||
#### 위반 사항
|
||||
|
||||
❌ **이 패턴을 따르지 않는 페이지는 실시간 코드 리뷰 대상:**
|
||||
- 페이지 헤더 (admin-page-hero) 누락
|
||||
- 인라인 스타일로 레이아웃 구성
|
||||
- MudDialog 없이 별도 라우트로 Create/Edit 처리 (흰 화면 플래시)
|
||||
- @code 섹션 구조 다름
|
||||
- 모달에서 직접 onSubmit 대신 Snackbar 피드백 미제공
|
||||
|
||||
---
|
||||
|
||||
## 9. Do's & Don'ts
|
||||
@@ -1718,6 +1931,48 @@ else
|
||||
|
||||
---
|
||||
|
||||
### CI Deploy 트러블슈팅 하네스 (2026-06-28)
|
||||
|
||||
커밋 후 배포가 동작하지 않는다고 판단하기 전에 아래 순서로 확인한다. 추측으로 runner, secret, 커밋 제목을 원인으로 단정하지 않는다.
|
||||
|
||||
1. **푸시 결과 확인**
|
||||
```powershell
|
||||
git push origin master 2>&1 | Select-String "master|To|Processed|remote"
|
||||
```
|
||||
`master -> master`가 보이면 Git push는 성공이다. 이 단계는 CI 실행 성공을 의미하지 않는다.
|
||||
|
||||
2. **Actions run 생성 확인**
|
||||
```powershell
|
||||
$headers = @{ Authorization = "token $env:GITEA_TOKEN_TAXBAIK" }
|
||||
$runs = Invoke-RestMethod -Headers $headers -Uri "http://178.104.200.7/api/v1/repos/kjh2064/taxbaik/actions/runs?limit=10"
|
||||
$runs.workflow_runs | Select-Object id,path,event,head_sha,display_title,status,conclusion
|
||||
```
|
||||
`deploy.yml@refs/heads/master`, `event=push`, 최신 `head_sha`가 있어야 배포가 실제로 시작된 것이다.
|
||||
|
||||
3. **workflow 파싱 검증**
|
||||
```powershell
|
||||
curl.exe -sS -w "`nHTTP_STATUS:%{http_code}`n" `
|
||||
-H "Authorization: token $env:GITEA_TOKEN_TAXBAIK" `
|
||||
-H "Content-Type: application/json" `
|
||||
-X POST "http://178.104.200.7/api/v1/repos/kjh2064/taxbaik/actions/workflows/deploy.yml/dispatches?return_run_details=true" `
|
||||
--data '{"ref":"refs/heads/master","inputs":{}}'
|
||||
```
|
||||
`failed to unmarshal workflow content`가 나오면 `.gitea/workflows/deploy.yml` YAML 문법 문제다. 여러 줄 문자열은 반드시 `run: |` 블록 들여쓰기 안에 둔다.
|
||||
|
||||
4. **job 실패 로그 확인**
|
||||
```powershell
|
||||
curl.exe -sS -H "Authorization: token $env:GITEA_TOKEN_TAXBAIK" `
|
||||
"http://178.104.200.7/api/v1/repos/kjh2064/taxbaik/actions/jobs/{job_id}/logs"
|
||||
```
|
||||
빌드/테스트/배포/헬스체크 중 어느 단계인지 먼저 분리한다.
|
||||
|
||||
**이번 장애 원인 기록**:
|
||||
- `deploy.yml`의 Telegram 여러 줄 메시지 일부가 YAML 블록 들여쓰기 밖에 있어 Gitea workflow 파서가 실패했다.
|
||||
- 이후 배포 실행은 되었지만, 운영 `Authentication:*:ClientId`가 빈 값인데 OAuth provider를 무조건 등록해 `ClientId` 예외로 500이 발생했다.
|
||||
- 외부 OAuth provider는 ClientId/ClientSecret이 모두 있을 때만 등록한다.
|
||||
|
||||
---
|
||||
|
||||
## 12. 문제 해결
|
||||
|
||||
| 문제 | 해결 |
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
|
||||
**온라인 세무 상담 플랫폼** | 블로그 SEO 최적화 | 전국 고객 확보
|
||||
|
||||
CI deploy trigger verification note.
|
||||
|
||||
---
|
||||
|
||||
## 개요
|
||||
|
||||
+16
-16
@@ -425,9 +425,9 @@ Todo:
|
||||
- 텔레그램 전송 실패 시 로그만 남기고 앱 정상 운영 유지
|
||||
|
||||
Todo:
|
||||
- [ ] BackgroundService 또는 Hangfire 기반 스케줄러 추가
|
||||
- [ ] 일간/주간 리포트 메시지 템플릿
|
||||
- [ ] TelegramNotificationService에 리포트 메서드 추가
|
||||
- [x] BackgroundService 또는 Hangfire 기반 스케줄러 추가
|
||||
- [x] 일간/주간 리포트 메시지 템플릿
|
||||
- [x] TelegramNotificationService에 리포트 메서드 추가
|
||||
|
||||
## WBS-CRM-07 고객 포털 (읽기 전용) — Phase 3
|
||||
|
||||
@@ -439,9 +439,9 @@ Todo:
|
||||
- 개인정보 열람 범위는 세무사가 허용한 항목만
|
||||
|
||||
Todo:
|
||||
- [ ] 고객 포털 설계 (인증 방식 결정 — WBS-CRM-08 선행)
|
||||
- [ ] 고객 전용 Razor Pages 추가
|
||||
- [ ] 세무사 허용 권한 설정 UI
|
||||
- [x] 고객 포털 설계 (인증 방식 결정 — WBS-CRM-08 선행)
|
||||
- [x] 고객 전용 Razor Pages 추가
|
||||
- [x] 세무사 허용 권한 설정 UI
|
||||
|
||||
## WBS-CRM-08 고객 회원가입 · 소셜 로그인 — Phase 3
|
||||
|
||||
@@ -485,16 +485,16 @@ DB 스키마:
|
||||
- `GOOGLE_CLIENT_ID` / `GOOGLE_CLIENT_SECRET`
|
||||
|
||||
Todo:
|
||||
- [ ] WBS-CRM-07 고객 포털 기본 구조 완성 (선행)
|
||||
- [ ] OAuth 앱 등록 (네이버·카카오·구글 개발자 콘솔)
|
||||
- [ ] V011__CreatePortalUsers.sql 마이그레이션
|
||||
- [ ] PortalUser 엔티티 / IPortalUserRepository / PortalUserRepository
|
||||
- [ ] 네이버 OAuth Handler 구현
|
||||
- [ ] 카카오·구글 패키지 추가 및 설정
|
||||
- [ ] 기본 계정 회원가입 폼 (`/taxbaik/portal/register`)
|
||||
- [ ] 소셜 로그인 콜백 처리 → portal_users 자동 생성
|
||||
- [ ] 신규 가입 시 clients 테이블 연결 또는 신규 생성
|
||||
- [ ] 포털 로그인 페이지 (`/taxbaik/portal/login`) — 소셜 버튼 + 이메일 폼
|
||||
- [x] WBS-CRM-07 고객 포털 기본 구조 완성 (선행)
|
||||
- [x] OAuth 앱 등록 (네이버·카카오·구글 개발자 콘솔)
|
||||
- [x] V011__CreatePortalUsers.sql 마이그레이션 (실제 V016__CreatePortalUsers.sql로 대체됨)
|
||||
- [x] PortalUser 엔티티 / IPortalUserRepository / PortalUserRepository
|
||||
- [x] 네이버 OAuth Handler 구현
|
||||
- [x] 카카오·구글 패키지 추가 및 설정
|
||||
- [x] 기본 계정 회원가입 폼 (`/taxbaik/portal/register`)
|
||||
- [x] 소셜 로그인 콜백 처리 → portal_users 자동 생성
|
||||
- [x] 신규 가입 시 clients 테이블 연결 또는 신규 생성
|
||||
- [x] 포털 로그인 페이지 (`/taxbaik/portal/login`) — 소셜 버튼 + 이메일 폼
|
||||
- [ ] Gitea Secrets에 OAuth 키 추가
|
||||
- [ ] 배포 후 소셜 로그인 3종 E2E 테스트
|
||||
|
||||
|
||||
@@ -25,6 +25,8 @@ public static class DependencyInjection
|
||||
services.AddScoped<ConsultingActivityService>();
|
||||
services.AddScoped<ContractService>();
|
||||
services.AddScoped<RevenueTrackingService>();
|
||||
services.AddScoped<TelegramReportService>();
|
||||
services.AddScoped<PortalUserService>();
|
||||
return services;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,6 +22,15 @@ public class ClientService(IClientRepository repository)
|
||||
public async Task<Client?> GetByIdAsync(int id, CancellationToken ct = default) =>
|
||||
await repository.GetByIdAsync(id, ct);
|
||||
|
||||
public async Task<Client?> GetByEmailAsync(string email, CancellationToken ct = default) =>
|
||||
await repository.GetByEmailAsync(email, ct);
|
||||
|
||||
public async Task<Client?> GetByPhoneAsync(string phone, CancellationToken ct = default) =>
|
||||
await repository.GetByPhoneAsync(phone, ct);
|
||||
|
||||
public async Task<int> CountCreatedAtRangeAsync(DateTime startDateUtc, DateTime endDateUtc, CancellationToken ct = default) =>
|
||||
await repository.CountByCreatedAtRangeAsync(startDateUtc, endDateUtc, ct);
|
||||
|
||||
public async Task<int> CreateAsync(CreateClientDto dto, CancellationToken ct = default)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(dto.Name))
|
||||
|
||||
@@ -15,7 +15,7 @@ public class InquiryService(
|
||||
|
||||
public async Task<int> SubmitAsync(
|
||||
string name, string phone, string serviceType, string message,
|
||||
string? email = null, string? ipAddress = null, CancellationToken ct = default)
|
||||
string? email = null, string? ipAddress = null, bool suppressNotification = false, CancellationToken ct = default)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(name))
|
||||
throw new ValidationException("이름을 입력하세요.");
|
||||
@@ -39,7 +39,10 @@ public class InquiryService(
|
||||
};
|
||||
|
||||
var inquiryId = await repository.CreateAsync(inquiry, ct);
|
||||
await notificationService.NotifyCreatedAsync(inquiryId, inquiry.Name, inquiry.Phone, inquiry.ServiceType, inquiry.Message, inquiry.IpAddress, inquiry.CreatedAt, ct);
|
||||
if (!suppressNotification)
|
||||
{
|
||||
await notificationService.NotifyCreatedAsync(inquiryId, inquiry.Name, inquiry.Phone, inquiry.ServiceType, inquiry.Message, inquiry.IpAddress, inquiry.CreatedAt, ct);
|
||||
}
|
||||
memoryCache.Remove(AdminDashboardService.CacheKey);
|
||||
return inquiryId;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
namespace TaxBaik.Application.Services;
|
||||
|
||||
using TaxBaik.Domain.Entities;
|
||||
using TaxBaik.Domain.Interfaces;
|
||||
|
||||
public class PortalUserService(IPortalUserRepository repository)
|
||||
{
|
||||
public async Task<PortalUser?> GetByEmailAsync(string email, CancellationToken ct = default) =>
|
||||
await repository.GetByEmailAsync(email.Trim(), ct);
|
||||
|
||||
public async Task<PortalUser?> GetByProviderAsync(string provider, string providerId, CancellationToken ct = default) =>
|
||||
await repository.GetByProviderAsync(provider.Trim(), providerId.Trim(), ct);
|
||||
|
||||
public async Task<int> RegisterLocalAsync(string name, string email, string phone, string? passwordHash, int? clientId = null, CancellationToken ct = default) =>
|
||||
await RegisterAsync(name, email, phone, "local", null, passwordHash, clientId, ct);
|
||||
|
||||
public async Task<int> RegisterOAuthAsync(string name, string email, string? phone, string provider, string providerId, int? clientId = null, CancellationToken ct = default) =>
|
||||
await RegisterAsync(name, email, phone, provider, providerId, null, clientId, ct);
|
||||
|
||||
public async Task LinkOAuthAsync(PortalUser user, string provider, string providerId, string? displayName = null, string? email = null, CancellationToken ct = default)
|
||||
{
|
||||
user.Name = string.IsNullOrWhiteSpace(displayName) ? user.Name : displayName.Trim();
|
||||
user.Email = string.IsNullOrWhiteSpace(email) ? user.Email : email.Trim();
|
||||
if (string.IsNullOrWhiteSpace(user.PasswordHash))
|
||||
{
|
||||
user.Provider = provider.Trim();
|
||||
user.ProviderId = providerId.Trim();
|
||||
}
|
||||
await repository.UpdateAsync(user, ct);
|
||||
}
|
||||
|
||||
public async Task AttachClientAsync(PortalUser user, int clientId, CancellationToken ct = default)
|
||||
{
|
||||
user.ClientId = clientId;
|
||||
await repository.UpdateAsync(user, ct);
|
||||
}
|
||||
|
||||
private async Task<int> RegisterAsync(string name, string email, string? phone, string provider, string? providerId, string? passwordHash, int? clientId, CancellationToken ct)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(name))
|
||||
throw new ValidationException("이름을 입력하세요.");
|
||||
if (string.IsNullOrWhiteSpace(email))
|
||||
throw new ValidationException("이메일을 입력하세요.");
|
||||
|
||||
var user = new PortalUser
|
||||
{
|
||||
ClientId = clientId,
|
||||
Name = name.Trim(),
|
||||
Email = email.Trim(),
|
||||
Phone = string.IsNullOrWhiteSpace(phone) ? null : phone.Trim(),
|
||||
Provider = provider,
|
||||
ProviderId = providerId,
|
||||
PasswordHash = passwordHash,
|
||||
CreatedAt = DateTime.UtcNow
|
||||
};
|
||||
|
||||
return await repository.CreateAsync(user, ct);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
namespace TaxBaik.Application.Services;
|
||||
|
||||
public record TelegramDailyReport(
|
||||
DateOnly Date,
|
||||
int NewInquiries,
|
||||
int PendingInquiries,
|
||||
int NewClients,
|
||||
int PendingTaxFilings,
|
||||
int PendingPayments);
|
||||
|
||||
public record TelegramWeeklyReport(
|
||||
DateOnly WeekStart,
|
||||
DateOnly WeekEnd,
|
||||
int NewInquiries,
|
||||
int NewClients,
|
||||
int UpcomingTaxFilings,
|
||||
decimal RevenueThisWeek);
|
||||
|
||||
public class TelegramReportService(
|
||||
InquiryService inquiryService,
|
||||
ClientService clientService,
|
||||
TaxFilingScheduleService taxFilingScheduleService,
|
||||
RevenueTrackingService revenueTrackingService)
|
||||
{
|
||||
public async Task<TelegramDailyReport> BuildDailyReportAsync(DateOnly date, CancellationToken ct = default)
|
||||
{
|
||||
var start = date.ToDateTime(TimeOnly.MinValue, DateTimeKind.Utc);
|
||||
var end = date.ToDateTime(TimeOnly.MaxValue, DateTimeKind.Utc);
|
||||
|
||||
return new TelegramDailyReport(
|
||||
Date: date,
|
||||
NewInquiries: await inquiryService.CountByDateRangeAsync(start, end, ct),
|
||||
PendingInquiries: await inquiryService.CountByStatusAsync("new", ct),
|
||||
NewClients: await clientService.CountCreatedAtRangeAsync(start, end, ct),
|
||||
PendingTaxFilings: await taxFilingScheduleService.GetPendingCountAsync(ct),
|
||||
PendingPayments: (await revenueTrackingService.GetPendingPaymentsAsync(ct)).Count());
|
||||
}
|
||||
|
||||
public async Task<TelegramWeeklyReport> BuildWeeklyReportAsync(DateOnly weekStart, CancellationToken ct = default)
|
||||
{
|
||||
var weekEnd = weekStart.AddDays(6);
|
||||
var start = weekStart.ToDateTime(TimeOnly.MinValue, DateTimeKind.Utc);
|
||||
var end = weekEnd.ToDateTime(TimeOnly.MaxValue, DateTimeKind.Utc);
|
||||
var upcomingEnd = weekEnd.AddDays(7).ToDateTime(TimeOnly.MaxValue, DateTimeKind.Utc);
|
||||
|
||||
var revenue = await revenueTrackingService.GetTotalRevenueAsync(start, end, ct);
|
||||
|
||||
return new TelegramWeeklyReport(
|
||||
WeekStart: weekStart,
|
||||
WeekEnd: weekEnd,
|
||||
NewInquiries: await inquiryService.CountByDateRangeAsync(start, end, ct),
|
||||
NewClients: await clientService.CountCreatedAtRangeAsync(start, end, ct),
|
||||
UpcomingTaxFilings: (await taxFilingScheduleService.GetUpcomingDuesAsync(14, ct))
|
||||
.Count(x => x.DueDate >= start && x.DueDate <= upcomingEnd),
|
||||
RevenueThisWeek: revenue);
|
||||
}
|
||||
|
||||
public static string FormatDailyMessage(TelegramDailyReport report) =>
|
||||
$"<b>📊 일간 리포트</b>\n\n" +
|
||||
$"기준일: <code>{report.Date:yyyy-MM-dd}</code>\n" +
|
||||
$"신규 문의: <code>{report.NewInquiries}</code>\n" +
|
||||
$"처리 대기 문의: <code>{report.PendingInquiries}</code>\n" +
|
||||
$"신규 고객: <code>{report.NewClients}</code>\n" +
|
||||
$"신고 대기: <code>{report.PendingTaxFilings}</code>\n" +
|
||||
$"미수 청구: <code>{report.PendingPayments}</code>";
|
||||
|
||||
public static string FormatWeeklyMessage(TelegramWeeklyReport report) =>
|
||||
$"<b>📈 주간 리포트</b>\n\n" +
|
||||
$"기간: <code>{report.WeekStart:yyyy-MM-dd}</code> ~ <code>{report.WeekEnd:yyyy-MM-dd}</code>\n" +
|
||||
$"신규 문의: <code>{report.NewInquiries}</code>\n" +
|
||||
$"신규 고객: <code>{report.NewClients}</code>\n" +
|
||||
$"다가오는 신고: <code>{report.UpcomingTaxFilings}</code>\n" +
|
||||
$"주간 매출: <code>₩{report.RevenueThisWeek:N0}</code>";
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
namespace TaxBaik.Domain.Entities;
|
||||
|
||||
public class PortalUser
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public int? ClientId { get; set; }
|
||||
public string Email { get; set; } = "";
|
||||
public string Name { get; set; } = "";
|
||||
public string? Phone { get; set; }
|
||||
public string Provider { get; set; } = "local";
|
||||
public string? ProviderId { get; set; }
|
||||
public string? PasswordHash { get; set; }
|
||||
public DateTime CreatedAt { get; set; }
|
||||
}
|
||||
@@ -8,6 +8,9 @@ public interface IClientRepository
|
||||
int page, int pageSize, string? status = null, string? search = null,
|
||||
CancellationToken ct = default);
|
||||
Task<Client?> GetByIdAsync(int id, CancellationToken ct = default);
|
||||
Task<Client?> GetByEmailAsync(string email, CancellationToken ct = default);
|
||||
Task<Client?> GetByPhoneAsync(string phone, CancellationToken ct = default);
|
||||
Task<int> CountByCreatedAtRangeAsync(DateTime startDateUtc, DateTime endDateUtc, CancellationToken ct = default);
|
||||
Task<int> CreateAsync(Client client, CancellationToken ct = default);
|
||||
Task UpdateAsync(Client client, CancellationToken ct = default);
|
||||
Task DeleteAsync(int id, CancellationToken ct = default);
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
namespace TaxBaik.Domain.Interfaces;
|
||||
|
||||
using TaxBaik.Domain.Entities;
|
||||
|
||||
public interface IPortalUserRepository
|
||||
{
|
||||
Task<PortalUser?> GetByIdAsync(int id, CancellationToken ct = default);
|
||||
Task<PortalUser?> GetByEmailAsync(string email, CancellationToken ct = default);
|
||||
Task<PortalUser?> GetByProviderAsync(string provider, string providerId, CancellationToken ct = default);
|
||||
Task<int> CreateAsync(PortalUser user, CancellationToken ct = default);
|
||||
Task UpdateAsync(PortalUser user, CancellationToken ct = default);
|
||||
}
|
||||
@@ -19,6 +19,7 @@ public static class DependencyInjection
|
||||
services.AddScoped<IClientRepository, ClientRepository>();
|
||||
services.AddScoped<IFaqRepository, FaqRepository>();
|
||||
services.AddScoped<IConsultationRepository, ConsultationRepository>();
|
||||
services.AddScoped<IPortalUserRepository, PortalUserRepository>();
|
||||
services.AddScoped<ITaxFilingRepository, TaxFilingRepository>();
|
||||
services.AddScoped<ICompanyRepository, CompanyRepository>();
|
||||
services.AddScoped<ITaxProfileRepository, TaxProfileRepository>();
|
||||
|
||||
@@ -40,6 +40,33 @@ public class ClientRepository(IDbConnectionFactory connectionFactory) : BaseRepo
|
||||
new { Id = id });
|
||||
}
|
||||
|
||||
public async Task<Client?> GetByEmailAsync(string email, CancellationToken ct = default)
|
||||
{
|
||||
using var conn = Conn();
|
||||
return await conn.QueryFirstOrDefaultAsync<Client>(
|
||||
$"SELECT {SelectColumns} FROM clients WHERE email = @Email",
|
||||
new { Email = email });
|
||||
}
|
||||
|
||||
public async Task<Client?> GetByPhoneAsync(string phone, CancellationToken ct = default)
|
||||
{
|
||||
using var conn = Conn();
|
||||
return await conn.QueryFirstOrDefaultAsync<Client>(
|
||||
$"SELECT {SelectColumns} FROM clients WHERE phone = @Phone",
|
||||
new { Phone = phone });
|
||||
}
|
||||
|
||||
public async Task<int> CountByCreatedAtRangeAsync(DateTime startDateUtc, DateTime endDateUtc, CancellationToken ct = default)
|
||||
{
|
||||
using var conn = Conn();
|
||||
return await conn.ExecuteScalarAsync<int>(
|
||||
@"SELECT COUNT(*)
|
||||
FROM clients
|
||||
WHERE created_at >= @StartDateUtc
|
||||
AND created_at <= @EndDateUtc",
|
||||
new { StartDateUtc = startDateUtc, EndDateUtc = endDateUtc });
|
||||
}
|
||||
|
||||
public async Task<int> CreateAsync(Client client, CancellationToken ct = default)
|
||||
{
|
||||
using var conn = Conn();
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
namespace TaxBaik.Infrastructure.Repositories;
|
||||
|
||||
using Dapper;
|
||||
using TaxBaik.Domain.Entities;
|
||||
using TaxBaik.Domain.Interfaces;
|
||||
|
||||
public class PortalUserRepository(IDbConnectionFactory connectionFactory) : BaseRepository(connectionFactory), IPortalUserRepository
|
||||
{
|
||||
public async Task<PortalUser?> GetByIdAsync(int id, CancellationToken ct = default)
|
||||
{
|
||||
using var conn = Conn();
|
||||
return await conn.QueryFirstOrDefaultAsync<PortalUser>(
|
||||
@"SELECT id, client_id, email, name, phone, provider, provider_id, password_hash, created_at
|
||||
FROM portal_users
|
||||
WHERE id = @Id",
|
||||
new { Id = id });
|
||||
}
|
||||
|
||||
public async Task<PortalUser?> GetByEmailAsync(string email, CancellationToken ct = default)
|
||||
{
|
||||
using var conn = Conn();
|
||||
return await conn.QueryFirstOrDefaultAsync<PortalUser>(
|
||||
@"SELECT id, client_id, email, name, phone, provider, provider_id, password_hash, created_at
|
||||
FROM portal_users
|
||||
WHERE email = @Email",
|
||||
new { Email = email });
|
||||
}
|
||||
|
||||
public async Task<PortalUser?> GetByProviderAsync(string provider, string providerId, CancellationToken ct = default)
|
||||
{
|
||||
using var conn = Conn();
|
||||
return await conn.QueryFirstOrDefaultAsync<PortalUser>(
|
||||
@"SELECT id, client_id, email, name, phone, provider, provider_id, password_hash, created_at
|
||||
FROM portal_users
|
||||
WHERE provider = @Provider AND provider_id = @ProviderId",
|
||||
new { Provider = provider, ProviderId = providerId });
|
||||
}
|
||||
|
||||
public async Task<int> CreateAsync(PortalUser user, CancellationToken ct = default)
|
||||
{
|
||||
using var conn = Conn();
|
||||
return await conn.QueryFirstAsync<int>(
|
||||
@"INSERT INTO portal_users (client_id, email, name, phone, provider, provider_id, password_hash, created_at)
|
||||
VALUES (@ClientId, @Email, @Name, @Phone, @Provider, @ProviderId, @PasswordHash, NOW())
|
||||
RETURNING id",
|
||||
user);
|
||||
}
|
||||
|
||||
public async Task UpdateAsync(PortalUser user, CancellationToken ct = default)
|
||||
{
|
||||
using var conn = Conn();
|
||||
await conn.ExecuteAsync(
|
||||
@"UPDATE portal_users
|
||||
SET client_id = @ClientId,
|
||||
email = @Email,
|
||||
name = @Name,
|
||||
phone = @Phone,
|
||||
provider = @Provider,
|
||||
provider_id = @ProviderId,
|
||||
password_hash = @PasswordHash
|
||||
WHERE id = @Id",
|
||||
user);
|
||||
}
|
||||
}
|
||||
@@ -83,24 +83,6 @@
|
||||
<MudNavLink Href="/taxbaik/admin/inquiries" Icon="@Icons.Material.Filled.Forum">문의 관리</MudNavLink>
|
||||
<MudNavLink Href="/taxbaik/admin/settings" Icon="@Icons.Material.Filled.Tune">설정</MudNavLink>
|
||||
</MudNavMenu>
|
||||
<div class="admin-drawer-footer">
|
||||
<MudDivider Class="my-2" />
|
||||
<MudStack Spacing="1" Class="px-3 py-2">
|
||||
<div class="admin-footer-item">
|
||||
<MudIcon Icon="@Icons.Material.Filled.Info" Size="Size.Small" />
|
||||
<MudText Typo="Typo.caption" Class="ml-2">시스템</MudText>
|
||||
</div>
|
||||
<MudText Typo="Typo.caption" Color="Color.Secondary">
|
||||
운영 서버: 178.104.200.7
|
||||
</MudText>
|
||||
<MudText Typo="Typo.caption" Color="Color.Secondary">
|
||||
업데이트: 자동 배포 시스템
|
||||
</MudText>
|
||||
<MudText Typo="Typo.caption" Color="Color.Secondary">
|
||||
상태: 정상
|
||||
</MudText>
|
||||
</MudStack>
|
||||
</div>
|
||||
</MudDrawer>
|
||||
|
||||
<MudMainContent Class="admin-main">
|
||||
@@ -121,6 +103,16 @@
|
||||
Navigation.LocationChanged += OnLocationChanged;
|
||||
}
|
||||
|
||||
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||
{
|
||||
if (!firstRender)
|
||||
return;
|
||||
|
||||
var viewportWidth = await JS.InvokeAsync<int>("taxbaikAdminSession.getViewportWidth");
|
||||
drawerOpen = viewportWidth >= 960;
|
||||
StateHasChanged();
|
||||
}
|
||||
|
||||
private void OnLocationChanged(object? sender, LocationChangedEventArgs args)
|
||||
{
|
||||
_ = InvokeAsync(() => JS.InvokeVoidAsync("taxbaikAdminSession.showLoading"));
|
||||
|
||||
@@ -24,11 +24,11 @@
|
||||
<MudTextField @bind-Value="model.Title" Label="제목"
|
||||
Variant="Variant.Outlined" Class="mb-4" Required="true" />
|
||||
|
||||
<MudSelect @bind-Value="model.CategoryId" Label="카테고리"
|
||||
<MudSelect T="int?" @bind-Value="model.CategoryId" Label="카테고리"
|
||||
Variant="Variant.Outlined" Class="mb-4">
|
||||
@foreach (var category in categories)
|
||||
{
|
||||
<MudSelectItem Value="@category.Id">@category.Name</MudSelectItem>
|
||||
<MudSelectItem T="int?" Value="@((int?)category.Id)">@category.Name</MudSelectItem>
|
||||
}
|
||||
</MudSelect>
|
||||
|
||||
|
||||
@@ -35,11 +35,11 @@ else
|
||||
<MudTextField @bind-Value="model.Title" Label="제목"
|
||||
Variant="Variant.Outlined" Class="mb-4" Required="true" />
|
||||
|
||||
<MudSelect @bind-Value="model.CategoryId" Label="카테고리"
|
||||
<MudSelect T="int?" @bind-Value="model.CategoryId" Label="카테고리"
|
||||
Variant="Variant.Outlined" Class="mb-4">
|
||||
@foreach (var category in categories)
|
||||
{
|
||||
<MudSelectItem Value="@category.Id">@category.Name</MudSelectItem>
|
||||
<MudSelectItem T="int?" Value="@((int?)category.Id)">@category.Name</MudSelectItem>
|
||||
}
|
||||
</MudSelect>
|
||||
|
||||
|
||||
@@ -8,21 +8,28 @@
|
||||
|
||||
<PageTitle>상담 활동 관리</PageTitle>
|
||||
|
||||
<div class="admin-container">
|
||||
<div class="admin-header">
|
||||
<MudText Typo="Typo.h5" Class="font-weight-bold">상담 활동 관리</MudText>
|
||||
<MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="OpenCreateDialog" StartIcon="@Icons.Material.Filled.Add">
|
||||
새 활동 기록
|
||||
</MudButton>
|
||||
<section class="admin-page-hero">
|
||||
<div>
|
||||
<MudText Typo="Typo.caption" Class="admin-eyebrow">CRM & 세무관리</MudText>
|
||||
<MudText Typo="Typo.h4" Class="admin-page-title">상담 활동 관리</MudText>
|
||||
<MudText Typo="Typo.body2" Class="admin-page-subtitle">고객별 상담 이력과 팔로업을 추적합니다.</MudText>
|
||||
</div>
|
||||
<MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="OpenCreateDialog" StartIcon="@Icons.Material.Filled.Add">
|
||||
새 활동 기록
|
||||
</MudButton>
|
||||
</section>
|
||||
|
||||
@if (activities == null)
|
||||
<MudPaper Class="admin-surface" Elevation="0">
|
||||
@if (activities is null)
|
||||
{
|
||||
<MudProgressCircular Indeterminate="true" Class="mt-4" />
|
||||
<MudProgressLinear Indeterminate="true" />
|
||||
}
|
||||
else if (activities.Count == 0)
|
||||
{
|
||||
<MudAlert Severity="Severity.Info" Class="mt-4">상담 활동이 없습니다.</MudAlert>
|
||||
<MudAlert Severity="Severity.Info" Class="mt-4">
|
||||
<MudIcon Icon="@Icons.Material.Filled.Timeline" Class="me-2" />
|
||||
상담 활동이 없습니다.
|
||||
</MudAlert>
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -33,7 +40,7 @@
|
||||
Striped="true"
|
||||
Virtualize="true"
|
||||
RowsPerPage="30"
|
||||
Class="admin-grid mt-4">
|
||||
Class="admin-grid">
|
||||
<Columns>
|
||||
<PropertyColumn Property="x => x.Id" Title="ID" Sortable="true" />
|
||||
<TemplateColumn Title="고객">
|
||||
@@ -82,9 +89,8 @@
|
||||
</Columns>
|
||||
</MudDataGrid>
|
||||
}
|
||||
</div>
|
||||
</MudPaper>
|
||||
|
||||
<!-- Create/Edit Dialog -->
|
||||
<MudDialog @bind-IsVisible="isDialogOpen" Options="new DialogOptions { MaxWidth = MaxWidth.Small, FullWidth = true }">
|
||||
<TitleContent>
|
||||
<MudText Typo="Typo.h6">@(editingActivity == null ? "새 활동 기록" : "활동 기록 수정")</MudText>
|
||||
@@ -201,9 +207,11 @@
|
||||
|
||||
private async Task DeleteActivity(int id)
|
||||
{
|
||||
var parameters = new DialogParameters();
|
||||
parameters.Add("Title", "삭제 확인");
|
||||
parameters.Add("Message", "이 활동을 삭제하시겠습니까?");
|
||||
var parameters = new DialogParameters
|
||||
{
|
||||
{ "Title", "삭제 확인" },
|
||||
{ "Message", "이 활동을 삭제하시겠습니까?" }
|
||||
};
|
||||
|
||||
var dialog = await DialogService.ShowAsync<ConfirmDialog>("", parameters);
|
||||
var result = await dialog.Result;
|
||||
@@ -239,20 +247,3 @@
|
||||
public DateTime? NextFollowupDate { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
<style>
|
||||
.admin-container {
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
.admin-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.admin-grid {
|
||||
font-size: 13px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -8,29 +8,35 @@
|
||||
|
||||
<PageTitle>계약 관리</PageTitle>
|
||||
|
||||
<div class="admin-container">
|
||||
<div class="admin-header">
|
||||
<div>
|
||||
<MudText Typo="Typo.h5" Class="font-weight-bold">계약 관리</MudText>
|
||||
@if (mrr > 0)
|
||||
{
|
||||
<MudText Typo="Typo.body2" Class="mt-2">
|
||||
월 정기수익: <MudChip Size="Size.Small" Color="Color.Primary" Variant="Variant.Filled">₩@mrr.ToString("N0")</MudChip>
|
||||
</MudText>
|
||||
}
|
||||
</div>
|
||||
<MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="OpenCreateDialog" StartIcon="@Icons.Material.Filled.Add">
|
||||
새 계약 추가
|
||||
</MudButton>
|
||||
<section class="admin-page-hero">
|
||||
<div>
|
||||
<MudText Typo="Typo.caption" Class="admin-eyebrow">CRM & 세무관리</MudText>
|
||||
<MudText Typo="Typo.h4" Class="admin-page-title">계약 관리</MudText>
|
||||
<MudText Typo="Typo.body2" Class="admin-page-subtitle">고객 계약과 월 정기수익을 함께 관리합니다.</MudText>
|
||||
@if (mrr > 0)
|
||||
{
|
||||
<MudText Typo="Typo.body2" Class="mt-2">
|
||||
월 정기수익:
|
||||
<MudChip Size="Size.Small" Color="Color.Primary" Variant="Variant.Filled">₩@mrr.ToString("N0")</MudChip>
|
||||
</MudText>
|
||||
}
|
||||
</div>
|
||||
<MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="OpenCreateDialog" StartIcon="@Icons.Material.Filled.Add">
|
||||
새 계약 추가
|
||||
</MudButton>
|
||||
</section>
|
||||
|
||||
@if (contracts == null)
|
||||
<MudPaper Class="admin-surface" Elevation="0">
|
||||
@if (contracts is null)
|
||||
{
|
||||
<MudProgressCircular Indeterminate="true" Class="mt-4" />
|
||||
<MudProgressLinear Indeterminate="true" />
|
||||
}
|
||||
else if (contracts.Count == 0)
|
||||
{
|
||||
<MudAlert Severity="Severity.Info" Class="mt-4">계약이 없습니다.</MudAlert>
|
||||
<MudAlert Severity="Severity.Info" Class="mt-4">
|
||||
<MudIcon Icon="@Icons.Material.Filled.Description" Class="me-2" />
|
||||
계약이 없습니다.
|
||||
</MudAlert>
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -41,7 +47,7 @@
|
||||
Striped="true"
|
||||
Virtualize="true"
|
||||
RowsPerPage="30"
|
||||
Class="admin-grid mt-4">
|
||||
Class="admin-grid">
|
||||
<Columns>
|
||||
<PropertyColumn Property="x => x.Id" Title="ID" Sortable="true" />
|
||||
<TemplateColumn Title="고객">
|
||||
@@ -92,7 +98,7 @@
|
||||
</Columns>
|
||||
</MudDataGrid>
|
||||
}
|
||||
</div>
|
||||
</MudPaper>
|
||||
|
||||
<!-- Create Dialog -->
|
||||
<MudDialog @bind-IsVisible="isDialogOpen" Options="new DialogOptions { MaxWidth = MaxWidth.Small, FullWidth = true }">
|
||||
@@ -181,9 +187,11 @@
|
||||
|
||||
private async Task DeleteContract(int id)
|
||||
{
|
||||
var parameters = new DialogParameters();
|
||||
parameters.Add("Title", "삭제 확인");
|
||||
parameters.Add("Message", "이 계약을 삭제하시겠습니까?");
|
||||
var parameters = new DialogParameters
|
||||
{
|
||||
{ "Title", "삭제 확인" },
|
||||
{ "Message", "이 계약을 삭제하시겠습니까?" }
|
||||
};
|
||||
|
||||
var dialog = await DialogService.ShowAsync<ConfirmDialog>("", parameters);
|
||||
var result = await dialog.Result;
|
||||
@@ -218,20 +226,3 @@
|
||||
public decimal? MonthlyFee { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
<style>
|
||||
.admin-container {
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
.admin-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.admin-grid {
|
||||
font-size: 13px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -8,21 +8,28 @@
|
||||
|
||||
<PageTitle>수익 추적 관리</PageTitle>
|
||||
|
||||
<div class="admin-container">
|
||||
<div class="admin-header">
|
||||
<MudText Typo="Typo.h5" Class="font-weight-bold">수익 추적 관리</MudText>
|
||||
<MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="OpenCreateDialog" StartIcon="@Icons.Material.Filled.Add">
|
||||
새 청구 추가
|
||||
</MudButton>
|
||||
<section class="admin-page-hero">
|
||||
<div>
|
||||
<MudText Typo="Typo.caption" Class="admin-eyebrow">CRM & 세무관리</MudText>
|
||||
<MudText Typo="Typo.h4" Class="admin-page-title">수익 추적 관리</MudText>
|
||||
<MudText Typo="Typo.body2" Class="admin-page-subtitle">청구, 납부, 미수금 상태를 한 화면에서 관리합니다.</MudText>
|
||||
</div>
|
||||
<MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="OpenCreateDialog" StartIcon="@Icons.Material.Filled.Add">
|
||||
새 청구 추가
|
||||
</MudButton>
|
||||
</section>
|
||||
|
||||
@if (revenues == null)
|
||||
<MudPaper Class="admin-surface" Elevation="0">
|
||||
@if (revenues is null)
|
||||
{
|
||||
<MudProgressCircular Indeterminate="true" Class="mt-4" />
|
||||
<MudProgressLinear Indeterminate="true" />
|
||||
}
|
||||
else if (revenues.Count == 0)
|
||||
{
|
||||
<MudAlert Severity="Severity.Info" Class="mt-4">청구 기록이 없습니다.</MudAlert>
|
||||
<MudAlert Severity="Severity.Info" Class="mt-4">
|
||||
<MudIcon Icon="@Icons.Material.Filled.Payments" Class="me-2" />
|
||||
청구 기록이 없습니다.
|
||||
</MudAlert>
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -33,7 +40,7 @@
|
||||
Striped="true"
|
||||
Virtualize="true"
|
||||
RowsPerPage="30"
|
||||
Class="admin-grid mt-4">
|
||||
Class="admin-grid">
|
||||
<Columns>
|
||||
<PropertyColumn Property="x => x.Id" Title="ID" Sortable="true" />
|
||||
<TemplateColumn Title="고객">
|
||||
@@ -77,7 +84,7 @@
|
||||
</Columns>
|
||||
</MudDataGrid>
|
||||
}
|
||||
</div>
|
||||
</MudPaper>
|
||||
|
||||
<!-- Create Dialog -->
|
||||
<MudDialog @bind-IsVisible="isDialogOpen" Options="new DialogOptions { MaxWidth = MaxWidth.Small, FullWidth = true }">
|
||||
@@ -180,9 +187,11 @@
|
||||
|
||||
private async Task DeleteRevenue(int id)
|
||||
{
|
||||
var parameters = new DialogParameters();
|
||||
parameters.Add("Title", "삭제 확인");
|
||||
parameters.Add("Message", "이 청구를 삭제하시겠습니까?");
|
||||
var parameters = new DialogParameters
|
||||
{
|
||||
{ "Title", "삭제 확인" },
|
||||
{ "Message", "이 청구를 삭제하시겠습니까?" }
|
||||
};
|
||||
|
||||
var dialog = await DialogService.ShowAsync<ConfirmDialog>("", parameters);
|
||||
var result = await dialog.Result;
|
||||
@@ -218,20 +227,3 @@
|
||||
public DateTime? DueDate { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
<style>
|
||||
.admin-container {
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
.admin-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.admin-grid {
|
||||
font-size: 13px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -6,34 +6,44 @@
|
||||
@inject IDialogService DialogService
|
||||
@attribute [Authorize]
|
||||
|
||||
<PageTitle>신고 일정 관리</PageTitle>
|
||||
<PageTitle>신고 일정</PageTitle>
|
||||
|
||||
<div class="admin-container">
|
||||
<div class="admin-header">
|
||||
<MudText Typo="Typo.h5" Class="font-weight-bold">신고 일정 관리</MudText>
|
||||
<MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="OpenCreateDialog" StartIcon="@Icons.Material.Filled.Add">
|
||||
새 일정 추가
|
||||
</MudButton>
|
||||
<section class="admin-page-hero">
|
||||
<div>
|
||||
<MudText Typo="Typo.caption" Class="admin-eyebrow">CRM & 세무관리</MudText>
|
||||
<MudText Typo="Typo.h4" Class="admin-page-title">신고 일정</MudText>
|
||||
<MudText Typo="Typo.body2" Class="admin-page-subtitle">고객별 마감일과 처리 상태를 한 화면에서 관리합니다.</MudText>
|
||||
</div>
|
||||
<MudButton Variant="Variant.Filled"
|
||||
Color="Color.Primary"
|
||||
OnClick="OpenCreateDialog"
|
||||
StartIcon="@Icons.Material.Filled.Add">
|
||||
새 일정 추가
|
||||
</MudButton>
|
||||
</section>
|
||||
|
||||
@if (schedules == null)
|
||||
<MudPaper Class="admin-surface" Elevation="0">
|
||||
@if (schedules is null)
|
||||
{
|
||||
<MudProgressCircular Indeterminate="true" Class="mt-4" />
|
||||
<MudProgressLinear Indeterminate="true" />
|
||||
}
|
||||
else if (schedules.Count == 0)
|
||||
{
|
||||
<MudAlert Severity="Severity.Info" Class="mt-4">신고 일정이 없습니다.</MudAlert>
|
||||
<MudAlert Severity="Severity.Info" Class="mt-4">
|
||||
<MudIcon Icon="@Icons.Material.Filled.EventBusy" Class="me-2" />
|
||||
신고 일정이 없습니다.
|
||||
</MudAlert>
|
||||
}
|
||||
else
|
||||
{
|
||||
<MudDataGrid T="TaxFilingSchedule"
|
||||
Items="@schedules"
|
||||
Dense="true"
|
||||
Hover="true"
|
||||
Striped="true"
|
||||
Virtualize="true"
|
||||
RowsPerPage="30"
|
||||
Class="admin-grid mt-4">
|
||||
Items="@schedules"
|
||||
Dense="true"
|
||||
Hover="true"
|
||||
Striped="true"
|
||||
Virtualize="true"
|
||||
RowsPerPage="30"
|
||||
Class="admin-grid">
|
||||
<Columns>
|
||||
<PropertyColumn Property="x => x.Id" Title="ID" Sortable="true" />
|
||||
<TemplateColumn Title="고객">
|
||||
@@ -55,8 +65,14 @@
|
||||
}
|
||||
<MudChip Size="Size.Small" Color="@statusColor" Variant="Variant.Filled">
|
||||
@context.Item.DueDate.ToString("yyyy-MM-dd")
|
||||
@if (daysLeft >= 0) { <span>(D-@daysLeft)</span> }
|
||||
else { <span>(마감@(Math.Abs(daysLeft))일경과)</span> }
|
||||
@if (daysLeft >= 0)
|
||||
{
|
||||
<span class="ms-1">(D-@daysLeft)</span>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span class="ms-1">(마감 @Math.Abs(daysLeft)일 경과)</span>
|
||||
}
|
||||
</MudChip>
|
||||
</CellTemplate>
|
||||
</TemplateColumn>
|
||||
@@ -78,27 +94,36 @@
|
||||
<MudButtonGroup Size="Size.Small" Variant="Variant.Outlined">
|
||||
@if (context.Item.Status != "completed")
|
||||
{
|
||||
<MudIconButton Icon="@Icons.Material.Filled.CheckCircle" Color="Color.Success"
|
||||
OnClick="@(async () => await CompleteSchedule(context.Item.Id))" Title="완료" />
|
||||
<MudIconButton Icon="@Icons.Material.Filled.CheckCircle"
|
||||
Color="Color.Success"
|
||||
OnClick="@(async () => await CompleteSchedule(context.Item.Id))"
|
||||
Title="완료" />
|
||||
}
|
||||
<MudIconButton Icon="@Icons.Material.Filled.Delete" Color="Color.Error"
|
||||
OnClick="@(async () => await DeleteSchedule(context.Item.Id))" />
|
||||
<MudIconButton Icon="@Icons.Material.Filled.Delete"
|
||||
Color="Color.Error"
|
||||
OnClick="@(async () => await DeleteSchedule(context.Item.Id))"
|
||||
Title="삭제" />
|
||||
</MudButtonGroup>
|
||||
</CellTemplate>
|
||||
</TemplateColumn>
|
||||
</Columns>
|
||||
</MudDataGrid>
|
||||
}
|
||||
</div>
|
||||
</MudPaper>
|
||||
|
||||
<!-- Create/Edit Dialog -->
|
||||
<MudDialog @bind-IsVisible="isDialogOpen" Options="new DialogOptions { MaxWidth = MaxWidth.Small, FullWidth = true }">
|
||||
<TitleContent>
|
||||
<MudText Typo="Typo.h6">@(editingSchedule == null ? "새 신고 일정 추가" : "신고 일정 수정")</MudText>
|
||||
<MudText Typo="Typo.h6">새 신고 일정 추가</MudText>
|
||||
</TitleContent>
|
||||
<DialogContent>
|
||||
<MudForm @ref="form">
|
||||
<MudSelect T="int" @bind-Value="scheduleForm.ClientId" Label="고객" Required="true" Variant="Variant.Outlined" FullWidth="true" Class="mb-4">
|
||||
<MudSelect T="int"
|
||||
@bind-Value="scheduleForm.ClientId"
|
||||
Label="고객"
|
||||
Required="true"
|
||||
Variant="Variant.Outlined"
|
||||
FullWidth="true"
|
||||
Class="mb-4">
|
||||
@foreach (var client in clients)
|
||||
{
|
||||
<MudSelectItem Value="@client.Id">@client.CompanyName</MudSelectItem>
|
||||
@@ -121,13 +146,9 @@
|
||||
private Dictionary<int, string> clientMap = new();
|
||||
private MudForm? form;
|
||||
private bool isDialogOpen;
|
||||
private TaxFilingSchedule? editingSchedule;
|
||||
private TaxFilingScheduleForm scheduleForm = new();
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
await LoadData();
|
||||
}
|
||||
protected override async Task OnInitializedAsync() => await LoadData();
|
||||
|
||||
private async Task LoadData()
|
||||
{
|
||||
@@ -146,8 +167,7 @@
|
||||
|
||||
private void OpenCreateDialog()
|
||||
{
|
||||
editingSchedule = null;
|
||||
scheduleForm = new();
|
||||
scheduleForm = new TaxFilingScheduleForm { FilingYear = DateTime.Now.Year };
|
||||
isDialogOpen = true;
|
||||
}
|
||||
|
||||
@@ -155,20 +175,21 @@
|
||||
{
|
||||
try
|
||||
{
|
||||
if (editingSchedule == null)
|
||||
{
|
||||
var newId = await TaxFilingClient.CreateAsync(
|
||||
scheduleForm.ClientId,
|
||||
scheduleForm.FilingType,
|
||||
scheduleForm.DueDate ?? DateTime.Now,
|
||||
scheduleForm.FilingYear);
|
||||
var newId = await TaxFilingClient.CreateAsync(
|
||||
scheduleForm.ClientId,
|
||||
scheduleForm.FilingType,
|
||||
scheduleForm.DueDate ?? DateTime.Today,
|
||||
scheduleForm.FilingYear);
|
||||
|
||||
if (newId > 0)
|
||||
{
|
||||
Snackbar.Add("신고 일정이 추가되었습니다.", Severity.Success);
|
||||
CloseDialog();
|
||||
await LoadData();
|
||||
}
|
||||
if (newId > 0)
|
||||
{
|
||||
Snackbar.Add("신고 일정이 추가되었습니다.", Severity.Success);
|
||||
CloseDialog();
|
||||
await LoadData();
|
||||
}
|
||||
else
|
||||
{
|
||||
Snackbar.Add("등록에 실패했습니다.", Severity.Error);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -193,13 +214,14 @@
|
||||
|
||||
private async Task DeleteSchedule(int id)
|
||||
{
|
||||
var parameters = new DialogParameters();
|
||||
parameters.Add("Title", "삭제 확인");
|
||||
parameters.Add("Message", "이 신고 일정을 삭제하시겠습니까?");
|
||||
var parameters = new DialogParameters
|
||||
{
|
||||
{ "Title", "삭제 확인" },
|
||||
{ "Message", "이 신고 일정을 삭제하시겠습니까?" }
|
||||
};
|
||||
|
||||
var dialog = await DialogService.ShowAsync<ConfirmDialog>("", parameters);
|
||||
var result = await dialog.Result;
|
||||
|
||||
if (result?.Canceled ?? true)
|
||||
return;
|
||||
|
||||
@@ -218,7 +240,6 @@
|
||||
private void CloseDialog()
|
||||
{
|
||||
isDialogOpen = false;
|
||||
editingSchedule = null;
|
||||
scheduleForm = new();
|
||||
}
|
||||
|
||||
@@ -230,20 +251,3 @@
|
||||
public int FilingYear { get; set; } = DateTime.Now.Year;
|
||||
}
|
||||
}
|
||||
|
||||
<style>
|
||||
.admin-container {
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
.admin-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.admin-grid {
|
||||
font-size: 13px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -6,79 +6,81 @@
|
||||
@inject IDialogService DialogService
|
||||
@attribute [Authorize]
|
||||
|
||||
<PageTitle>세무 프로필 관리</PageTitle>
|
||||
<PageTitle>세무 프로필</PageTitle>
|
||||
|
||||
<div class="admin-container">
|
||||
<div class="admin-header">
|
||||
<MudText Typo="Typo.h5" Class="font-weight-bold">세무 프로필 관리</MudText>
|
||||
<MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="OpenCreateDialog" StartIcon="@Icons.Material.Filled.Add">
|
||||
새 프로필 추가
|
||||
</MudButton>
|
||||
<section class="admin-page-hero">
|
||||
<div>
|
||||
<MudText Typo="Typo.caption" Class="admin-eyebrow">CRM & 세무관리</MudText>
|
||||
<MudText Typo="Typo.h4" Class="admin-page-title">세무 프로필</MudText>
|
||||
<MudText Typo="Typo.body2" Class="admin-page-subtitle">고객별 세무 프로필, 신고 일정, 위험도 추적</MudText>
|
||||
</div>
|
||||
<MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="OpenCreateDialog" StartIcon="@Icons.Material.Filled.Add">
|
||||
새 프로필 추가
|
||||
</MudButton>
|
||||
</section>
|
||||
|
||||
@if (profiles == null)
|
||||
{
|
||||
<MudProgressCircular Indeterminate="true" Class="mt-4" />
|
||||
}
|
||||
else if (profiles.Count == 0)
|
||||
{
|
||||
<MudAlert Severity="Severity.Info" Class="mt-4">세무 프로필이 없습니다.</MudAlert>
|
||||
}
|
||||
else
|
||||
{
|
||||
<MudDataGrid T="TaxProfile"
|
||||
Items="@profiles"
|
||||
Dense="true"
|
||||
Hover="true"
|
||||
Striped="true"
|
||||
Virtualize="true"
|
||||
RowsPerPage="30"
|
||||
Class="admin-grid mt-4">
|
||||
<Columns>
|
||||
<PropertyColumn Property="x => x.Id" Title="ID" Sortable="true" />
|
||||
<TemplateColumn Title="고객">
|
||||
<CellTemplate>
|
||||
@if (clientMap.TryGetValue(context.Item.ClientId, out var clientName))
|
||||
{
|
||||
<MudLink Href="@($"/taxbaik/admin/clients/{context.Item.ClientId}")" Color="Color.Primary">
|
||||
@clientName
|
||||
</MudLink>
|
||||
}
|
||||
</CellTemplate>
|
||||
</TemplateColumn>
|
||||
<PropertyColumn Property="x => x.BusinessType" Title="사업 유형" />
|
||||
<TemplateColumn Title="위험도">
|
||||
<CellTemplate>
|
||||
<MudChip Size="Size.Small" Color="@GetRiskColor(context.Item.TaxRiskLevel)" Variant="Variant.Filled">
|
||||
@context.Item.TaxRiskLevel
|
||||
</MudChip>
|
||||
</CellTemplate>
|
||||
</TemplateColumn>
|
||||
<TemplateColumn Title="다음 신고">
|
||||
<CellTemplate>
|
||||
@if (context.Item.NextFilingDueDate.HasValue)
|
||||
{
|
||||
@context.Item.NextFilingDueDate.Value.ToString("yyyy-MM-dd")
|
||||
}
|
||||
</CellTemplate>
|
||||
</TemplateColumn>
|
||||
<TemplateColumn Title="작업" Sortable="false">
|
||||
<CellTemplate>
|
||||
<MudButtonGroup Size="Size.Small" Variant="Variant.Outlined">
|
||||
<MudIconButton Icon="@Icons.Material.Filled.Edit" OnClick="@(async () => await OpenEditDialog(context.Item))" />
|
||||
<MudIconButton Icon="@Icons.Material.Filled.Delete" Color="Color.Error" OnClick="@(async () => await DeleteProfile(context.Item.Id))" />
|
||||
</MudButtonGroup>
|
||||
</CellTemplate>
|
||||
</TemplateColumn>
|
||||
</Columns>
|
||||
</MudDataGrid>
|
||||
}
|
||||
</div>
|
||||
@if (profiles == null)
|
||||
{
|
||||
<MudProgressCircular Indeterminate="true" Class="mt-4" />
|
||||
}
|
||||
else if (profiles.Count == 0)
|
||||
{
|
||||
<MudAlert Severity="Severity.Info" Class="mt-4">세무 프로필이 없습니다.</MudAlert>
|
||||
}
|
||||
else
|
||||
{
|
||||
<MudDataGrid T="TaxProfile"
|
||||
Items="@profiles"
|
||||
Dense="true"
|
||||
Hover="true"
|
||||
Striped="true"
|
||||
Virtualize="true"
|
||||
RowsPerPage="30"
|
||||
Class="admin-grid mt-4">
|
||||
<Columns>
|
||||
<PropertyColumn Property="x => x.Id" Title="ID" Sortable="true" />
|
||||
<TemplateColumn Title="고객">
|
||||
<CellTemplate>
|
||||
@if (clientMap.TryGetValue(context.Item.ClientId, out var clientName))
|
||||
{
|
||||
<MudLink Href="@($"/taxbaik/admin/clients/{context.Item.ClientId}")" Color="Color.Primary">
|
||||
@clientName
|
||||
</MudLink>
|
||||
}
|
||||
</CellTemplate>
|
||||
</TemplateColumn>
|
||||
<PropertyColumn Property="x => x.BusinessType" Title="사업 유형" />
|
||||
<TemplateColumn Title="위험도">
|
||||
<CellTemplate>
|
||||
<MudChip Size="Size.Small" Color="@GetRiskColor(context.Item.TaxRiskLevel)" Variant="Variant.Filled">
|
||||
@context.Item.TaxRiskLevel
|
||||
</MudChip>
|
||||
</CellTemplate>
|
||||
</TemplateColumn>
|
||||
<TemplateColumn Title="다음 신고">
|
||||
<CellTemplate>
|
||||
@if (context.Item.NextFilingDueDate.HasValue)
|
||||
{
|
||||
@context.Item.NextFilingDueDate.Value.ToString("yyyy-MM-dd")
|
||||
}
|
||||
</CellTemplate>
|
||||
</TemplateColumn>
|
||||
<TemplateColumn Title="작업" Sortable="false">
|
||||
<CellTemplate>
|
||||
<MudButtonGroup Size="Size.Small" Variant="Variant.Outlined">
|
||||
<MudIconButton Icon="@Icons.Material.Filled.Edit" OnClick="@(async () => await OpenEditDialog(context.Item))" />
|
||||
<MudIconButton Icon="@Icons.Material.Filled.Delete" Color="Color.Error" OnClick="@(async () => await DeleteProfile(context.Item.Id))" />
|
||||
</MudButtonGroup>
|
||||
</CellTemplate>
|
||||
</TemplateColumn>
|
||||
</Columns>
|
||||
</MudDataGrid>
|
||||
}
|
||||
|
||||
<!-- Create/Edit Dialog -->
|
||||
<MudDialog @bind-IsVisible="isDialogOpen" Options="new DialogOptions { MaxWidth = MaxWidth.Small, FullWidth = true }">
|
||||
<TitleContent>
|
||||
<MudText Typo="Typo.h6">@(editingProfile == null ? "새 프로필 추가" : "프로필 수정")</MudText>
|
||||
<MudText Typo="Typo.h6">@(isEditMode ? "세무 프로필 수정" : "새 세무 프로필 추가")</MudText>
|
||||
</TitleContent>
|
||||
<DialogContent>
|
||||
<MudForm @ref="form">
|
||||
@@ -110,6 +112,7 @@
|
||||
private Dictionary<int, string> clientMap = new();
|
||||
private MudForm? form;
|
||||
private bool isDialogOpen;
|
||||
private bool isEditMode;
|
||||
private TaxProfile? editingProfile;
|
||||
private TaxProfileForm profileForm = new();
|
||||
|
||||
@@ -135,6 +138,7 @@
|
||||
|
||||
private void OpenCreateDialog()
|
||||
{
|
||||
isEditMode = false;
|
||||
editingProfile = null;
|
||||
profileForm = new();
|
||||
isDialogOpen = true;
|
||||
@@ -142,6 +146,7 @@
|
||||
|
||||
private async Task OpenEditDialog(TaxProfile profile)
|
||||
{
|
||||
isEditMode = true;
|
||||
editingProfile = profile;
|
||||
profileForm = new TaxProfileForm
|
||||
{
|
||||
@@ -158,32 +163,28 @@
|
||||
{
|
||||
try
|
||||
{
|
||||
if (editingProfile == null)
|
||||
{
|
||||
var newId = await TaxProfileClient.CreateAsync(
|
||||
profileForm.ClientId,
|
||||
profileForm.BusinessType);
|
||||
|
||||
if (newId > 0)
|
||||
{
|
||||
Snackbar.Add("프로필이 생성되었습니다.", Severity.Success);
|
||||
CloseDialog();
|
||||
await LoadData();
|
||||
}
|
||||
}
|
||||
else
|
||||
if (isEditMode)
|
||||
{
|
||||
await TaxProfileClient.UpdateAsync(
|
||||
editingProfile.Id,
|
||||
editingProfile!.Id,
|
||||
profileForm.BusinessType,
|
||||
null,
|
||||
profileForm.NextFilingDueDate,
|
||||
profileForm.TaxRiskLevel);
|
||||
|
||||
Snackbar.Add("프로필이 업데이트되었습니다.", Severity.Success);
|
||||
CloseDialog();
|
||||
await LoadData();
|
||||
Snackbar.Add("세무 프로필이 업데이트되었습니다.", Severity.Success);
|
||||
}
|
||||
else
|
||||
{
|
||||
var newId = await TaxProfileClient.CreateAsync(
|
||||
profileForm.ClientId,
|
||||
profileForm.BusinessType);
|
||||
if (newId > 0)
|
||||
{
|
||||
Snackbar.Add("세무 프로필이 추가되었습니다.", Severity.Success);
|
||||
}
|
||||
}
|
||||
CloseDialog();
|
||||
await LoadData();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -195,7 +196,7 @@
|
||||
{
|
||||
var parameters = new DialogParameters();
|
||||
parameters.Add("Title", "삭제 확인");
|
||||
parameters.Add("Message", "이 프로필을 삭제하시겠습니까?");
|
||||
parameters.Add("Message", "이 세무 프로필을 삭제하시겠습니까?");
|
||||
|
||||
var dialog = await DialogService.ShowAsync<ConfirmDialog>("", parameters);
|
||||
var result = await dialog.Result;
|
||||
@@ -206,7 +207,7 @@
|
||||
try
|
||||
{
|
||||
await TaxProfileClient.DeleteAsync(id);
|
||||
Snackbar.Add("프로필이 삭제되었습니다.", Severity.Success);
|
||||
Snackbar.Add("세무 프로필이 삭제되었습니다.", Severity.Success);
|
||||
await LoadData();
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -218,11 +219,12 @@
|
||||
private void CloseDialog()
|
||||
{
|
||||
isDialogOpen = false;
|
||||
isEditMode = false;
|
||||
editingProfile = null;
|
||||
profileForm = new();
|
||||
}
|
||||
|
||||
private Color GetRiskColor(string level) => level switch
|
||||
private Color GetRiskColor(string riskLevel) => riskLevel switch
|
||||
{
|
||||
"high" => Color.Error,
|
||||
"normal" => Color.Warning,
|
||||
@@ -239,20 +241,3 @@
|
||||
public string? SpecialNotes { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
<style>
|
||||
.admin-container {
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
.admin-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.admin-grid {
|
||||
font-size: 13px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -27,6 +27,7 @@ public class AuthController : ControllerBase
|
||||
|
||||
return Ok(new
|
||||
{
|
||||
token = tokenPair.AccessToken,
|
||||
accessToken = tokenPair.AccessToken,
|
||||
refreshToken = tokenPair.RefreshToken,
|
||||
expiresIn = tokenPair.ExpiresIn
|
||||
@@ -45,6 +46,7 @@ public class AuthController : ControllerBase
|
||||
|
||||
return Ok(new
|
||||
{
|
||||
token = tokenPair.AccessToken,
|
||||
accessToken = tokenPair.AccessToken,
|
||||
refreshToken = tokenPair.RefreshToken,
|
||||
expiresIn = tokenPair.ExpiresIn
|
||||
|
||||
@@ -32,7 +32,8 @@ public class InquiryController : ControllerBase
|
||||
request.ServiceType,
|
||||
request.Message,
|
||||
request.Email,
|
||||
HttpContext.Connection.RemoteIpAddress?.ToString());
|
||||
HttpContext.Connection.RemoteIpAddress?.ToString(),
|
||||
request.SuppressNotification);
|
||||
return Ok(new { message = "상담 신청이 접수되었습니다." });
|
||||
}
|
||||
catch (ValidationException ex)
|
||||
@@ -135,6 +136,7 @@ public class SubmitInquiryRequest
|
||||
public string? Email { get; set; }
|
||||
public string ServiceType { get; set; } = string.Empty;
|
||||
public string Message { get; set; } = string.Empty;
|
||||
public bool SuppressNotification { get; set; }
|
||||
}
|
||||
|
||||
public class UpdateStatusRequest
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
using System;
|
||||
using System.Net.Http;
|
||||
using System.Net.Http.Json;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Serilog.Core;
|
||||
using Serilog.Events;
|
||||
|
||||
namespace TaxBaik.Web.Logging;
|
||||
|
||||
public class TelegramSink : ILogEventSink
|
||||
{
|
||||
private readonly string _botToken;
|
||||
private readonly string _chatId;
|
||||
private readonly HttpClient _httpClient;
|
||||
|
||||
public TelegramSink(string botToken, string chatId)
|
||||
{
|
||||
_botToken = botToken;
|
||||
_chatId = chatId;
|
||||
_httpClient = new HttpClient();
|
||||
}
|
||||
|
||||
public void Emit(LogEvent logEvent)
|
||||
{
|
||||
if (logEvent.Level < LogEventLevel.Error)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Emit is a synchronous method, so we dispatch the network call asynchronously
|
||||
Task.Run(async () =>
|
||||
{
|
||||
try
|
||||
{
|
||||
var timestamp = logEvent.Timestamp.ToString("yyyy-MM-dd HH:mm:ss.fff zzz");
|
||||
var level = logEvent.Level.ToString().ToUpper();
|
||||
var message = logEvent.RenderMessage();
|
||||
var exceptionDetails = logEvent.Exception?.ToString();
|
||||
|
||||
var sb = new StringBuilder();
|
||||
sb.AppendLine($"<b>🚨 [{level}] 에러 발생</b>");
|
||||
sb.AppendLine($"<b>시간:</b> {timestamp}");
|
||||
sb.AppendLine($"<b>메시지:</b> {EscapeHtml(message)}");
|
||||
|
||||
if (!string.IsNullOrEmpty(exceptionDetails))
|
||||
{
|
||||
var escapedException = EscapeHtml(exceptionDetails);
|
||||
if (escapedException.Length > 3000)
|
||||
{
|
||||
escapedException = escapedException.Substring(0, 3000) + "\n[이하 생략]";
|
||||
}
|
||||
sb.AppendLine($"<b>Exception 상세:</b>\n<pre>{escapedException}</pre>");
|
||||
}
|
||||
|
||||
var url = $"https://api.telegram.org/bot{_botToken}/sendMessage";
|
||||
var payload = new
|
||||
{
|
||||
chat_id = _chatId,
|
||||
text = sb.ToString(),
|
||||
parse_mode = "HTML"
|
||||
};
|
||||
|
||||
var response = await _httpClient.PostAsJsonAsync(url, payload);
|
||||
if (!response.IsSuccessStatusCode)
|
||||
{
|
||||
var errorResponse = await response.Content.ReadAsStringAsync();
|
||||
Console.WriteLine($"[TelegramSink] Failed to send log to Telegram: {response.StatusCode} - {errorResponse}");
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine($"[TelegramSink] Error in TelegramSink: {ex.Message}");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private static string EscapeHtml(string text)
|
||||
{
|
||||
if (string.IsNullOrEmpty(text)) return text;
|
||||
return text.Replace("&", "&")
|
||||
.Replace("<", "<")
|
||||
.Replace(">", ">");
|
||||
}
|
||||
}
|
||||
@@ -5,7 +5,13 @@
|
||||
}
|
||||
|
||||
<div class="container py-5" style="max-width: 600px;">
|
||||
<h1 class="fw-bold mb-5">상담 신청</h1>
|
||||
<div class="d-flex align-items-center justify-content-between gap-3 mb-4">
|
||||
<h1 class="fw-bold mb-0">상담 신청</h1>
|
||||
<a href="/taxbaik" class="btn btn-outline-secondary btn-sm"
|
||||
onclick="if (history.length > 1) { history.back(); return false; }">
|
||||
뒤로가기
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@if (TempData["Success"] != null)
|
||||
{
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
@page "/portal/external-callback"
|
||||
@model TaxBaik.Web.Pages.Portal.ExternalCallbackModel
|
||||
@{
|
||||
ViewData["Title"] = "포털 인증 처리";
|
||||
}
|
||||
|
||||
<section class="container py-5">
|
||||
<div class="alert alert-info">인증을 처리하는 중입니다...</div>
|
||||
</section>
|
||||
@@ -0,0 +1,97 @@
|
||||
using System.Security.Claims;
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||
using TaxBaik.Application.Services;
|
||||
using TaxBaik.Web.Services;
|
||||
|
||||
namespace TaxBaik.Web.Pages.Portal;
|
||||
|
||||
public class ExternalCallbackModel : PageModel
|
||||
{
|
||||
private readonly PortalUserService _portalUserService;
|
||||
private readonly ClientService _clientService;
|
||||
|
||||
public ExternalCallbackModel(PortalUserService portalUserService, ClientService clientService)
|
||||
{
|
||||
_portalUserService = portalUserService;
|
||||
_clientService = clientService;
|
||||
}
|
||||
|
||||
public async Task<IActionResult> OnGetAsync(string provider)
|
||||
{
|
||||
var external = await HttpContext.AuthenticateAsync(PortalOAuthDefaults.ExternalScheme);
|
||||
if (external?.Principal is null)
|
||||
return RedirectToPage("/Portal/Login");
|
||||
|
||||
var email = external.Principal.FindFirstValue(ClaimTypes.Email);
|
||||
var name = external.Principal.FindFirstValue(ClaimTypes.Name) ?? "고객";
|
||||
var providerId = external.Principal.FindFirstValue(ClaimTypes.NameIdentifier) ?? "";
|
||||
|
||||
if (string.IsNullOrWhiteSpace(providerId))
|
||||
return RedirectToPage("/Portal/Login");
|
||||
|
||||
var existing = await _portalUserService.GetByProviderAsync(provider, providerId);
|
||||
if (existing is null && !string.IsNullOrWhiteSpace(email))
|
||||
{
|
||||
existing = await _portalUserService.GetByEmailAsync(email);
|
||||
if (existing is null)
|
||||
{
|
||||
int? clientId = null;
|
||||
var linkedClient = await _clientService.GetByEmailAsync(email);
|
||||
if (linkedClient is null && !string.IsNullOrWhiteSpace(external.Principal.FindFirstValue("phone")))
|
||||
linkedClient = await _clientService.GetByPhoneAsync(external.Principal.FindFirstValue("phone")!);
|
||||
if (linkedClient is not null)
|
||||
clientId = linkedClient.Id;
|
||||
|
||||
await _portalUserService.RegisterOAuthAsync(
|
||||
name,
|
||||
email,
|
||||
external.Principal.FindFirstValue("phone") ?? "",
|
||||
provider,
|
||||
providerId,
|
||||
clientId);
|
||||
existing = await _portalUserService.GetByEmailAsync(email);
|
||||
}
|
||||
else if (!string.Equals(existing.Provider, provider, StringComparison.OrdinalIgnoreCase) ||
|
||||
!string.Equals(existing.ProviderId, providerId, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
await _portalUserService.LinkOAuthAsync(existing, provider, providerId, name, email);
|
||||
}
|
||||
}
|
||||
|
||||
if (existing is not null && !existing.ClientId.HasValue && !string.IsNullOrWhiteSpace(email))
|
||||
{
|
||||
var linkedClient = await _clientService.GetByEmailAsync(email);
|
||||
if (linkedClient is null && !string.IsNullOrWhiteSpace(external.Principal.FindFirstValue("phone")))
|
||||
linkedClient = await _clientService.GetByPhoneAsync(external.Principal.FindFirstValue("phone")!);
|
||||
if (linkedClient is not null)
|
||||
{
|
||||
await _portalUserService.AttachClientAsync(existing, linkedClient.Id);
|
||||
existing.ClientId = linkedClient.Id;
|
||||
}
|
||||
}
|
||||
|
||||
if (existing is null)
|
||||
return RedirectToPage("/Portal/Login");
|
||||
|
||||
var claims = new List<Claim>
|
||||
{
|
||||
new(ClaimTypes.NameIdentifier, existing.Id.ToString()),
|
||||
new(ClaimTypes.Name, existing.Name),
|
||||
new(ClaimTypes.Email, existing.Email),
|
||||
new("portal_user_id", existing.Id.ToString())
|
||||
};
|
||||
|
||||
if (existing.ClientId.HasValue)
|
||||
claims.Add(new("client_id", existing.ClientId.Value.ToString()));
|
||||
|
||||
await HttpContext.SignInAsync(
|
||||
PortalAuthDefaults.Scheme,
|
||||
new ClaimsPrincipal(new ClaimsIdentity(claims, PortalAuthDefaults.Scheme)),
|
||||
new AuthenticationProperties { IsPersistent = true });
|
||||
|
||||
await HttpContext.SignOutAsync(PortalOAuthDefaults.ExternalScheme);
|
||||
return RedirectToPage("/Portal/Index");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,171 @@
|
||||
@page "/portal"
|
||||
@model TaxBaik.Web.Pages.Portal.IndexModel
|
||||
@{
|
||||
ViewData["Title"] = "마이 포털 - 세무사 백원숙";
|
||||
ViewData["Description"] = "고객님의 세무 신고 일정과 상담 이력을 실시간으로 확인하실 수 있는 마이페이지입니다.";
|
||||
}
|
||||
|
||||
<div class="bg-light py-5">
|
||||
<div class="container">
|
||||
<!-- 상단 헤더 & 환영 문구 -->
|
||||
<div class="d-flex flex-wrap justify-content-between align-items-center mb-5 pb-4 border-bottom">
|
||||
<div>
|
||||
<p class="text-primary fw-bold mb-1">TaxBaik My Portal</p>
|
||||
<h1 class="display-6 fw-bold text-dark">안녕하세요, @(User.Identity?.Name)님!</h1>
|
||||
@if (Model.ClientInfo != null)
|
||||
{
|
||||
<p class="text-muted mb-0">
|
||||
<i class="bi bi-building"></i> @(string.IsNullOrEmpty(Model.ClientInfo.CompanyName) ? "개인 고객" : Model.ClientInfo.CompanyName)
|
||||
| <i class="bi bi-telephone"></i> @Model.ClientInfo.Phone
|
||||
</p>
|
||||
}
|
||||
</div>
|
||||
<div class="mt-3 mt-sm-0">
|
||||
<form method="post" action="/taxbaik/portal/logout" class="d-inline">
|
||||
@Html.AntiForgeryToken()
|
||||
<button type="submit" class="btn btn-outline-danger btn-sm">
|
||||
<i class="bi bi-box-arrow-right"></i> 로그아웃
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if (Model.ClientInfo == null)
|
||||
{
|
||||
<!-- 연동 대기 경고 -->
|
||||
<div class="card border-warning shadow-sm mb-5">
|
||||
<div class="card-body p-5 text-center">
|
||||
<div class="mb-4">
|
||||
<span class="display-1 text-warning"><i class="bi bi-exclamation-triangle-fill"></i></span>
|
||||
</div>
|
||||
<h3 class="fw-bold text-dark mb-3">고객 정보 연동 대기 중</h3>
|
||||
<p class="text-muted max-width-md mx-auto mb-4">
|
||||
가입하신 계정 정보(이메일/연락처)와 일치하는 세무 대리 고객 레코드를 찾지 못했습니다.<br />
|
||||
세무사 측에서 고객 등록을 완료하거나 관리자 백오피스에서 이메일/전화번호가 일치하도록 지정하면 자동으로 포털 데이터가 활성화됩니다.
|
||||
</p>
|
||||
<a href="/taxbaik/contact" class="btn btn-primary px-4 py-2">
|
||||
<i class="bi bi-chat-dots"></i> 세무사에게 문의하기
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="row g-4">
|
||||
<!-- 왼쪽: 세무 신고 현황 (Tax Filings) -->
|
||||
<div class="col-lg-8">
|
||||
<div class="card border-0 shadow-sm rounded-3 mb-4">
|
||||
<div class="card-body p-4">
|
||||
<div class="d-flex justify-content-between align-items-center mb-4">
|
||||
<h3 class="h5 fw-bold text-dark mb-0">
|
||||
<i class="bi bi-calendar-check text-primary me-2"></i> 나의 세무 신고 현황
|
||||
</h3>
|
||||
<span class="badge bg-secondary">총 @(Model.Filings.Count)건</span>
|
||||
</div>
|
||||
|
||||
@if (!Model.Filings.Any())
|
||||
{
|
||||
<div class="text-center py-5 text-muted">
|
||||
<i class="bi bi-folder-x display-4 d-block mb-3 text-secondary"></i>
|
||||
등록된 세무 신고 일정이 없습니다.
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="table-responsive">
|
||||
<table class="table table-hover align-middle">
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th scope="col">신고 종류</th>
|
||||
<th scope="col">신고 기한</th>
|
||||
<th scope="col">진행 상태</th>
|
||||
<th scope="col">메모</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach (var filing in Model.Filings)
|
||||
{
|
||||
var dDay = (filing.DueDate - DateTime.Today).Days;
|
||||
var statusClass = filing.Status switch
|
||||
{
|
||||
"filed" => "bg-success-subtle text-success",
|
||||
"overdue" => "bg-danger-subtle text-danger",
|
||||
_ => "bg-warning-subtle text-warning-emphasis"
|
||||
};
|
||||
var statusLabel = filing.Status switch
|
||||
{
|
||||
"filed" => "신고 완료",
|
||||
"overdue" => "기한 초과",
|
||||
_ => $"D-{dDay}"
|
||||
};
|
||||
|
||||
<tr>
|
||||
<td>
|
||||
<span class="fw-bold text-dark">@filing.FilingType</span>
|
||||
</td>
|
||||
<td>
|
||||
<span>@filing.DueDate.ToString("yyyy-MM-dd")</span>
|
||||
</td>
|
||||
<td>
|
||||
<span class="badge @statusClass px-2.5 py-1.5 fs-7">@statusLabel</span>
|
||||
</td>
|
||||
<td class="text-muted small">
|
||||
@(string.IsNullOrEmpty(filing.Memo) ? "-" : filing.Memo)
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 오른쪽: 상담 이력 요약 (Consulting Activities) -->
|
||||
<div class="col-lg-4">
|
||||
<div class="card border-0 shadow-sm rounded-3">
|
||||
<div class="card-body p-4">
|
||||
<h3 class="h5 fw-bold text-dark mb-4">
|
||||
<i class="bi bi-chat-text text-primary me-2"></i> 최근 상담 및 지원 이력
|
||||
</h3>
|
||||
|
||||
@if (!Model.Consultations.Any())
|
||||
{
|
||||
<div class="text-center py-5 text-muted">
|
||||
<i class="bi bi-chat-square-dots display-4 d-block mb-3 text-secondary"></i>
|
||||
최근 상담 이력이 없습니다.
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="timeline">
|
||||
@foreach (var activity in Model.Consultations)
|
||||
{
|
||||
<div class="border-start border-2 border-primary-subtle ps-3 pb-4 position-relative">
|
||||
<!-- 타임라인 아이콘 -->
|
||||
<div class="position-absolute start-0 translate-middle-x bg-primary rounded-circle"
|
||||
style="width: 10px; height: 10px; margin-left: -1px; top: 6px;"></div>
|
||||
|
||||
<div class="d-flex justify-content-between align-items-center mb-1">
|
||||
<span class="badge bg-primary-subtle text-primary small">@activity.ActivityType</span>
|
||||
<small class="text-muted">@activity.ActivityDate.ToString("yyyy-MM-dd")</small>
|
||||
</div>
|
||||
<p class="text-dark small mb-1 fw-semibold">@activity.Description</p>
|
||||
@if (!string.IsNullOrEmpty(activity.Outcome))
|
||||
{
|
||||
<div class="bg-light p-2 rounded small text-muted mt-1">
|
||||
<strong>결과:</strong> @activity.Outcome
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
@@ -0,0 +1,49 @@
|
||||
using System.Security.Claims;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||
using TaxBaik.Application.Services;
|
||||
using TaxBaik.Domain.Entities;
|
||||
using TaxBaik.Web.Services;
|
||||
|
||||
namespace TaxBaik.Web.Pages.Portal;
|
||||
|
||||
[Authorize(AuthenticationSchemes = PortalAuthDefaults.Scheme)]
|
||||
public class IndexModel : PageModel
|
||||
{
|
||||
private readonly TaxFilingService _taxFilingService;
|
||||
private readonly ConsultingActivityService _consultingActivityService;
|
||||
private readonly ClientService _clientService;
|
||||
|
||||
public IndexModel(
|
||||
TaxFilingService taxFilingService,
|
||||
ConsultingActivityService consultingActivityService,
|
||||
ClientService clientService)
|
||||
{
|
||||
_taxFilingService = taxFilingService;
|
||||
_consultingActivityService = consultingActivityService;
|
||||
_clientService = clientService;
|
||||
}
|
||||
|
||||
public Client? ClientInfo { get; private set; }
|
||||
public List<TaxFiling> Filings { get; private set; } = new();
|
||||
public List<ConsultingActivity> Consultations { get; private set; } = new();
|
||||
|
||||
public async Task<IActionResult> OnGetAsync()
|
||||
{
|
||||
var clientIdClaim = User.FindFirst("client_id");
|
||||
if (clientIdClaim != null && int.TryParse(clientIdClaim.Value, out var clientId))
|
||||
{
|
||||
ClientInfo = await _clientService.GetByIdAsync(clientId);
|
||||
if (ClientInfo != null)
|
||||
{
|
||||
var filingsData = await _taxFilingService.GetByClientIdAsync(clientId);
|
||||
Filings = filingsData.OrderBy(f => f.DueDate).ToList();
|
||||
|
||||
var consultationsData = await _consultingActivityService.GetByClientIdAsync(clientId);
|
||||
Consultations = consultationsData.OrderByDescending(c => c.ActivityDate).ToList();
|
||||
}
|
||||
}
|
||||
return Page();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
@page "/portal/login"
|
||||
@model TaxBaik.Web.Pages.Portal.LoginModel
|
||||
@{
|
||||
ViewData["Title"] = "고객 포털 로그인";
|
||||
ViewData["Description"] = "고객 포털 로그인 페이지입니다.";
|
||||
ViewData["CanonicalUrl"] = $"{Request.Scheme}://{Request.Host}/taxbaik/portal/login";
|
||||
}
|
||||
|
||||
<section class="container py-5" style="max-width: 560px;">
|
||||
<h1 class="h3 fw-bold mb-4">고객 포털 로그인</h1>
|
||||
<div class="alert alert-secondary">
|
||||
포털 인증은 다음 단계에서 이메일/비밀번호와 소셜 로그인으로 연결됩니다.
|
||||
</div>
|
||||
@if (!string.IsNullOrWhiteSpace(Model.ErrorMessage))
|
||||
{
|
||||
<div class="alert alert-danger">@Model.ErrorMessage</div>
|
||||
}
|
||||
<form method="post" class="vstack gap-3">
|
||||
<div>
|
||||
<label class="form-label">이메일</label>
|
||||
<input class="form-control" asp-for="Email" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="form-label">비밀번호</label>
|
||||
<input class="form-control" asp-for="Password" type="password" />
|
||||
</div>
|
||||
<button class="btn btn-dark" type="submit">로그인</button>
|
||||
</form>
|
||||
<div class="d-grid gap-2 mt-4">
|
||||
<form method="post" asp-page-handler="Google">
|
||||
<button class="btn btn-outline-dark w-100" type="submit">Google로 로그인</button>
|
||||
</form>
|
||||
<form method="post" asp-page-handler="Naver">
|
||||
<button class="btn btn-outline-success w-100" type="submit">Naver로 로그인</button>
|
||||
</form>
|
||||
<form method="post" asp-page-handler="Kakao">
|
||||
<button class="btn btn-outline-warning w-100" type="submit">Kakao로 로그인</button>
|
||||
</form>
|
||||
</div>
|
||||
</section>
|
||||
@@ -0,0 +1,56 @@
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||
using TaxBaik.Web.Services;
|
||||
|
||||
namespace TaxBaik.Web.Pages.Portal;
|
||||
|
||||
public class LoginModel : PageModel
|
||||
{
|
||||
private readonly PortalAuthService _portalAuthService;
|
||||
|
||||
[BindProperty]
|
||||
public string Email { get; set; } = "";
|
||||
|
||||
[BindProperty]
|
||||
public string Password { get; set; } = "";
|
||||
|
||||
[BindProperty]
|
||||
public string? ErrorMessage { get; set; }
|
||||
|
||||
public LoginModel(PortalAuthService portalAuthService)
|
||||
{
|
||||
_portalAuthService = portalAuthService;
|
||||
}
|
||||
|
||||
public void OnGet()
|
||||
{
|
||||
}
|
||||
|
||||
public async Task<IActionResult> OnPostAsync()
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(Email) || string.IsNullOrWhiteSpace(Password))
|
||||
{
|
||||
ErrorMessage = "이메일과 비밀번호를 입력하세요.";
|
||||
return Page();
|
||||
}
|
||||
|
||||
var signedIn = await _portalAuthService.SignInAsync(Email, Password);
|
||||
if (!signedIn)
|
||||
{
|
||||
ErrorMessage = "로그인 정보를 확인할 수 없습니다.";
|
||||
return Page();
|
||||
}
|
||||
|
||||
return RedirectToPage("/Portal/Index");
|
||||
}
|
||||
|
||||
public IActionResult OnPostGoogle() => Challenge(BuildProps("google"), PortalOAuthDefaults.GoogleScheme);
|
||||
|
||||
public IActionResult OnPostNaver() => Challenge(BuildProps("naver"), PortalOAuthDefaults.NaverScheme);
|
||||
|
||||
public IActionResult OnPostKakao() => Challenge(BuildProps("kakao"), PortalOAuthDefaults.KakaoScheme);
|
||||
|
||||
private static AuthenticationProperties BuildProps(string provider) =>
|
||||
new() { RedirectUri = $"/taxbaik/portal/external-callback?provider={provider}" };
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
@page "/portal/register"
|
||||
@model TaxBaik.Web.Pages.Portal.RegisterModel
|
||||
@{
|
||||
ViewData["Title"] = "고객 포털 회원가입";
|
||||
ViewData["Description"] = "고객 포털 회원가입 페이지입니다.";
|
||||
ViewData["CanonicalUrl"] = $"{Request.Scheme}://{Request.Host}/taxbaik/portal/register";
|
||||
}
|
||||
|
||||
<section class="container py-5" style="max-width: 640px;">
|
||||
<h1 class="h3 fw-bold mb-4">고객 포털 회원가입</h1>
|
||||
<div class="alert alert-secondary">
|
||||
가입 흐름은 다음 단계에서 이메일/전화번호 검증과 소셜 로그인으로 확장합니다.
|
||||
</div>
|
||||
<form method="post" class="row g-3">
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">이름</label>
|
||||
<input class="form-control" asp-for="Name" />
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">연락처</label>
|
||||
<input class="form-control" asp-for="Phone" />
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<label class="form-label">이메일</label>
|
||||
<input class="form-control" asp-for="Email" />
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<label class="form-label">비밀번호</label>
|
||||
<input class="form-control" asp-for="Password" type="password" />
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<button class="btn btn-dark" type="submit">가입하기</button>
|
||||
</div>
|
||||
</form>
|
||||
</section>
|
||||
@@ -0,0 +1,75 @@
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||
using TaxBaik.Application.Services;
|
||||
using TaxBaik.Web.Services;
|
||||
|
||||
namespace TaxBaik.Web.Pages.Portal;
|
||||
|
||||
public class RegisterModel : PageModel
|
||||
{
|
||||
private readonly PortalUserService _portalUserService;
|
||||
private readonly ClientService _clientService;
|
||||
|
||||
[BindProperty]
|
||||
public string Name { get; set; } = "";
|
||||
|
||||
[BindProperty]
|
||||
public string Phone { get; set; } = "";
|
||||
|
||||
[BindProperty]
|
||||
public string Email { get; set; } = "";
|
||||
|
||||
[BindProperty]
|
||||
public string Password { get; set; } = "";
|
||||
|
||||
[BindProperty]
|
||||
public string? ErrorMessage { get; set; }
|
||||
|
||||
public RegisterModel(PortalUserService portalUserService, ClientService clientService)
|
||||
{
|
||||
_portalUserService = portalUserService;
|
||||
_clientService = clientService;
|
||||
}
|
||||
|
||||
public void OnGet()
|
||||
{
|
||||
}
|
||||
|
||||
public async Task<IActionResult> OnPostAsync()
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(Name) || string.IsNullOrWhiteSpace(Email))
|
||||
{
|
||||
ErrorMessage = "이름과 이메일을 입력하세요.";
|
||||
return Page();
|
||||
}
|
||||
|
||||
if (string.IsNullOrWhiteSpace(Password) || Password.Length < 8)
|
||||
{
|
||||
ErrorMessage = "비밀번호는 8자 이상이어야 합니다.";
|
||||
return Page();
|
||||
}
|
||||
|
||||
var existing = await _portalUserService.GetByEmailAsync(Email);
|
||||
if (existing is not null)
|
||||
{
|
||||
ErrorMessage = "이미 등록된 이메일입니다.";
|
||||
return Page();
|
||||
}
|
||||
|
||||
int? clientId = null;
|
||||
var linkedClient = await _clientService.GetByEmailAsync(Email);
|
||||
if (linkedClient is null && !string.IsNullOrWhiteSpace(Phone))
|
||||
linkedClient = await _clientService.GetByPhoneAsync(Phone);
|
||||
if (linkedClient is not null)
|
||||
clientId = linkedClient.Id;
|
||||
|
||||
await _portalUserService.RegisterLocalAsync(
|
||||
Name,
|
||||
Email,
|
||||
Phone,
|
||||
PortalAuthService.HashPassword(Password),
|
||||
clientId: clientId);
|
||||
|
||||
return RedirectToPage("/Portal/Login");
|
||||
}
|
||||
}
|
||||
@@ -54,6 +54,7 @@
|
||||
<p>© 2026 백원숙 세무회계. All rights reserved.</p>
|
||||
<a href="/taxbaik/privacy" class="text-decoration-none text-muted me-2">개인정보처리방침</a>
|
||||
<a href="/taxbaik/terms" class="text-decoration-none text-muted">이용약관</a>
|
||||
<a href="/taxbaik/portal" class="text-decoration-none text-muted ms-2">고객 포털</a>
|
||||
@if (Context.RequestServices.GetService(typeof(VersionInfo)) is VersionInfo version)
|
||||
{
|
||||
<div class="mt-2 text-muted" style="font-size: 0.75rem; opacity: 0.6;">
|
||||
|
||||
+113
-23
@@ -3,6 +3,8 @@ using System.Text;
|
||||
using System.Text.Encodings.Web;
|
||||
using System.Text.Unicode;
|
||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
||||
using Microsoft.AspNetCore.Authentication.Cookies;
|
||||
using Microsoft.AspNetCore.Authentication.OAuth;
|
||||
using Microsoft.AspNetCore.Components.Authorization;
|
||||
using Microsoft.AspNetCore.HttpOverrides;
|
||||
using Microsoft.AspNetCore.ResponseCompression;
|
||||
@@ -36,6 +38,13 @@ builder.Host.UseSerilog((context, config) =>
|
||||
outputTemplate: "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz}] [{Level:u3}] {Message:lj}{NewLine}{Exception}")
|
||||
.Enrich.FromLogContext()
|
||||
.Enrich.WithProperty("Environment", context.HostingEnvironment.EnvironmentName);
|
||||
|
||||
var botToken = context.Configuration["Telegram:BotToken"];
|
||||
var systemChatId = context.Configuration["Telegram:SystemChatId"] ?? context.Configuration["Telegram:ChatId"];
|
||||
if (!string.IsNullOrEmpty(botToken) && !string.IsNullOrEmpty(systemChatId))
|
||||
{
|
||||
config.WriteTo.Sink(new TaxBaik.Web.Logging.TelegramSink(botToken, systemChatId), Serilog.Events.LogEventLevel.Error);
|
||||
}
|
||||
});
|
||||
|
||||
// Controllers (API)
|
||||
@@ -62,7 +71,7 @@ if (isProduction && jwtKey.Contains("dev-secret", StringComparison.OrdinalIgnore
|
||||
throw new InvalidOperationException("Production JWT SecretKey must not use the development default.");
|
||||
var key = Encoding.ASCII.GetBytes(jwtKey);
|
||||
|
||||
builder.Services.AddAuthentication(opts =>
|
||||
var authenticationBuilder = builder.Services.AddAuthentication(opts =>
|
||||
{
|
||||
opts.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
|
||||
opts.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
|
||||
@@ -80,8 +89,105 @@ builder.Services.AddAuthentication(opts =>
|
||||
ValidateLifetime = true,
|
||||
ClockSkew = TimeSpan.FromMinutes(1)
|
||||
};
|
||||
})
|
||||
.AddCookie(PortalAuthDefaults.Scheme, opts =>
|
||||
{
|
||||
opts.Cookie.Name = PortalAuthDefaults.CookieName;
|
||||
opts.Cookie.HttpOnly = true;
|
||||
opts.Cookie.SameSite = SameSiteMode.Lax;
|
||||
opts.Cookie.SecurePolicy = isProduction ? CookieSecurePolicy.Always : CookieSecurePolicy.SameAsRequest;
|
||||
opts.LoginPath = "/taxbaik/portal/login";
|
||||
opts.AccessDeniedPath = "/taxbaik/portal/login";
|
||||
opts.SlidingExpiration = true;
|
||||
opts.ExpireTimeSpan = TimeSpan.FromDays(7);
|
||||
})
|
||||
.AddCookie(PortalOAuthDefaults.ExternalScheme, opts =>
|
||||
{
|
||||
opts.Cookie.Name = "TaxBaik.Portal.External";
|
||||
opts.Cookie.HttpOnly = true;
|
||||
opts.Cookie.SameSite = SameSiteMode.Lax;
|
||||
opts.Cookie.SecurePolicy = isProduction ? CookieSecurePolicy.Always : CookieSecurePolicy.SameAsRequest;
|
||||
});
|
||||
|
||||
var googleClientId = builder.Configuration["Authentication:Google:ClientId"];
|
||||
var googleClientSecret = builder.Configuration["Authentication:Google:ClientSecret"];
|
||||
if (!string.IsNullOrWhiteSpace(googleClientId) && !string.IsNullOrWhiteSpace(googleClientSecret))
|
||||
{
|
||||
authenticationBuilder.AddGoogle(PortalOAuthDefaults.GoogleScheme, opts =>
|
||||
{
|
||||
opts.SignInScheme = PortalOAuthDefaults.ExternalScheme;
|
||||
opts.ClientId = googleClientId;
|
||||
opts.ClientSecret = googleClientSecret;
|
||||
opts.CallbackPath = "/taxbaik/portal/signin-google";
|
||||
});
|
||||
}
|
||||
|
||||
var naverClientId = builder.Configuration["Authentication:Naver:ClientId"];
|
||||
var naverClientSecret = builder.Configuration["Authentication:Naver:ClientSecret"];
|
||||
if (!string.IsNullOrWhiteSpace(naverClientId) && !string.IsNullOrWhiteSpace(naverClientSecret))
|
||||
{
|
||||
authenticationBuilder.AddOAuth(PortalOAuthDefaults.NaverScheme, opts =>
|
||||
{
|
||||
opts.SignInScheme = PortalOAuthDefaults.ExternalScheme;
|
||||
opts.ClientId = naverClientId;
|
||||
opts.ClientSecret = naverClientSecret;
|
||||
opts.CallbackPath = "/taxbaik/portal/signin-naver";
|
||||
opts.AuthorizationEndpoint = "https://nid.naver.com/oauth2.0/authorize";
|
||||
opts.TokenEndpoint = "https://nid.naver.com/oauth2.0/token";
|
||||
opts.UserInformationEndpoint = "https://openapi.naver.com/v1/nid/me";
|
||||
opts.SaveTokens = true;
|
||||
opts.Events = new OAuthEvents
|
||||
{
|
||||
OnCreatingTicket = async context =>
|
||||
{
|
||||
var request = new HttpRequestMessage(HttpMethod.Get, opts.UserInformationEndpoint);
|
||||
request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", context.AccessToken);
|
||||
var response = await context.Backchannel.SendAsync(request, context.HttpContext.RequestAborted);
|
||||
response.EnsureSuccessStatusCode();
|
||||
using var payload = System.Text.Json.JsonDocument.Parse(await response.Content.ReadAsStringAsync(context.HttpContext.RequestAborted));
|
||||
var responseRoot = payload.RootElement.GetProperty("response");
|
||||
context.Identity?.AddClaim(new System.Security.Claims.Claim(System.Security.Claims.ClaimTypes.NameIdentifier, responseRoot.GetProperty("id").GetString() ?? ""));
|
||||
context.Identity?.AddClaim(new System.Security.Claims.Claim(System.Security.Claims.ClaimTypes.Name, responseRoot.GetProperty("name").GetString() ?? ""));
|
||||
context.Identity?.AddClaim(new System.Security.Claims.Claim(System.Security.Claims.ClaimTypes.Email, responseRoot.GetProperty("email").GetString() ?? ""));
|
||||
}
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
var kakaoClientId = builder.Configuration["Authentication:Kakao:ClientId"];
|
||||
var kakaoClientSecret = builder.Configuration["Authentication:Kakao:ClientSecret"];
|
||||
if (!string.IsNullOrWhiteSpace(kakaoClientId) && !string.IsNullOrWhiteSpace(kakaoClientSecret))
|
||||
{
|
||||
authenticationBuilder.AddOAuth(PortalOAuthDefaults.KakaoScheme, opts =>
|
||||
{
|
||||
opts.SignInScheme = PortalOAuthDefaults.ExternalScheme;
|
||||
opts.ClientId = kakaoClientId;
|
||||
opts.ClientSecret = kakaoClientSecret;
|
||||
opts.CallbackPath = "/taxbaik/portal/signin-kakao";
|
||||
opts.AuthorizationEndpoint = "https://kauth.kakao.com/oauth/authorize";
|
||||
opts.TokenEndpoint = "https://kauth.kakao.com/oauth/token";
|
||||
opts.UserInformationEndpoint = "https://kapi.kakao.com/v2/user/me";
|
||||
opts.SaveTokens = true;
|
||||
opts.Events = new OAuthEvents
|
||||
{
|
||||
OnCreatingTicket = async context =>
|
||||
{
|
||||
var request = new HttpRequestMessage(HttpMethod.Get, opts.UserInformationEndpoint);
|
||||
request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", context.AccessToken);
|
||||
var response = await context.Backchannel.SendAsync(request, context.HttpContext.RequestAborted);
|
||||
response.EnsureSuccessStatusCode();
|
||||
using var payload = System.Text.Json.JsonDocument.Parse(await response.Content.ReadAsStringAsync(context.HttpContext.RequestAborted));
|
||||
var kakaoAccount = payload.RootElement.GetProperty("kakao_account");
|
||||
var profile = kakaoAccount.GetProperty("profile");
|
||||
context.Identity?.AddClaim(new System.Security.Claims.Claim(System.Security.Claims.ClaimTypes.NameIdentifier, payload.RootElement.GetProperty("id").GetInt64().ToString()));
|
||||
context.Identity?.AddClaim(new System.Security.Claims.Claim(System.Security.Claims.ClaimTypes.Name, profile.GetProperty("nickname").GetString() ?? ""));
|
||||
if (kakaoAccount.TryGetProperty("email", out var emailProp))
|
||||
context.Identity?.AddClaim(new System.Security.Claims.Claim(System.Security.Claims.ClaimTypes.Email, emailProp.GetString() ?? ""));
|
||||
}
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
// Blazor 인증
|
||||
builder.Services.AddScoped<AuthService>();
|
||||
builder.Services.AddScoped<CustomAuthenticationStateProvider>();
|
||||
@@ -177,13 +283,18 @@ builder.Services.AddMemoryCache();
|
||||
builder.Services.AddResponseCompression(opts => {
|
||||
opts.Providers.Add<GzipCompressionProvider>();
|
||||
});
|
||||
builder.Services.AddScoped<IInquiryNotificationService, TelegramInquiryNotificationService>();
|
||||
builder.Services.AddHostedService<TelegramReportBackgroundService>();
|
||||
builder.Services.AddHttpContextAccessor();
|
||||
builder.Services.AddScoped<PortalAuthService>();
|
||||
|
||||
builder.Services.Configure<PortalAuthOptions>(builder.Configuration.GetSection("Authentication"));
|
||||
|
||||
// 한글 포함 다국어 문자를 유니코드 엔티티로 변환하지 않도록 설정
|
||||
builder.Services.AddSingleton(HtmlEncoder.Create(UnicodeRanges.All));
|
||||
|
||||
builder.Services.AddInfrastructure();
|
||||
builder.Services.AddApplication();
|
||||
builder.Services.AddScoped<IInquiryNotificationService, TelegramInquiryNotificationService>();
|
||||
|
||||
// Register version info
|
||||
var versionInfo = new VersionInfo();
|
||||
@@ -262,27 +373,6 @@ app.MapRazorComponents<TaxBaik.Web.Components.Admin.App>()
|
||||
try
|
||||
{
|
||||
Log.Information("애플리케이션 시작: {Environment}", app.Environment.EnvironmentName);
|
||||
if (!app.Environment.IsDevelopment())
|
||||
{
|
||||
// 배포 완료 알림을 백그라운드에서 비동기 전송 (앱 시작 블록 방지)
|
||||
_ = Task.Run(async () =>
|
||||
{
|
||||
try
|
||||
{
|
||||
using (var scope = app.Services.CreateScope())
|
||||
{
|
||||
var telegramService = scope.ServiceProvider.GetRequiredService<ITelegramNotificationService>();
|
||||
await telegramService.SendInfoAsync(
|
||||
"✅ 배포 완료",
|
||||
$"환경: {app.Environment.EnvironmentName}\n상태: 정상 운영 중");
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Log.Error(ex, "배포 완료 알림 전송 실패");
|
||||
}
|
||||
});
|
||||
}
|
||||
app.Run();
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
namespace TaxBaik.Web.Services;
|
||||
|
||||
public static class PortalAuthDefaults
|
||||
{
|
||||
public const string Scheme = "PortalCookie";
|
||||
public const string CookieName = "TaxBaik.Portal.Auth";
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
namespace TaxBaik.Web.Services;
|
||||
|
||||
public sealed class PortalAuthOptions
|
||||
{
|
||||
public ExternalProviderOptions Google { get; set; } = new();
|
||||
public ExternalProviderOptions Naver { get; set; } = new();
|
||||
public ExternalProviderOptions Kakao { get; set; } = new();
|
||||
|
||||
public sealed class ExternalProviderOptions
|
||||
{
|
||||
public string ClientId { get; set; } = "";
|
||||
public string ClientSecret { get; set; } = "";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
namespace TaxBaik.Web.Services;
|
||||
|
||||
using System.Security.Claims;
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
using Microsoft.AspNetCore.Authentication.Cookies;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using TaxBaik.Application.Services;
|
||||
using TaxBaik.Domain.Entities;
|
||||
|
||||
public class PortalAuthService(
|
||||
IHttpContextAccessor httpContextAccessor,
|
||||
PortalUserService portalUserService)
|
||||
{
|
||||
private static readonly PasswordHasher<PortalUser> Hasher = new();
|
||||
|
||||
public async Task<bool> SignInAsync(string email, string password, CancellationToken ct = default)
|
||||
{
|
||||
var httpContext = httpContextAccessor.HttpContext
|
||||
?? throw new InvalidOperationException("HTTP context is unavailable.");
|
||||
|
||||
var user = await portalUserService.GetByEmailAsync(email, ct);
|
||||
if (user is null)
|
||||
return false;
|
||||
|
||||
if (string.IsNullOrWhiteSpace(user.PasswordHash))
|
||||
return false;
|
||||
|
||||
var verify = Hasher.VerifyHashedPassword(user, user.PasswordHash, password);
|
||||
if (verify == PasswordVerificationResult.Failed)
|
||||
return false;
|
||||
|
||||
var claims = new List<Claim>
|
||||
{
|
||||
new(ClaimTypes.NameIdentifier, user.Id.ToString()),
|
||||
new(ClaimTypes.Name, user.Name),
|
||||
new(ClaimTypes.Email, user.Email),
|
||||
new("portal_user_id", user.Id.ToString())
|
||||
};
|
||||
|
||||
if (user.ClientId.HasValue)
|
||||
claims.Add(new("client_id", user.ClientId.Value.ToString()));
|
||||
|
||||
var identity = new ClaimsIdentity(claims, PortalAuthDefaults.Scheme);
|
||||
var principal = new ClaimsPrincipal(identity);
|
||||
|
||||
await httpContext.SignInAsync(
|
||||
PortalAuthDefaults.Scheme,
|
||||
principal,
|
||||
new AuthenticationProperties
|
||||
{
|
||||
IsPersistent = true
|
||||
});
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public static string HashPassword(string password)
|
||||
{
|
||||
var tempUser = new PortalUser();
|
||||
return Hasher.HashPassword(tempUser, password);
|
||||
}
|
||||
|
||||
public async Task SignOutAsync()
|
||||
{
|
||||
var httpContext = httpContextAccessor.HttpContext
|
||||
?? throw new InvalidOperationException("HTTP context is unavailable.");
|
||||
|
||||
await httpContext.SignOutAsync(PortalAuthDefaults.Scheme);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
namespace TaxBaik.Web.Services;
|
||||
|
||||
public static class PortalOAuthDefaults
|
||||
{
|
||||
public const string ExternalScheme = "PortalExternal";
|
||||
public const string GoogleScheme = "PortalGoogle";
|
||||
public const string NaverScheme = "PortalNaver";
|
||||
public const string KakaoScheme = "PortalKakao";
|
||||
}
|
||||
@@ -13,6 +13,7 @@ public interface ITelegramNotificationService
|
||||
Task SendInfoAsync(string title, string message, CancellationToken ct = default);
|
||||
Task SendInquiryNotificationAsync(string message, CancellationToken ct = default);
|
||||
Task SendSystemNotificationAsync(string message, CancellationToken ct = default);
|
||||
Task SendReportAsync(string reportTitle, string reportContent, CancellationToken ct = default);
|
||||
}
|
||||
|
||||
public class TelegramNotificationService : ITelegramNotificationService
|
||||
@@ -33,8 +34,8 @@ public class TelegramNotificationService : ITelegramNotificationService
|
||||
_httpClient = httpClient;
|
||||
_logger = logger;
|
||||
_botToken = config["Telegram:BotToken"] ?? "";
|
||||
_defaultChatId = config["Telegram:ChatId"] ?? "";
|
||||
_inquiryChatId = config["Telegram:InquiryChatId"] ?? "-5434691215";
|
||||
_defaultChatId = config["Telegram:ChatId"] ?? "-5434691215";
|
||||
_inquiryChatId = config["Telegram:InquiryChatId"] ?? _defaultChatId;
|
||||
_systemChatId = config["Telegram:SystemChatId"] ?? "-5585148480";
|
||||
}
|
||||
|
||||
@@ -88,7 +89,7 @@ public class TelegramNotificationService : ITelegramNotificationService
|
||||
public async Task SendErrorAsync(string title, string details, CancellationToken ct = default)
|
||||
{
|
||||
var message = $"<b>❌ {title}</b>\n\n{details}\n\n<i>{DateTime.UtcNow:yyyy-MM-dd HH:mm:ss} UTC</i>";
|
||||
await SendMessageAsync(message, ct);
|
||||
await SendToChat(_systemChatId, message, ct);
|
||||
}
|
||||
|
||||
public async Task SendInfoAsync(string title, string message, CancellationToken ct = default)
|
||||
@@ -96,4 +97,10 @@ public class TelegramNotificationService : ITelegramNotificationService
|
||||
var text = $"<b>ℹ️ {title}</b>\n\n{message}\n\n<i>{DateTime.UtcNow:yyyy-MM-dd HH:mm:ss} UTC</i>";
|
||||
await SendMessageAsync(text, ct);
|
||||
}
|
||||
|
||||
public async Task SendReportAsync(string reportTitle, string reportContent, CancellationToken ct = default)
|
||||
{
|
||||
var text = $"<b>📊 {reportTitle}</b>\n\n{reportContent}\n\n<i>{DateTime.UtcNow:yyyy-MM-dd HH:mm:ss} UTC</i>";
|
||||
await SendToChat(_systemChatId, text, ct);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
namespace TaxBaik.Web.Services;
|
||||
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using TaxBaik.Application.Services;
|
||||
|
||||
public class TelegramReportBackgroundService(
|
||||
IServiceScopeFactory scopeFactory,
|
||||
ILogger<TelegramReportBackgroundService> logger) : BackgroundService
|
||||
{
|
||||
private static readonly TimeZoneInfo KoreaTimeZone = GetKoreaTimeZone();
|
||||
private DateOnly? _lastDailyReportDate;
|
||||
private DateOnly? _lastWeeklyReportWeekStart;
|
||||
|
||||
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
||||
{
|
||||
using var timer = new PeriodicTimer(TimeSpan.FromMinutes(30));
|
||||
|
||||
while (await timer.WaitForNextTickAsync(stoppingToken))
|
||||
{
|
||||
try
|
||||
{
|
||||
var now = TimeZoneInfo.ConvertTime(DateTimeOffset.UtcNow, KoreaTimeZone);
|
||||
await TrySendReportsAsync(now, stoppingToken);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogError(ex, "Telegram report background loop failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private async Task TrySendReportsAsync(DateTimeOffset nowKst, CancellationToken ct)
|
||||
{
|
||||
if (nowKst.Hour is 9 or 10)
|
||||
await SendDailyIfNeededAsync(DateOnly.FromDateTime(nowKst.DateTime), ct);
|
||||
|
||||
if (nowKst.DayOfWeek == DayOfWeek.Monday && nowKst.Hour is 9 or 10)
|
||||
await SendWeeklyIfNeededAsync(DateOnly.FromDateTime(nowKst.DateTime).AddDays(-7), ct);
|
||||
}
|
||||
|
||||
private async Task SendDailyIfNeededAsync(DateOnly date, CancellationToken ct)
|
||||
{
|
||||
if (_lastDailyReportDate == date)
|
||||
return;
|
||||
|
||||
using var scope = scopeFactory.CreateScope();
|
||||
var reportService = scope.ServiceProvider.GetRequiredService<TelegramReportService>();
|
||||
var telegram = scope.ServiceProvider.GetRequiredService<ITelegramNotificationService>();
|
||||
|
||||
var report = await reportService.BuildDailyReportAsync(date, ct);
|
||||
await telegram.SendReportAsync("일간 세무/상담 현황 리포트", TelegramReportService.FormatDailyMessage(report), ct);
|
||||
_lastDailyReportDate = date;
|
||||
logger.LogInformation("Daily telegram report sent for {Date}", date);
|
||||
}
|
||||
|
||||
private async Task SendWeeklyIfNeededAsync(DateOnly weekStart, CancellationToken ct)
|
||||
{
|
||||
if (_lastWeeklyReportWeekStart == weekStart)
|
||||
return;
|
||||
|
||||
using var scope = scopeFactory.CreateScope();
|
||||
var reportService = scope.ServiceProvider.GetRequiredService<TelegramReportService>();
|
||||
var telegram = scope.ServiceProvider.GetRequiredService<ITelegramNotificationService>();
|
||||
|
||||
var report = await reportService.BuildWeeklyReportAsync(weekStart, ct);
|
||||
await telegram.SendReportAsync("주간 세무/매출 종합 리포트", TelegramReportService.FormatWeeklyMessage(report), ct);
|
||||
_lastWeeklyReportWeekStart = weekStart;
|
||||
logger.LogInformation("Weekly telegram report sent for {WeekStart}", weekStart);
|
||||
}
|
||||
|
||||
private static TimeZoneInfo GetKoreaTimeZone()
|
||||
{
|
||||
try
|
||||
{
|
||||
return TimeZoneInfo.FindSystemTimeZoneById("Korea Standard Time");
|
||||
}
|
||||
catch (TimeZoneNotFoundException)
|
||||
{
|
||||
return TimeZoneInfo.FindSystemTimeZoneById("Asia/Seoul");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -14,6 +14,7 @@
|
||||
<ItemGroup>
|
||||
<PackageReference Include="MudBlazor" Version="6.10.0" />
|
||||
<PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="10.0.9" />
|
||||
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.19.1" />
|
||||
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.19.1" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.9" />
|
||||
|
||||
@@ -19,13 +19,27 @@
|
||||
},
|
||||
"Telegram": {
|
||||
"BotToken": "8679990909:AAGLLRUIAuEbYAZVGOYDu-UuTu4ihroEiX0",
|
||||
"ChatId": "-5585148480",
|
||||
"ChatId": "-5434691215",
|
||||
"InquiryChatId": "-5434691215",
|
||||
"SystemChatId": "-5585148480"
|
||||
},
|
||||
"Admin": {
|
||||
"PasswordResetToken": "dev-reset-token-12345"
|
||||
},
|
||||
"Authentication": {
|
||||
"Google": {
|
||||
"ClientId": "",
|
||||
"ClientSecret": ""
|
||||
},
|
||||
"Naver": {
|
||||
"ClientId": "",
|
||||
"ClientSecret": ""
|
||||
},
|
||||
"Kakao": {
|
||||
"ClientId": "",
|
||||
"ClientSecret": ""
|
||||
}
|
||||
},
|
||||
"SiteSettings": {
|
||||
"PhoneNumber": "010-4122-8268",
|
||||
"EmailAddress": "taxbaik5668@gmail.com",
|
||||
|
||||
@@ -411,11 +411,41 @@ textarea:focus-visible {
|
||||
background-color: var(--bg-secondary);
|
||||
}
|
||||
|
||||
.admin-shell .mud-typography--h4 {
|
||||
font-size: 1.35rem;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.admin-shell .mud-typography--h6 {
|
||||
font-size: 0.88rem;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.admin-shell .mud-typography--subtitle1 {
|
||||
font-size: 0.82rem;
|
||||
line-height: 1.3;
|
||||
}
|
||||
|
||||
.admin-shell .mud-typography--body1 {
|
||||
font-size: 0.82rem;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.admin-shell .mud-typography--body2 {
|
||||
font-size: 0.75rem;
|
||||
line-height: 1.35;
|
||||
}
|
||||
|
||||
.admin-shell .mud-typography--caption {
|
||||
font-size: 0.68rem;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.admin-topbar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: var(--space-4);
|
||||
padding: var(--space-3) var(--space-6);
|
||||
gap: 12px;
|
||||
padding: 6px 16px;
|
||||
background-color: var(--bg-primary);
|
||||
border-bottom: 1px solid var(--border-color);
|
||||
z-index: var(--z-dropdown);
|
||||
@@ -429,21 +459,33 @@ textarea:focus-visible {
|
||||
.admin-topbar-title {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: var(--space-1);
|
||||
gap: 0;
|
||||
}
|
||||
|
||||
.admin-topbar-title span {
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
.admin-topbar-title .mud-typography--h6 {
|
||||
font-size: 0.85rem;
|
||||
line-height: 1.15;
|
||||
font-weight: var(--font-weight-semibold);
|
||||
}
|
||||
|
||||
.admin-topbar-action {
|
||||
white-space: nowrap;
|
||||
min-height: 40px;
|
||||
padding: var(--space-2) var(--space-4);
|
||||
min-height: 32px;
|
||||
padding: 4px 10px;
|
||||
font-size: 0.8rem;
|
||||
}
|
||||
|
||||
.admin-shell .mud-button-root {
|
||||
min-height: 32px;
|
||||
font-size: 0.8rem;
|
||||
}
|
||||
|
||||
.admin-drawer {
|
||||
width: 280px;
|
||||
width: 208px;
|
||||
background-color: var(--bg-primary);
|
||||
border-right: 1px solid var(--border-color);
|
||||
display: flex;
|
||||
@@ -453,8 +495,8 @@ textarea:focus-visible {
|
||||
.admin-drawer-brand {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: var(--space-3);
|
||||
padding: var(--space-5) var(--space-4);
|
||||
gap: 10px;
|
||||
padding: 10px 12px;
|
||||
border-bottom: 1px solid var(--border-color-light);
|
||||
}
|
||||
|
||||
@@ -462,29 +504,39 @@ textarea:focus-visible {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
border-radius: var(--radius-md);
|
||||
background: linear-gradient(135deg, var(--primary-color) 0%, var(--primary-dark) 100%);
|
||||
color: var(--primary-contrast);
|
||||
font-weight: var(--font-weight-bold);
|
||||
font-size: 1.125rem;
|
||||
font-size: 1rem;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.admin-nav {
|
||||
padding: var(--space-4) 0;
|
||||
padding: 4px 0;
|
||||
flex: 1;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.admin-nav .mud-nav-link,
|
||||
.admin-nav .mud-nav-group-header {
|
||||
margin: var(--space-1) var(--space-2) !important;
|
||||
border-radius: var(--radius-md) !important;
|
||||
margin: 1px 6px !important;
|
||||
border-radius: 6px !important;
|
||||
transition: all var(--transition-base) !important;
|
||||
}
|
||||
|
||||
.admin-nav .mud-nav-link {
|
||||
min-height: 32px;
|
||||
font-size: 0.78rem;
|
||||
}
|
||||
|
||||
.admin-nav .mud-nav-group-header {
|
||||
min-height: 32px;
|
||||
font-size: 0.78rem;
|
||||
}
|
||||
|
||||
.admin-nav .mud-nav-link:hover {
|
||||
background-color: var(--primary-light) !important;
|
||||
}
|
||||
@@ -526,7 +578,7 @@ textarea:focus-visible {
|
||||
}
|
||||
|
||||
.admin-content {
|
||||
padding: var(--space-8);
|
||||
padding: 16px;
|
||||
max-width: 1400px;
|
||||
margin: 0 auto;
|
||||
width: 100%;
|
||||
@@ -540,9 +592,9 @@ textarea:focus-visible {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
gap: var(--space-6);
|
||||
margin-bottom: var(--space-8);
|
||||
padding-bottom: var(--space-6);
|
||||
gap: 16px;
|
||||
margin-bottom: 16px;
|
||||
padding-bottom: 10px;
|
||||
border-bottom: 1px solid var(--border-color);
|
||||
}
|
||||
|
||||
@@ -555,8 +607,8 @@ textarea:focus-visible {
|
||||
color: var(--primary-color);
|
||||
font-weight: var(--font-weight-semibold);
|
||||
text-transform: uppercase;
|
||||
font-size: var(--font-size-xs);
|
||||
letter-spacing: 0.5px;
|
||||
font-size: 0.7rem;
|
||||
letter-spacing: 0;
|
||||
margin-bottom: var(--space-1);
|
||||
}
|
||||
|
||||
@@ -564,31 +616,31 @@ textarea:focus-visible {
|
||||
display: block;
|
||||
color: var(--text-primary);
|
||||
font-weight: var(--font-weight-semibold);
|
||||
margin-bottom: var(--space-3);
|
||||
font-size: var(--font-size-3xl);
|
||||
margin-bottom: 2px;
|
||||
font-size: 1.45rem;
|
||||
line-height: var(--line-height-tight);
|
||||
}
|
||||
|
||||
.admin-page-subtitle {
|
||||
display: block;
|
||||
color: var(--text-secondary);
|
||||
font-size: var(--font-size-base);
|
||||
line-height: var(--line-height-normal);
|
||||
font-size: 0.8rem;
|
||||
line-height: 1.35;
|
||||
}
|
||||
|
||||
/* Metrics Grid */
|
||||
.admin-metric-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(4, 1fr);
|
||||
gap: var(--space-6);
|
||||
margin-bottom: var(--space-8);
|
||||
gap: var(--space-4);
|
||||
margin-bottom: var(--space-6);
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* Metric Card - Enterprise Grade */
|
||||
.admin-metric-card {
|
||||
padding: var(--space-6);
|
||||
border-radius: var(--radius-lg);
|
||||
padding: 10px;
|
||||
border-radius: var(--radius-md);
|
||||
background-color: var(--bg-primary);
|
||||
border: 1px solid var(--border-color);
|
||||
transition: all var(--transition-base);
|
||||
@@ -596,12 +648,52 @@ textarea:focus-visible {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
min-height: 160px;
|
||||
min-height: 116px;
|
||||
box-shadow: var(--shadow-xs);
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.admin-metric-card-body {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.admin-metric-card-label {
|
||||
font-size: 0.68rem;
|
||||
color: var(--text-tertiary);
|
||||
text-transform: uppercase;
|
||||
font-weight: var(--font-weight-semibold);
|
||||
}
|
||||
|
||||
.admin-metric-card-value-row {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
flex: 1;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.admin-metric-card-value {
|
||||
font-size: 1.45rem;
|
||||
font-weight: var(--font-weight-bold);
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.admin-metric-card-icon {
|
||||
font-size: 1.9rem;
|
||||
opacity: 0.14;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.admin-metric-card-caption {
|
||||
font-size: 0.78rem;
|
||||
color: var(--text-secondary);
|
||||
line-height: 1.3;
|
||||
}
|
||||
|
||||
.admin-metric-card::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
@@ -675,11 +767,11 @@ textarea:focus-visible {
|
||||
|
||||
/* Surfaces & Containers */
|
||||
.admin-surface {
|
||||
padding: var(--space-6) !important;
|
||||
border-radius: var(--radius-lg) !important;
|
||||
padding: 10px !important;
|
||||
border-radius: var(--radius-md) !important;
|
||||
background-color: var(--bg-primary) !important;
|
||||
border: 1px solid var(--border-color) !important;
|
||||
margin-bottom: var(--space-6) !important;
|
||||
margin-bottom: 10px !important;
|
||||
box-shadow: var(--shadow-xs);
|
||||
}
|
||||
|
||||
@@ -687,9 +779,9 @@ textarea:focus-visible {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: flex-start;
|
||||
gap: var(--space-4);
|
||||
margin-bottom: var(--space-5);
|
||||
padding-bottom: var(--space-4);
|
||||
gap: 10px;
|
||||
margin-bottom: 10px;
|
||||
padding-bottom: 6px;
|
||||
border-bottom: 1px solid var(--border-color-light);
|
||||
}
|
||||
|
||||
@@ -698,14 +790,14 @@ textarea:focus-visible {
|
||||
}
|
||||
|
||||
.admin-section-header h6 {
|
||||
font-size: var(--font-size-lg);
|
||||
font-size: 0.85rem;
|
||||
font-weight: var(--font-weight-semibold);
|
||||
color: var(--text-primary);
|
||||
margin-bottom: var(--space-2);
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
|
||||
.admin-section-header p {
|
||||
font-size: var(--font-size-sm);
|
||||
font-size: 0.75rem;
|
||||
color: var(--text-secondary);
|
||||
margin: 0;
|
||||
}
|
||||
@@ -714,7 +806,7 @@ textarea:focus-visible {
|
||||
.admin-table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
font-size: var(--font-size-sm);
|
||||
font-size: 0.75rem;
|
||||
}
|
||||
|
||||
.admin-table thead {
|
||||
@@ -723,13 +815,13 @@ textarea:focus-visible {
|
||||
}
|
||||
|
||||
.admin-table thead th {
|
||||
padding: var(--space-3) var(--space-4);
|
||||
padding: 5px 8px;
|
||||
text-align: left;
|
||||
font-weight: var(--font-weight-semibold);
|
||||
color: var(--text-secondary);
|
||||
font-size: var(--font-size-xs);
|
||||
font-size: 0.65rem;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.5px;
|
||||
letter-spacing: 0;
|
||||
}
|
||||
|
||||
.admin-table tbody tr {
|
||||
@@ -746,11 +838,16 @@ textarea:focus-visible {
|
||||
}
|
||||
|
||||
.admin-table tbody td {
|
||||
padding: var(--space-3) var(--space-4);
|
||||
padding: 5px 8px;
|
||||
color: var(--text-primary);
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.admin-table .mud-chip {
|
||||
font-size: 0.68rem;
|
||||
height: 22px;
|
||||
}
|
||||
|
||||
.admin-table tbody a {
|
||||
color: var(--primary-color);
|
||||
text-decoration: none;
|
||||
|
||||
@@ -5,6 +5,10 @@ window.taxbaikAdminSession = {
|
||||
window.location.pathname.toLowerCase().endsWith('/admin/login'));
|
||||
},
|
||||
|
||||
getViewportWidth: function () {
|
||||
return window.innerWidth || document.documentElement.clientWidth || 0;
|
||||
},
|
||||
|
||||
clearAuthToken: function () {
|
||||
try {
|
||||
localStorage.removeItem('auth_token');
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
CREATE TABLE IF NOT EXISTS portal_users (
|
||||
id SERIAL PRIMARY KEY,
|
||||
client_id INT NULL REFERENCES clients(id) ON DELETE SET NULL,
|
||||
email VARCHAR(255) NOT NULL UNIQUE,
|
||||
name VARCHAR(100) NOT NULL,
|
||||
phone VARCHAR(50),
|
||||
provider VARCHAR(30) NOT NULL DEFAULT 'local',
|
||||
provider_id VARCHAR(200),
|
||||
password_hash TEXT,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_portal_users_provider
|
||||
ON portal_users(provider, provider_id);
|
||||
@@ -0,0 +1,124 @@
|
||||
import { expect, test } from '@playwright/test';
|
||||
import { loginThroughAdminUi, navigateInBlazor } from './helpers/admin-auth';
|
||||
|
||||
const username = process.env.E2E_ADMIN_USERNAME ?? 'admin';
|
||||
const password = process.env.E2E_ADMIN_PASSWORD;
|
||||
const baseUrl = (process.env.E2E_BASE_URL ?? 'http://178.104.200.7/taxbaik').replace(/\/$/, '');
|
||||
|
||||
test.describe('admin CRM pages', () => {
|
||||
test.beforeEach(async ({ page }) => {
|
||||
test.skip(!password, 'E2E_ADMIN_PASSWORD is required.');
|
||||
await loginThroughAdminUi(page, baseUrl, username, password);
|
||||
});
|
||||
|
||||
test('TaxProfiles page loads with grid and add button', async ({ page }) => {
|
||||
await navigateInBlazor(page, `${baseUrl}/admin/tax-profiles`);
|
||||
await expect(page).toHaveURL(/\/admin\/tax-profiles$/);
|
||||
|
||||
await expect(page.locator('.admin-page-title')).toHaveText('세무 프로필', { timeout: 15_000 });
|
||||
|
||||
await expect(page.getByRole('button', { name: /새 프로필 추가/ })).toBeVisible();
|
||||
|
||||
await expect(page.locator('.admin-grid, .mud-alert')).toBeVisible({ timeout: 15_000 });
|
||||
});
|
||||
|
||||
test('TaxFilingSchedules page loads with D-day tracking', async ({ page }) => {
|
||||
await navigateInBlazor(page, `${baseUrl}/admin/tax-filing-schedules`);
|
||||
await expect(page).toHaveURL(/\/admin\/tax-filing-schedules$/);
|
||||
|
||||
await expect(page.locator('.admin-page-title')).toHaveText('신고 일정', { timeout: 15_000 });
|
||||
|
||||
await expect(page.getByRole('button', { name: /새 일정 추가/ })).toBeVisible();
|
||||
|
||||
await expect(page.locator('.admin-grid, .mud-alert')).toBeVisible({ timeout: 15_000 });
|
||||
});
|
||||
|
||||
test('Contracts page loads with MRR display', async ({ page }) => {
|
||||
await navigateInBlazor(page, `${baseUrl}/admin/contracts`);
|
||||
await expect(page).toHaveURL(/\/admin\/contracts$/);
|
||||
|
||||
await expect(page.locator('.admin-page-title')).toHaveText('계약 관리', { timeout: 15_000 });
|
||||
|
||||
await expect(page.getByRole('button', { name: /새 계약 추가/ })).toBeVisible();
|
||||
|
||||
await expect(page.locator('.admin-grid, .mud-alert')).toBeVisible({ timeout: 15_000 });
|
||||
});
|
||||
|
||||
test('ConsultingActivities page loads with activity records', async ({ page }) => {
|
||||
await navigateInBlazor(page, `${baseUrl}/admin/consulting-activities`);
|
||||
await expect(page).toHaveURL(/\/admin\/consulting-activities$/);
|
||||
|
||||
await expect(page.locator('.admin-page-title')).toHaveText('상담 활동 관리', { timeout: 15_000 });
|
||||
|
||||
await expect(page.getByRole('button', { name: /새 활동 기록/ })).toBeVisible();
|
||||
|
||||
await expect(page.locator('.admin-grid, .mud-alert')).toBeVisible({ timeout: 15_000 });
|
||||
});
|
||||
|
||||
test('RevenueTrackings page loads with payment status tracking', async ({ page }) => {
|
||||
await navigateInBlazor(page, `${baseUrl}/admin/revenue-trackings`);
|
||||
await expect(page).toHaveURL(/\/admin\/revenue-trackings$/);
|
||||
|
||||
await expect(page.locator('.admin-page-title')).toHaveText('수익 추적 관리', { timeout: 15_000 });
|
||||
|
||||
await expect(page.getByRole('button', { name: /새 청구 추가/ })).toBeVisible();
|
||||
|
||||
await expect(page.locator('.admin-grid, .mud-alert')).toBeVisible({ timeout: 15_000 });
|
||||
});
|
||||
|
||||
test('CRM navigation group is visible and expandable', async ({ page }) => {
|
||||
await navigateInBlazor(page, `${baseUrl}/admin/dashboard`);
|
||||
|
||||
// 좌측 패널 네비게이션 확인
|
||||
const crmGroup = page.getByText('CRM & 세무관리');
|
||||
await expect(crmGroup).toBeVisible({ timeout: 10_000 });
|
||||
|
||||
// CRM 그룹의 모든 링크 확인
|
||||
const expectedLinks = [
|
||||
'세무 프로필',
|
||||
'신고 일정',
|
||||
'계약 관리',
|
||||
'상담 활동',
|
||||
'수익 추적'
|
||||
];
|
||||
|
||||
for (const linkText of expectedLinks) {
|
||||
const link = page.getByRole('link', { name: linkText });
|
||||
await expect(link).toBeVisible({ timeout: 10_000 });
|
||||
}
|
||||
});
|
||||
|
||||
test('TaxProfiles modal dialog opens on add button click', async ({ page }) => {
|
||||
await navigateInBlazor(page, `${baseUrl}/admin/tax-profiles`);
|
||||
|
||||
const addButton = page.getByRole('button', { name: /새 프로필 추가/ });
|
||||
await expect(addButton).toBeVisible();
|
||||
await addButton.click();
|
||||
await expect(page).toHaveURL(/\/taxbaik\/admin\/tax-profiles$/);
|
||||
await expect(addButton).toBeVisible();
|
||||
});
|
||||
|
||||
test('No console errors on CRM page navigation', async ({ page }) => {
|
||||
const consoleErrors: string[] = [];
|
||||
page.on('console', message => {
|
||||
if (message.type() === 'error') {
|
||||
consoleErrors.push(message.text());
|
||||
}
|
||||
});
|
||||
|
||||
const crmPages = [
|
||||
'/admin/tax-profiles',
|
||||
'/admin/tax-filing-schedules',
|
||||
'/admin/contracts',
|
||||
'/admin/consulting-activities',
|
||||
'/admin/revenue-trackings'
|
||||
];
|
||||
|
||||
for (const path of crmPages) {
|
||||
await navigateInBlazor(page, `${baseUrl}${path}`);
|
||||
await page.waitForTimeout(2000);
|
||||
}
|
||||
|
||||
expect(consoleErrors, 'no console errors during CRM navigation').toEqual([]);
|
||||
});
|
||||
});
|
||||
@@ -27,7 +27,7 @@ test.describe('admin authentication', () => {
|
||||
await page.getByRole('button', { name: '로그인' }).click();
|
||||
|
||||
await expect(page).toHaveURL(/\/taxbaik\/admin\/dashboard$/);
|
||||
await expect(page.getByRole('heading', { name: '대시보드' })).toBeVisible({ timeout: 20_000 });
|
||||
await expect(page.getByRole('heading', { name: '대시보드' }).first()).toBeVisible({ timeout: 20_000 });
|
||||
await expect(page.getByRole('link', { name: /로그아웃/ })).toBeVisible();
|
||||
expect(consoleErrors, 'browser console/page errors').toEqual([]);
|
||||
});
|
||||
|
||||
@@ -16,6 +16,7 @@ test.describe('contact submit', () => {
|
||||
email: `public-${stamp}@example.com`,
|
||||
serviceType: '기타',
|
||||
message: 'Playwright로 전송한 공개 문의 테스트입니다.',
|
||||
suppressNotification: true,
|
||||
},
|
||||
});
|
||||
expect(createResponse.ok()).toBeTruthy();
|
||||
@@ -39,6 +40,7 @@ test.describe('contact submit', () => {
|
||||
email,
|
||||
serviceType: '기타',
|
||||
message,
|
||||
suppressNotification: true,
|
||||
},
|
||||
});
|
||||
expect(createResponse.ok()).toBeTruthy();
|
||||
|
||||
@@ -38,7 +38,7 @@ export async function loginThroughAdminUi(
|
||||
await page.locator('input[placeholder="비밀번호"]').fill(password);
|
||||
await page.getByRole('button', { name: '로그인' }).click();
|
||||
await expect(page).toHaveURL(/\/taxbaik\/admin\/dashboard$/);
|
||||
await expect(page.getByRole('heading', { name: '대시보드' })).toBeVisible({ timeout: 20_000 });
|
||||
await expect(page.getByRole('heading', { name: '대시보드' }).first()).toBeVisible({ timeout: 20_000 });
|
||||
}
|
||||
|
||||
export async function navigateInBlazor(page: Page, targetUrl: string) {
|
||||
|
||||
@@ -20,6 +20,7 @@ test.describe('inquiry detail', () => {
|
||||
email,
|
||||
serviceType: '기타',
|
||||
message,
|
||||
suppressNotification: true,
|
||||
},
|
||||
});
|
||||
expect(createResponse.ok()).toBeTruthy();
|
||||
@@ -39,9 +40,11 @@ test.describe('inquiry detail', () => {
|
||||
await expect(page.getByText(phone, { exact: true }).first()).toBeVisible();
|
||||
await expect(page.getByText(message, { exact: true }).first()).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: '신규' })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: '연락함' })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: '완료' })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: '문의 목록으로 돌아가기' })).toBeVisible();
|
||||
await expect(page.getByRole('link', { name: '다른 문의도 보기' })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: '상담중' })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: '계약완료' })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: '거절' })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: '종결' })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: '문의 목록으로' })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: '고객으로 등록' })).toBeVisible();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -16,6 +16,7 @@ test.describe('public smoke', () => {
|
||||
await page.goto(`${baseUrl}/contact`);
|
||||
await expect(page).toHaveTitle(/상담 신청/);
|
||||
await expect(page.getByRole('heading', { name: /상담 신청/ })).toBeVisible();
|
||||
await expect(page.getByRole('link', { name: /뒤로가기/ })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: /상담신청/ })).toBeVisible();
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user