Merge pull request 'feat(content-banner): 콘텐츠 배너 예약 기간 적용' (#106) from test into main

Reviewed-on: #106
This commit was merged in pull request #106.
This commit is contained in:
2026-10-27 12:39:53 +00:00
4 changed files with 400 additions and 2 deletions
+1
View File
@@ -8,6 +8,7 @@
"build": "vue-cli-service build",
"build_development": "vue-cli-service build --mode development",
"test:gift": "node tests/gift.test.js && node tests/gift_category.test.js && node tests/gift_size.test.js && node tests/gift_mailbox.test.js",
"test:banner": "node tests/audio_content_banner.test.js",
"lint": "vue-cli-service lint"
},
"dependencies": {
+71
View File
@@ -0,0 +1,71 @@
const DATE_TIME_PATTERN = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}$/
export function toDateTimeLocalInput(value) {
if (value === null || value === undefined) return ''
const text = String(value).trim()
if (!text || text === 'null') return ''
return text.replace(' ', 'T').slice(0, 16)
}
export function toServerDateTime(value) {
if (value === null || value === undefined) return null
const text = String(value).trim()
if (!text || text === 'null') return null
return text.replace('T', ' ').slice(0, 16)
}
export function formatScheduleRange(startDate, endDate) {
const start = toServerDateTime(startDate)
const end = toServerDateTime(endDate)
if (!start && !end) return '상시 노출'
if (start && !end) return `${start} ~`
if (!start && end) return `~ ${end}`
return `${start} ~ ${end}`
}
export function createBannerScheduleForm(banner = {}) {
return {
start_date: toDateTimeLocalInput(banner.startDate),
end_date: toDateTimeLocalInput(banner.endDate)
}
}
export function validateBannerSchedule(form = {}) {
const errors = {}
const start = toServerDateTime(form.start_date)
const end = toServerDateTime(form.end_date)
if (start !== null && !DATE_TIME_PATTERN.test(start)) {
errors.start_date = '시작 일시 형식이 올바르지 않습니다. (yyyy-MM-dd HH:mm)'
}
if (end !== null && !DATE_TIME_PATTERN.test(end)) {
errors.end_date = '종료 일시 형식이 올바르지 않습니다. (yyyy-MM-dd HH:mm)'
}
if (!errors.start_date && !errors.end_date && start !== null && end !== null && start > end) {
errors.end_date = '종료 일시는 시작 일시보다 빠를 수 없습니다.'
}
return errors
}
export function applyScheduleToSaveRequest(request, form = {}) {
const start = toServerDateTime(form.start_date)
const end = toServerDateTime(form.end_date)
if (start !== null) request.startDate = start
if (end !== null) request.endDate = end
return request
}
export function applyScheduleToModifyRequest(request, form = {}, banner = {}) {
const start = toServerDateTime(form.start_date)
const end = toServerDateTime(form.end_date)
const originalStart = toServerDateTime(banner.startDate)
const originalEnd = toServerDateTime(banner.endDate)
if (start !== originalStart) request.startDate = start
if (end !== originalEnd) request.endDate = end
return request
}
+77 -2
View File
@@ -60,6 +60,9 @@
<v-img :src="item.thumbnailImageUrl" />
<v-spacer />
</v-card-title>
<v-card-subtitle class="text-center schedule-text">
{{ scheduleRangeText(item) }}
</v-card-subtitle>
<v-card-actions>
<v-spacer />
<v-btn
@@ -245,6 +248,38 @@
</v-col>
</v-row>
</v-card-text>
<v-card-text>
<v-row align="center">
<v-col cols="4">
노출 기간 (한국 시간 기준)
</v-col>
<v-col cols="4">
<v-text-field
v-model="banner.start_date"
type="datetime-local"
label="시작 일시 (선택)"
:error-messages="schedule_errors.start_date"
clearable
@click:clear="banner.start_date = ''"
/>
</v-col>
<v-col cols="4">
<v-text-field
v-model="banner.end_date"
type="datetime-local"
label="종료 일시 (선택)"
:error-messages="schedule_errors.end_date"
clearable
@click:clear="banner.end_date = ''"
/>
</v-col>
</v-row>
<v-row>
<v-col class="schedule-text">
비워두면 해당 경계의 예약 제한이 없습니다. 입력한 시간은 한국 시간(KST)으로 저장됩니다.
</v-col>
</v-row>
</v-card-text>
<div class="image-select">
<label for="image">
배너 이미지 등록
@@ -372,6 +407,13 @@ import * as seriesApi from "@/api/audio_content_series"
import * as memberApi from "@/api/member";
import * as eventApi from "@/api/event";
import * as api from "@/api/audio_content"
import {
applyScheduleToModifyRequest,
applyScheduleToSaveRequest,
createBannerScheduleForm,
formatScheduleRange,
validateBannerSchedule
} from "@/utils/audio_content_banner"
export default {
name: "AudioContentMainTopBanner",
@@ -391,7 +433,8 @@ export default {
crop_src: null,
selected_file_for_crop: null,
selected_banner: {},
banner: {type: 'CREATOR', tab_id: 1, lang: 'ko'},
banner: {type: 'CREATOR', tab_id: 1, lang: 'ko', ...createBannerScheduleForm()},
schedule_errors: {},
banners: [],
events: [],
creators: [],
@@ -535,7 +578,8 @@ export default {
this.is_selecting = false
this.show_write_dialog = false
this.show_delete_confirm_dialog = false
this.banner = {type: 'CREATOR', tab_id: 1, lang: 'ko'}
this.banner = {type: 'CREATOR', tab_id: 1, lang: 'ko', ...createBannerScheduleForm()}
this.schedule_errors = {}
this.selected_banner = {}
this.search_query_creator = ''
this.search_query_series = ''
@@ -588,6 +632,10 @@ export default {
this.banner.link = banner.link
this.banner.is_adult = banner.isAdult
this.banner.tab_id = banner.tabId
const schedule = createBannerScheduleForm(banner)
this.banner.start_date = schedule.start_date
this.banner.end_date = schedule.end_date
this.schedule_errors = {}
// 수정 시 언어는 변경 불가하므로 UI를 표시하지 않음. 필요 시 내부 유지만 함 (기본값 또는 서버 값 사용)
if (banner.lang) {
this.banner.lang = banner.lang
@@ -633,9 +681,26 @@ export default {
return false;
}
return this.validateSchedule()
},
validateSchedule() {
const errors = validateBannerSchedule(this.banner)
this.schedule_errors = errors
const messages = Object.keys(errors).map((key) => errors[key])
if (messages.length > 0) {
this.notifyError(messages[0])
return false;
}
return true
},
scheduleRangeText(banner) {
return formatScheduleRange(banner.startDate, banner.endDate)
},
deleteConfirm(banner) {
this.selected_banner = banner
this.show_delete_confirm_dialog = true
@@ -675,6 +740,8 @@ export default {
request.tabId = this.banner.tab_id
}
applyScheduleToSaveRequest(request, this.banner)
formData.append("request", JSON.stringify(request))
const res = await api.saveBanner(formData)
@@ -695,6 +762,7 @@ export default {
},
async modify() {
if (!this.validateSchedule()) return;
if (this.is_loading) return;
this.is_loading = true
@@ -750,6 +818,8 @@ export default {
request.tabId = this.banner.tab_id
}
applyScheduleToModifyRequest(request, this.banner, this.selected_banner)
formData.append("request", JSON.stringify(request))
const res = await api.modifyBanner(formData)
@@ -945,6 +1015,11 @@ export default {
border: 0;
}
.schedule-text {
font-size: 12px;
color: #666;
}
.image-preview {
max-width: 100%;
width: 250px;
+251
View File
@@ -0,0 +1,251 @@
const assert = require('assert').strict
const fs = require('fs')
const path = require('path')
const Module = require('module')
const { transformSync } = require('@babel/core')
const compiler = require('vue-template-compiler')
const Vue = require('vue')
const root = path.resolve(__dirname, '..')
const originalResolve = Module._resolveFilename
Module._resolveFilename = function(request, parent, ...rest) {
return originalResolve.call(this, request.startsWith('@/') ? path.join(root, 'src', request.slice(2)) : request, parent, ...rest)
}
const originalJs = require.extensions['.js']
function compileScript(source, filename) {
return transformSync(source, {
filename,
babelrc: false,
configFile: false,
plugins: ['@babel/plugin-transform-modules-commonjs']
}).code
}
require.extensions['.js'] = (module, filename) => {
if (!filename.startsWith(path.join(root, 'src') + path.sep)) return originalJs(module, filename)
module._compile(compileScript(fs.readFileSync(filename, 'utf8'), filename), filename)
}
require.extensions['.vue'] = (module, filename) => {
const { script, template } = compiler.parseComponent(fs.readFileSync(filename, 'utf8'))
const compiled = compiler.compile(template.content)
assert.deepEqual(compiled.errors, [], `${filename}: 템플릿 컴파일`)
module._compile(compileScript(script.content, filename), filename)
Object.assign(module.exports.default, compiler.compileToFunctions(template.content))
}
const {
applyScheduleToModifyRequest,
applyScheduleToSaveRequest,
createBannerScheduleForm,
formatScheduleRange,
toDateTimeLocalInput,
toServerDateTime,
validateBannerSchedule
} = require('../src/utils/audio_content_banner')
const Banner = require('../src/views/Content/ContentMainTopBanner.vue').default
const tests = []
const test = (name, run) => tests.push({ name, run })
const envelope = data => ({ success: true, data })
const banner = (overrides = {}) => ({
id: 1, type: 'LINK', link: 'https://sodalive.net', isAdult: false, tabId: 1, lang: 'ko',
thumbnailImageUrl: 'https://cdn/banner.png', startDate: null, endDate: null,
...overrides
})
function nodes(vnode) {
if (!vnode) return []
return [vnode].concat((vnode.children || (vnode.componentOptions && vnode.componentOptions.children) || []).flatMap(nodes))
}
const text = vnode => nodes(vnode).map(node => node.text || '').join('').trim()
function activatorNodes(vm) {
const dialog = nodes(vm._render()).find(node => node.tag === 'v-dialog' && node.data.scopedSlots && node.data.scopedSlots.activator)
return [].concat(dialog.data.scopedSlots.activator({ on: {}, attrs: {} }))
}
const activatorText = vm => activatorNodes(vm).flatMap(nodes).map(node => node.text || '').join(' ')
function page() {
const errors = []
const successes = []
const vm = new Vue({ ...Banner, created: undefined })
vm.$dialog = { notify: { error: message => errors.push(message), success: message => successes.push(message) } }
return { vm, errors, successes }
}
function requestOf(formData) {
return JSON.parse(formData.get('request'))
}
function stubFormData() {
global.FormData = class {
constructor() { this.parts = new Map() }
append(key, value) { this.parts.set(key, value) }
get(key) { return this.parts.has(key) ? this.parts.get(key) : null }
has(key) { return this.parts.has(key) }
}
}
test('예약 기간 변환: KST 문자열과 datetime-local 값을 시간 이동 없이 왕복한다', () => {
assert.equal(toDateTimeLocalInput('2026-10-28 10:30'), '2026-10-28T10:30')
assert.equal(toServerDateTime('2026-10-28T10:30'), '2026-10-28 10:30')
assert.equal(toServerDateTime(toDateTimeLocalInput('2026-10-28 10:30')), '2026-10-28 10:30')
assert.equal(toServerDateTime('2026-10-28T10:30:00'), '2026-10-28 10:30')
for (const empty of [null, undefined, '', ' ', 'null']) {
assert.equal(toDateTimeLocalInput(empty), '')
assert.equal(toServerDateTime(empty), null)
}
})
test('예약 기간 표시: 네 조합과 미설정 배너를 목록에서 확인할 수 있다', () => {
assert.equal(formatScheduleRange(null, null), '상시 노출')
assert.equal(formatScheduleRange('2026-10-28 10:30', null), '2026-10-28 10:30 ~')
assert.equal(formatScheduleRange(null, '2026-10-29 23:59'), '~ 2026-10-29 23:59')
assert.equal(formatScheduleRange('2026-10-28 10:30', '2026-10-29 23:59'), '2026-10-28 10:30 ~ 2026-10-29 23:59')
const { vm } = page()
vm.banners = [
banner({ id: 1 }),
banner({ id: 2, startDate: '2030-01-01 00:00' }),
banner({ id: 3, endDate: '2020-01-01 00:00' }),
banner({ id: 4, startDate: '2026-10-28 10:30', endDate: '2026-10-29 23:59' })
]
const rendered = activatorText(vm)
assert.ok(rendered.includes('상시 노출'))
assert.ok(rendered.includes('2030-01-01 00:00 ~'))
assert.ok(rendered.includes('~ 2020-01-01 00:00'))
assert.ok(rendered.includes('2026-10-28 10:30 ~ 2026-10-29 23:59'))
})
test('예약 기간 검증: 역전 범위는 거부하고 같은 분과 한쪽만 입력은 허용한다', () => {
assert.deepEqual(validateBannerSchedule({ start_date: '', end_date: '' }), {})
assert.deepEqual(validateBannerSchedule({ start_date: '2026-10-28T10:30', end_date: '' }), {})
assert.deepEqual(validateBannerSchedule({ start_date: null, end_date: '2026-10-28T10:30' }), {})
assert.deepEqual(validateBannerSchedule({ start_date: '2026-10-28T10:30', end_date: '2026-10-28T10:30' }), {})
assert.deepEqual(validateBannerSchedule({ start_date: '2020-01-01T00:00', end_date: '2020-01-01T00:01' }), {})
const reversed = validateBannerSchedule({ start_date: '2026-10-28T10:31', end_date: '2026-10-28T10:30' })
assert.deepEqual(Object.keys(reversed), ['end_date'])
assert.equal(typeof reversed.end_date, 'string')
assert.deepEqual(Object.keys(validateBannerSchedule({ start_date: '2026-10-28', end_date: '' })), ['start_date'])
})
test('예약 기간 등록 요청: 입력한 값만 포함하고 비우면 생략한다', () => {
assert.deepEqual(applyScheduleToSaveRequest({ type: 'LINK' }, { start_date: '', end_date: '' }), { type: 'LINK' })
assert.deepEqual(
applyScheduleToSaveRequest({ type: 'LINK' }, { start_date: '2026-10-28T10:30', end_date: '2026-10-29T23:59' }),
{ type: 'LINK', startDate: '2026-10-28 10:30', endDate: '2026-10-29 23:59' }
)
assert.deepEqual(
applyScheduleToSaveRequest({}, { start_date: '2026-10-28T10:30', end_date: null }),
{ startDate: '2026-10-28 10:30' }
)
})
test('예약 기간 수정 요청: 미변경은 생략하고 지운 경계는 null을 전송한다', () => {
const saved = { startDate: '2026-10-28 10:30', endDate: '2026-10-29 23:59' }
assert.deepEqual(applyScheduleToModifyRequest({ id: 1 }, createBannerScheduleForm(saved), saved), { id: 1 })
assert.deepEqual(
applyScheduleToModifyRequest({ id: 1 }, { start_date: '', end_date: '2026-10-29T23:59' }, saved),
{ id: 1, startDate: null }
)
assert.deepEqual(
applyScheduleToModifyRequest({ id: 1 }, { start_date: null, end_date: null }, saved),
{ id: 1, startDate: null, endDate: null }
)
assert.deepEqual(
applyScheduleToModifyRequest({ id: 1 }, { start_date: '2026-10-28T10:30', end_date: '2026-11-01T00:00' }, saved),
{ id: 1, endDate: '2026-11-01 00:00' }
)
assert.deepEqual(applyScheduleToModifyRequest({ id: 1 }, createBannerScheduleForm(banner()), banner()), { id: 1 })
})
test('수정 폼: 조회값으로 초기화되고 다른 배너 입력 상태가 남지 않는다', () => {
const { vm } = page()
vm.showModifyBannerDialog(banner({ startDate: '2026-10-28 10:30', endDate: '2026-10-29 23:59' }))
assert.equal(vm.banner.start_date, '2026-10-28T10:30')
assert.equal(vm.banner.end_date, '2026-10-29T23:59')
const fields = nodes(vm._render()).filter(node => node.tag === 'v-text-field' && node.data.attrs.type === 'datetime-local')
assert.deepEqual(fields.map(field => field.data.attrs.label), ['시작 일시 (선택)', '종료 일시 (선택)'])
assert.ok(text(vm._render()).includes('한국 시간'))
vm.cancel()
assert.deepEqual(createBannerScheduleForm(), { start_date: '', end_date: '' })
assert.equal(vm.banner.start_date, '')
assert.equal(vm.banner.end_date, '')
vm.showModifyBannerDialog(banner({ id: 2 }))
assert.equal(vm.banner.start_date, '')
assert.equal(vm.banner.end_date, '')
})
test('수정 저장: 날짜만 바꾸면 이미지 없이 request JSON만 전송한다', async () => {
stubFormData()
const { vm, successes } = page()
const calls = []
Vue.axios = {
put: async (...args) => { calls.push(args); return { status: 200, data: envelope(null) } },
get: async () => ({ status: 200, data: envelope([]) })
}
vm.showModifyBannerDialog(banner({ startDate: '2026-10-28 10:30', endDate: '2026-10-29 23:59' }))
vm.banner.thumbnail_image = null
vm.banner.start_date = '2026-11-01T09:00'
vm.banner.end_date = ''
await vm.modify()
assert.equal(calls.length, 1)
assert.equal(calls[0][0], '/admin/audio-content/banner')
const formData = calls[0][1]
assert.equal(formData.has('image'), false)
assert.deepEqual(requestOf(formData), { id: 1, startDate: '2026-11-01 09:00', endDate: null })
assert.deepEqual(successes, ['수정되었습니다.'])
})
test('수정 저장: 역전 범위는 저장을 막고 success=false 메시지를 노출한다', async () => {
stubFormData()
const blocked = page()
const calls = []
Vue.axios = { put: async () => { calls.push('PUT'); return { status: 200, data: envelope(null) } } }
blocked.vm.showModifyBannerDialog(banner())
blocked.vm.banner.start_date = '2026-10-29T10:31'
blocked.vm.banner.end_date = '2026-10-29T10:30'
await blocked.vm.modify()
assert.deepEqual(calls, [])
assert.equal(blocked.errors.length, 1)
assert.deepEqual(Object.keys(blocked.vm.schedule_errors), ['end_date'])
const failed = page()
Vue.axios = { put: async () => ({ status: 200, data: { success: false, message: '예약 기간이 올바르지 않습니다.' } }) }
failed.vm.showModifyBannerDialog(banner())
failed.vm.banner.start_date = '2026-10-29T10:30'
await failed.vm.modify()
assert.deepEqual(failed.errors, ['예약 기간이 올바르지 않습니다.'])
assert.deepEqual(failed.successes, [])
})
test('등록 저장: 이미지와 예약 기간을 함께 전송하고 성공 후 목록을 재조회한다', async () => {
stubFormData()
const { vm, successes } = page()
const calls = []
Vue.axios = {
post: async (...args) => { calls.push(args); return { status: 200, data: envelope(null) } },
get: async (...args) => { calls.push(args); return { status: 200, data: envelope([banner()]) } }
}
vm.banner.type = 'LINK'
vm.banner.link = 'https://sodalive.net'
vm.banner.is_adult = false
vm.banner.thumbnail_image = { name: 'banner.png' }
vm.banner.start_date = '2026-10-28T10:30'
vm.banner.end_date = '2026-10-29T23:59'
await vm.submit()
assert.equal(calls[0][0], '/admin/audio-content/banner')
assert.equal(calls[0][1].get('image').name, 'banner.png')
assert.deepEqual(requestOf(calls[0][1]), {
type: 'LINK', isAdult: false, lang: 'ko', link: 'https://sodalive.net',
startDate: '2026-10-28 10:30', endDate: '2026-10-29 23:59'
})
assert.deepEqual(calls[1], ['/admin/audio-content/banner?tabId=1'])
assert.deepEqual(successes, ['등록되었습니다.'])
assert.deepEqual(Array.from(vm.banners), [banner()])
})
;(async () => {
for (const { name, run } of tests) {
try {
await run()
console.log(`PASS ${name}`)
} catch (error) {
process.exitCode = 1
console.error(`FAIL ${name}`, error)
}
}
})()