@things-factory/shell 8.0.38 → 9.0.0-9.0.0-beta.59.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/_index.html +0 -1
- package/bin/things-factory-migration +6 -3
- package/client/themes/calendar-theme.css +3 -1
- package/client/themes/index.css +2 -1
- package/dist-server/index.d.ts +12 -12
- package/dist-server/index.js +12 -12
- package/dist-server/index.js.map +1 -1
- package/dist-server/initializers/database.js +4 -10
- package/dist-server/initializers/database.js.map +1 -1
- package/dist-server/initializers/ormconfig.d.ts +2 -0
- package/dist-server/initializers/ormconfig.js +30 -0
- package/dist-server/initializers/ormconfig.js.map +1 -0
- package/dist-server/middlewares/domain-middleware.js +2 -2
- package/dist-server/middlewares/domain-middleware.js.map +1 -1
- package/dist-server/middlewares/index.d.ts +1 -1
- package/dist-server/middlewares/index.js +3 -3
- package/dist-server/middlewares/index.js.map +1 -1
- package/dist-server/migrations/1000000000000-SeedDomain.js +4 -4
- package/dist-server/migrations/1000000000000-SeedDomain.js.map +1 -1
- package/dist-server/migrations/index.js.map +1 -1
- package/dist-server/process-cleaner.d.ts +1 -0
- package/dist-server/process-cleaner.js +92 -0
- package/dist-server/process-cleaner.js.map +1 -0
- package/dist-server/routers/domain-router.js +3 -3
- package/dist-server/routers/domain-router.js.map +1 -1
- package/dist-server/routers/global-router.js +6 -6
- package/dist-server/routers/global-router.js.map +1 -1
- package/dist-server/routers/index.d.ts +3 -3
- package/dist-server/routers/index.js +3 -3
- package/dist-server/routers/index.js.map +1 -1
- package/dist-server/schema.js +5 -4
- package/dist-server/schema.js.map +1 -1
- package/dist-server/server-dev.js +37 -39
- package/dist-server/server-dev.js.map +1 -1
- package/dist-server/server.js +34 -36
- package/dist-server/server.js.map +1 -1
- package/dist-server/service/attribute-set/attribute-set-item-type.js +3 -3
- package/dist-server/service/attribute-set/attribute-set-item-type.js.map +1 -1
- package/dist-server/service/attribute-set/attribute-set-mutation.d.ts +2 -2
- package/dist-server/service/attribute-set/attribute-set-mutation.js +16 -16
- package/dist-server/service/attribute-set/attribute-set-mutation.js.map +1 -1
- package/dist-server/service/attribute-set/attribute-set-query.d.ts +3 -3
- package/dist-server/service/attribute-set/attribute-set-query.js +15 -15
- package/dist-server/service/attribute-set/attribute-set-query.js.map +1 -1
- package/dist-server/service/attribute-set/attribute-set-type.d.ts +2 -2
- package/dist-server/service/attribute-set/attribute-set-type.js +5 -5
- package/dist-server/service/attribute-set/attribute-set-type.js.map +1 -1
- package/dist-server/service/attribute-set/attribute-set.d.ts +1 -1
- package/dist-server/service/attribute-set/attribute-set.js +2 -2
- package/dist-server/service/attribute-set/attribute-set.js.map +1 -1
- package/dist-server/service/attribute-set/index.d.ts +3 -3
- package/dist-server/service/attribute-set/index.js +5 -5
- package/dist-server/service/attribute-set/index.js.map +1 -1
- package/dist-server/service/common-types/index.d.ts +6 -6
- package/dist-server/service/common-types/index.js +6 -6
- package/dist-server/service/common-types/index.js.map +1 -1
- package/dist-server/service/common-types/list-param.js +2 -2
- package/dist-server/service/common-types/list-param.js.map +1 -1
- package/dist-server/service/common-types/log.js +2 -2
- package/dist-server/service/common-types/log.js.map +1 -1
- package/dist-server/service/common-types/scalar-object.d.ts +2 -1
- package/dist-server/service/common-types/scalar-object.js +2 -2
- package/dist-server/service/common-types/scalar-object.js.map +1 -1
- package/dist-server/service/directive-transaction/index.d.ts +1 -1
- package/dist-server/service/directive-transaction/index.js +1 -1
- package/dist-server/service/directive-transaction/index.js.map +1 -1
- package/dist-server/service/directive-transaction/transaction.js +2 -2
- package/dist-server/service/directive-transaction/transaction.js.map +1 -1
- package/dist-server/service/domain/domain-mutation.d.ts +2 -2
- package/dist-server/service/domain/domain-mutation.js +21 -21
- package/dist-server/service/domain/domain-mutation.js.map +1 -1
- package/dist-server/service/domain/domain-query.js +6 -6
- package/dist-server/service/domain/domain-query.js.map +1 -1
- package/dist-server/service/domain/domain-types.d.ts +2 -2
- package/dist-server/service/domain/domain-types.js +6 -6
- package/dist-server/service/domain/domain-types.js.map +1 -1
- package/dist-server/service/domain/index.d.ts +3 -3
- package/dist-server/service/domain/index.js +5 -5
- package/dist-server/service/domain/index.js.map +1 -1
- package/dist-server/service/index.d.ts +7 -7
- package/dist-server/service/index.js +16 -16
- package/dist-server/service/index.js.map +1 -1
- package/dist-server/service/subscription-data/data-resolver.d.ts +1 -1
- package/dist-server/service/subscription-data/data-resolver.js +4 -4
- package/dist-server/service/subscription-data/data-resolver.js.map +1 -1
- package/dist-server/service/subscription-data/data-types.d.ts +1 -1
- package/dist-server/service/subscription-data/data-types.js +5 -5
- package/dist-server/service/subscription-data/data-types.js.map +1 -1
- package/dist-server/service/subscription-data/index.d.ts +1 -1
- package/dist-server/service/subscription-data/index.js +2 -2
- package/dist-server/service/subscription-data/index.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/dist-server/typeorm/encrypt-transform.js +3 -3
- package/dist-server/typeorm/encrypt-transform.js.map +1 -1
- package/dist-server/utils/get-times-for-period.d.ts +24 -4
- package/dist-server/utils/get-times-for-period.js +42 -5
- package/dist-server/utils/get-times-for-period.js.map +1 -1
- package/dist-server/utils/index.d.ts +8 -8
- package/dist-server/utils/index.js +8 -8
- package/dist-server/utils/index.js.map +1 -1
- package/dist-server/utils/list-param-adjuster.d.ts +1 -1
- package/dist-server/utils/list-param-adjuster.js.map +1 -1
- package/dist-server/utils/list-params-converter.d.ts +2 -2
- package/dist-server/utils/list-params-converter.js +2 -2
- package/dist-server/utils/list-params-converter.js.map +1 -1
- package/dist-server/utils/list-query-builder.d.ts +1 -1
- package/dist-server/utils/list-query-builder.js +7 -7
- package/dist-server/utils/list-query-builder.js.map +1 -1
- package/dist-server/utils/publish-progress.js +2 -2
- package/dist-server/utils/publish-progress.js.map +1 -1
- package/package.json +14 -19
- package/translations/en.json +1 -0
- package/translations/ja.json +1 -0
- package/translations/ko.json +2 -1
- package/translations/ms.json +1 -0
- package/translations/zh.json +1 -0
- package/views/public/home.html +0 -1
- package/client/hot-client/hot.js +0 -140
- package/client/hot-client/index.js +0 -103
- package/client/hot-client/log.js +0 -44
- package/client/hot-client/socket.js +0 -63
- package/client/scene/scene-components.js +0 -3
- package/client/scene/scene-player.js +0 -103
- package/client/scene/scene-viewer.js +0 -106
- package/client/scene/things-scene-components.import +0 -1
- package/ormconfig.js +0 -31
- package/server/graphql-local-client.ts +0 -59
- package/server/index.ts +0 -13
- package/server/initializers/database.ts +0 -96
- package/server/initializers/naming-strategy.ts +0 -14
- package/server/middlewares/domain-middleware.ts +0 -60
- package/server/middlewares/index.ts +0 -43
- package/server/migrations/1000000000000-SeedDomain.ts +0 -37
- package/server/migrations/index.ts +0 -9
- package/server/pubsub-log-transport.ts +0 -59
- package/server/pubsub.ts +0 -84
- package/server/routers/domain-router.ts +0 -13
- package/server/routers/global-router.ts +0 -76
- package/server/routers/graphql-router.ts +0 -3
- package/server/routers/index.ts +0 -3
- package/server/schema.ts +0 -163
- package/server/server-dev.ts +0 -305
- package/server/server.ts +0 -296
- package/server/service/attribute-set/attribute-set-item-type.ts +0 -65
- package/server/service/attribute-set/attribute-set-mutation.ts +0 -125
- package/server/service/attribute-set/attribute-set-query.ts +0 -36
- package/server/service/attribute-set/attribute-set-type.ts +0 -46
- package/server/service/attribute-set/attribute-set.ts +0 -35
- package/server/service/attribute-set/index.ts +0 -6
- package/server/service/common-types/index.ts +0 -6
- package/server/service/common-types/list-param.ts +0 -61
- package/server/service/common-types/log.ts +0 -17
- package/server/service/common-types/object-ref.ts +0 -13
- package/server/service/common-types/scalar-any.ts +0 -44
- package/server/service/common-types/scalar-date.ts +0 -22
- package/server/service/common-types/scalar-object.ts +0 -15
- package/server/service/directive-transaction/index.ts +0 -1
- package/server/service/directive-transaction/transaction.ts +0 -40
- package/server/service/domain/domain-mutation.ts +0 -120
- package/server/service/domain/domain-query.ts +0 -55
- package/server/service/domain/domain-types.ts +0 -69
- package/server/service/domain/domain.ts +0 -112
- package/server/service/domain/index.ts +0 -6
- package/server/service/index.ts +0 -32
- package/server/service/subscription-data/data-resolver.ts +0 -37
- package/server/service/subscription-data/data-types.ts +0 -16
- package/server/service/subscription-data/index.ts +0 -4
- package/server/typeorm/encrypt-transform.ts +0 -70
- package/server/typeorm/get-data-encryption-key.ts +0 -13
- package/server/typeorm/json5-transform.ts +0 -26
- package/server/typeorm/round-transform.ts +0 -20
- package/server/utils/condition-builder.ts +0 -145
- package/server/utils/get-domain.ts +0 -228
- package/server/utils/get-query-builder-from-list-params.ts +0 -469
- package/server/utils/get-times-for-period.ts +0 -60
- package/server/utils/index.ts +0 -8
- package/server/utils/list-param-adjuster.ts +0 -21
- package/server/utils/list-params-converter.ts +0 -200
- package/server/utils/list-query-builder.ts +0 -120
- package/server/utils/publish-progress.ts +0 -23
@@ -1,228 +0,0 @@
|
|
1
|
-
import { URL } from 'url'
|
2
|
-
|
3
|
-
import { config } from '@things-factory/env'
|
4
|
-
import { getPathInfo } from '@things-factory/utils'
|
5
|
-
|
6
|
-
import { getRepository } from '../initializers/database'
|
7
|
-
import { Domain } from '../service/domain/domain'
|
8
|
-
|
9
|
-
const protocol: string = config.get('protocol')
|
10
|
-
const fixed = config.get('subdomain')
|
11
|
-
const domainTypes = config.get('domainTypes') || ['domain']
|
12
|
-
|
13
|
-
/* 하위 호환성을 위해서, domain prefix가 없는 경우, domain을 추가해준다. */
|
14
|
-
if (domainTypes.indexOf('domain') < 0) {
|
15
|
-
domainTypes.push('domain')
|
16
|
-
}
|
17
|
-
|
18
|
-
const routePrefixForDomainType = `:domainType(${domainTypes.join('|')})`
|
19
|
-
|
20
|
-
/**
|
21
|
-
* Creates a URL based on the given context and path.
|
22
|
-
*
|
23
|
-
* @param context {Object} An object containing the current request context information.
|
24
|
-
* @param path {string} The path to be added to the created URL (optional).
|
25
|
-
* @returns {URL} The generated URL object.
|
26
|
-
*/
|
27
|
-
export function getUrlFromContext(context, path = '') {
|
28
|
-
const { method, href, host, header } = context
|
29
|
-
const { referer } = header || {}
|
30
|
-
|
31
|
-
var base = href
|
32
|
-
|
33
|
-
if (method !== 'GET' && referer) {
|
34
|
-
var { host: refererHost } = new URL(referer)
|
35
|
-
if (refererHost === host) {
|
36
|
-
base = referer
|
37
|
-
}
|
38
|
-
}
|
39
|
-
|
40
|
-
let url: URL = new URL(path, base)
|
41
|
-
|
42
|
-
const originalProtocol = context.headers['x-forwarded-proto']
|
43
|
-
const originalHost = context.headers['x-forwarded-host']
|
44
|
-
const originalPort = context.headers['x-forwarded-port']
|
45
|
-
|
46
|
-
if (protocol || originalProtocol) {
|
47
|
-
url.protocol = protocol || originalProtocol
|
48
|
-
}
|
49
|
-
|
50
|
-
if (originalHost) {
|
51
|
-
url.host = originalHost
|
52
|
-
if (originalPort) {
|
53
|
-
url.port = originalPort
|
54
|
-
}
|
55
|
-
}
|
56
|
-
|
57
|
-
return url
|
58
|
-
}
|
59
|
-
|
60
|
-
/**
|
61
|
-
* Extracts a subdomain from the path.
|
62
|
-
*
|
63
|
-
* @param context {Object} An object containing the current request context information.
|
64
|
-
* @returns {string} The extracted subdomain.
|
65
|
-
*/
|
66
|
-
function getSubdomainFromPath(context: any) {
|
67
|
-
var { path } = context
|
68
|
-
|
69
|
-
var subdomain = getPathInfo(path || '', domainTypes)?.subdomain
|
70
|
-
if (subdomain) {
|
71
|
-
return subdomain
|
72
|
-
}
|
73
|
-
|
74
|
-
var {
|
75
|
-
header: { referer }
|
76
|
-
} = context
|
77
|
-
|
78
|
-
if (referer) {
|
79
|
-
var { pathname } = new URL(referer)
|
80
|
-
return getPathInfo(pathname || '', domainTypes)?.subdomain
|
81
|
-
}
|
82
|
-
}
|
83
|
-
|
84
|
-
/**
|
85
|
-
* Extracts the subdomain type from the given context's path or referer header.
|
86
|
-
*
|
87
|
-
* @param context - The context object containing path and header information.
|
88
|
-
* @returns The subdomain type if found, otherwise undefined.
|
89
|
-
*/
|
90
|
-
function getSubdomainTypeFromPath(context: any) {
|
91
|
-
var { path } = context
|
92
|
-
|
93
|
-
var prefix = getPathInfo(path || '', domainTypes)?.prefix
|
94
|
-
if (prefix) {
|
95
|
-
return prefix
|
96
|
-
}
|
97
|
-
|
98
|
-
var {
|
99
|
-
header: { referer }
|
100
|
-
} = context
|
101
|
-
|
102
|
-
if (referer) {
|
103
|
-
var { pathname } = new URL(referer)
|
104
|
-
return getPathInfo(pathname || '', domainTypes)?.prefix
|
105
|
-
}
|
106
|
-
}
|
107
|
-
|
108
|
-
/**
|
109
|
-
* Extracts a subdomain from the URL context.
|
110
|
-
*
|
111
|
-
* @param context {Object} An object containing the current request context information.
|
112
|
-
* @returns {string} The extracted subdomain.
|
113
|
-
*/
|
114
|
-
function getSubdomainFromURL(context) {
|
115
|
-
return fixed || getSubdomainFromPath(context)
|
116
|
-
}
|
117
|
-
|
118
|
-
function getSubdomainTypeFromURL(context) {
|
119
|
-
return fixed ? '' : getSubdomainTypeFromPath(context)
|
120
|
-
}
|
121
|
-
|
122
|
-
/**
|
123
|
-
* Asynchronously searches for a domain object based on the URL context.
|
124
|
-
*
|
125
|
-
* @param context {Object} An object containing the current request context information.
|
126
|
-
* @returns {Promise<Domain>} A promise that resolves to the domain object.
|
127
|
-
*/
|
128
|
-
export async function getDomainFromURL(context: any): Promise<Domain> {
|
129
|
-
const { header } = context
|
130
|
-
|
131
|
-
const subdomain = header['x-things-factory-domain'] || getSubdomainFromURL(context)
|
132
|
-
const extType = header['x-things-factory-type'] || getSubdomainTypeFromURL(context)
|
133
|
-
|
134
|
-
if (subdomain) {
|
135
|
-
return await getRepository(Domain).findOne({
|
136
|
-
where:
|
137
|
-
fixed || extType == 'domain' || !extType
|
138
|
-
? {
|
139
|
-
subdomain
|
140
|
-
}
|
141
|
-
: {
|
142
|
-
subdomain,
|
143
|
-
extType
|
144
|
-
},
|
145
|
-
cache: true
|
146
|
-
})
|
147
|
-
}
|
148
|
-
}
|
149
|
-
|
150
|
-
/**
|
151
|
-
* Generates a context path based on the subdomain.
|
152
|
-
*
|
153
|
-
* @param subdomain {string} The subdomain.
|
154
|
-
* @returns {string} The generated context path.
|
155
|
-
*/
|
156
|
-
export function getContextPath(domain: Domain) {
|
157
|
-
const type = domain?.extType || 'domain'
|
158
|
-
return fixed || !domain ? '' : `${type}/${domain?.subdomain}/`
|
159
|
-
}
|
160
|
-
|
161
|
-
/**
|
162
|
-
* Generates a redirection path considering the subdomain.
|
163
|
-
*
|
164
|
-
* @param context {Object} An object containing the current request context information.
|
165
|
-
* @param subdomain {Domain} The target domain.
|
166
|
-
* @param redirectTo {string} The path to redirect to (optional).
|
167
|
-
* @returns {string} The generated redirection path.
|
168
|
-
*/
|
169
|
-
export function getRedirectSubdomainPath(context, domain: Partial<Domain>, redirectTo: string = '/') {
|
170
|
-
if (fixed || !domain) {
|
171
|
-
return redirectTo || '/'
|
172
|
-
}
|
173
|
-
|
174
|
-
const type = domain.extType || 'domain'
|
175
|
-
const subdomain = domain.subdomain || fixed
|
176
|
-
|
177
|
-
var parsed = getUrlFromContext(context, redirectTo)
|
178
|
-
var { hostname, pathname } = parsed
|
179
|
-
|
180
|
-
const contextPath = `/${type}/${subdomain}`
|
181
|
-
const match = pathname.match(new RegExp(`^/${type}/([^\/]+)`))
|
182
|
-
|
183
|
-
if (match) {
|
184
|
-
parsed.pathname = pathname.replace(match[0], contextPath)
|
185
|
-
} else {
|
186
|
-
parsed.pathname = `${contextPath}${pathname}`
|
187
|
-
}
|
188
|
-
|
189
|
-
return parsed.toString()
|
190
|
-
}
|
191
|
-
|
192
|
-
/**
|
193
|
-
* Finds a subdomain from the given path.
|
194
|
-
*
|
195
|
-
* @param context {Object} An object containing the current request context information.
|
196
|
-
* @param path {string} The path to search in.
|
197
|
-
* @returns {string} The found subdomain.
|
198
|
-
*/
|
199
|
-
export function findSubdomainFromPath(context, path) {
|
200
|
-
if (fixed) {
|
201
|
-
return fixed
|
202
|
-
}
|
203
|
-
|
204
|
-
var parsed = getUrlFromContext(context, path)
|
205
|
-
var { pathname } = parsed
|
206
|
-
|
207
|
-
const match = pathname.match(new RegExp(`^/${getSubdomainTypeFromURL(context)}/([^\/]+)`))
|
208
|
-
return match && match[1]
|
209
|
-
}
|
210
|
-
|
211
|
-
/**
|
212
|
-
* Retrieves the route prefix for a specific domain type.
|
213
|
-
*
|
214
|
-
* @returns {string} The route prefix associated with the domain type.
|
215
|
-
*/
|
216
|
-
export function getRoutePrefixForDomainType() {
|
217
|
-
return routePrefixForDomainType
|
218
|
-
}
|
219
|
-
|
220
|
-
/**
|
221
|
-
* Generates a site root path based on the current environment.
|
222
|
-
*
|
223
|
-
* @param context {Object} An object containing the current request context information.
|
224
|
-
* @returns {string} The generated site root path.
|
225
|
-
*/
|
226
|
-
export function getSiteRootPath(context) {
|
227
|
-
return '/'
|
228
|
-
}
|
@@ -1,469 +0,0 @@
|
|
1
|
-
import { Brackets, EntityMetadata, Repository, SelectQueryBuilder, WhereExpressionBuilder } from 'typeorm'
|
2
|
-
import { RelationMetadata } from 'typeorm/metadata/RelationMetadata.js'
|
3
|
-
import { Filter, Sorting, Pagination, ListParam, InheritedValueType } from '../service/common-types/list-param.js'
|
4
|
-
import { Domain } from '../service/domain/domain.js'
|
5
|
-
|
6
|
-
/**
|
7
|
-
* Creates a TypeORM SelectQueryBuilder based on the provided parameters.
|
8
|
-
*
|
9
|
-
* @param options - An object containing the query building options.
|
10
|
-
* @param options.repository - The TypeORM repository for database operations.
|
11
|
-
* @param options.params - The ListParam object containing filters, sortings, and pagination.
|
12
|
-
* @param [options.domain] - Optional domain object for applying domain-specific filters.
|
13
|
-
* @param [options.alias] - The alias to be used in the SQL queries.
|
14
|
-
* @param [options.searchables] - List of columns that are searchable.
|
15
|
-
* @param [options.filtersMap] - Mapping of filter names to their corresponding columns or relation columns.
|
16
|
-
* @returns {SelectQueryBuilder<Type>} - The constructed SelectQueryBuilder instance.
|
17
|
-
*/
|
18
|
-
export function getQueryBuilderFromListParams<Type>(options: {
|
19
|
-
repository: Repository<Type>
|
20
|
-
params: ListParam
|
21
|
-
domain?: Domain
|
22
|
-
alias?: string
|
23
|
-
searchables?: string[]
|
24
|
-
filtersMap?: { [name: string]: { columnName: string; relationColumn?: string } }
|
25
|
-
}): SelectQueryBuilder<Type> {
|
26
|
-
const { repository, params, domain, alias, searchables, filtersMap = {} } = options
|
27
|
-
const { inherited = InheritedValueType.None } = params || {}
|
28
|
-
|
29
|
-
const selectQueryBuilder = repository.createQueryBuilder(alias)
|
30
|
-
const entityAlias = selectQueryBuilder.alias
|
31
|
-
|
32
|
-
// Apply filters to the query
|
33
|
-
const columnFilters =
|
34
|
-
params.filters?.filter(filter => {
|
35
|
-
if (filter.operator === 'search') {
|
36
|
-
return false
|
37
|
-
}
|
38
|
-
if (filter.operator.toLowerCase().includes('like') && (!searchables || !searchables.includes(filter.name))) {
|
39
|
-
console.warn('"searchables" setting is required for LIKE searches to avoid heavy database load', filter.name)
|
40
|
-
return false
|
41
|
-
}
|
42
|
-
return true
|
43
|
-
}) || []
|
44
|
-
|
45
|
-
const searchFilters =
|
46
|
-
searchables instanceof Array
|
47
|
-
? params.filters?.filter(filter => {
|
48
|
-
if (filter.operator !== 'search') {
|
49
|
-
return false
|
50
|
-
}
|
51
|
-
if (!searchables.includes(filter.name)) {
|
52
|
-
console.warn(
|
53
|
-
'"searchables" setting is required for LIKE searches to avoid heavy database load',
|
54
|
-
filter.name
|
55
|
-
)
|
56
|
-
return false
|
57
|
-
}
|
58
|
-
return true
|
59
|
-
}) || []
|
60
|
-
: []
|
61
|
-
|
62
|
-
const pagination = params.pagination
|
63
|
-
const sortings = params.sortings
|
64
|
-
const metadata = repository.metadata
|
65
|
-
|
66
|
-
// Apply column filters
|
67
|
-
if (columnFilters.length > 0) {
|
68
|
-
columnFilters.forEach(filter => {
|
69
|
-
addCondition(metadata, selectQueryBuilder, selectQueryBuilder, filter, filtersMap, true)
|
70
|
-
})
|
71
|
-
}
|
72
|
-
|
73
|
-
// Apply search filters
|
74
|
-
if (searchFilters.length > 0) {
|
75
|
-
selectQueryBuilder.andWhere(
|
76
|
-
new Brackets(qb => {
|
77
|
-
searchFilters.forEach(filter => {
|
78
|
-
addCondition(metadata, selectQueryBuilder, qb, filter, filtersMap, false)
|
79
|
-
})
|
80
|
-
})
|
81
|
-
)
|
82
|
-
}
|
83
|
-
|
84
|
-
// Apply domain filters
|
85
|
-
if (domain) {
|
86
|
-
if (!inherited || inherited === InheritedValueType.None) {
|
87
|
-
selectQueryBuilder.andWhere(`${entityAlias}.domain = :domain`, { domain: domain.id })
|
88
|
-
} else if (inherited === InheritedValueType.Include) {
|
89
|
-
selectQueryBuilder.andWhere(`${entityAlias}.domain IN (:...domains)`, {
|
90
|
-
domains: [domain.id, domain.parentId].filter(Boolean)
|
91
|
-
})
|
92
|
-
} else if (inherited === InheritedValueType.Only) {
|
93
|
-
selectQueryBuilder.andWhere(`${entityAlias}.domain = :domain`, { domain: domain.parentId || 'Impossible' })
|
94
|
-
} else {
|
95
|
-
selectQueryBuilder.andWhere(`${entityAlias}.domain = :domain`, { domain: 'Impossible' })
|
96
|
-
}
|
97
|
-
}
|
98
|
-
|
99
|
-
// Apply pagination
|
100
|
-
addPagination(selectQueryBuilder, pagination)
|
101
|
-
|
102
|
-
// Apply sorting
|
103
|
-
if (sortings && sortings.length > 0) {
|
104
|
-
addSorting(selectQueryBuilder, sortings, entityAlias, filtersMap, metadata)
|
105
|
-
}
|
106
|
-
|
107
|
-
return selectQueryBuilder
|
108
|
-
}
|
109
|
-
|
110
|
-
/**
|
111
|
-
* Adds pagination to the SelectQueryBuilder based on the provided Pagination object.
|
112
|
-
*
|
113
|
-
* @param selectQueryBuilder - The SelectQueryBuilder to which pagination should be applied.
|
114
|
-
* @param pagination - The Pagination object containing page and limit information.
|
115
|
-
*/
|
116
|
-
function addPagination<T>(selectQueryBuilder: SelectQueryBuilder<T>, pagination?: Pagination) {
|
117
|
-
if (pagination) {
|
118
|
-
const { page, limit } = pagination
|
119
|
-
if (page && limit && page > 0 && limit > 0) {
|
120
|
-
selectQueryBuilder.skip(limit * (page - 1)).take(limit)
|
121
|
-
} else if (limit && limit > 0) {
|
122
|
-
selectQueryBuilder.take(limit)
|
123
|
-
}
|
124
|
-
}
|
125
|
-
}
|
126
|
-
|
127
|
-
/**
|
128
|
-
* Adds a filtering condition to the SelectQueryBuilder based on the provided filter and mapping options.
|
129
|
-
*
|
130
|
-
* @param metadata - The EntityMetadata of the TypeORM entity.
|
131
|
-
* @param selectQueryBuilder - The SelectQueryBuilder to which the condition will be added.
|
132
|
-
* @param whereExpressionBuilder - The WhereExpressionBuilder to construct the where clause.
|
133
|
-
* @param filter - The Filter object containing the filter criteria.
|
134
|
-
* @param filtersMap - A mapping of filter names to column names and relation column names.
|
135
|
-
* @param andCondition - A flag indicating whether to use "AND" or "OR" for combining conditions.
|
136
|
-
*/
|
137
|
-
function addCondition<T>(
|
138
|
-
metadata: EntityMetadata,
|
139
|
-
selectQueryBuilder: SelectQueryBuilder<T>,
|
140
|
-
whereExpressionBuilder: WhereExpressionBuilder,
|
141
|
-
filter: Filter,
|
142
|
-
filtersMap: { [name: string]: { columnName: string; relationColumn?: string } } = {},
|
143
|
-
andCondition: boolean
|
144
|
-
): void {
|
145
|
-
const { name, operator, value } = filter
|
146
|
-
var entityAlias = selectQueryBuilder.alias
|
147
|
-
|
148
|
-
var { relationColumn, columnName } = filtersMap[name] || {}
|
149
|
-
/*
|
150
|
-
1. relationColumn과 columnName이 지정된 경우
|
151
|
-
- relation inverse 테이블에서, columnName을 찾는다.
|
152
|
-
2. relationColumn만 지정된 경우는 없어야 한다.
|
153
|
-
- 이 경우 columnName 은 'name' 이라고 판단한다.
|
154
|
-
3. columnName이 지정된 경우.
|
155
|
-
- 이 경우는 columnName 만 적용한다.
|
156
|
-
*/
|
157
|
-
if (relationColumn) {
|
158
|
-
const columns = relationColumn.split('.')
|
159
|
-
var entityMetadata: EntityMetadata
|
160
|
-
var relation: RelationMetadata
|
161
|
-
|
162
|
-
for (const rcolumn of columns) {
|
163
|
-
if (relation) {
|
164
|
-
const { propertyName } = relationColumnMeta
|
165
|
-
const property = `${entityAlias}.${propertyName}`
|
166
|
-
|
167
|
-
entityAlias = `${entityAlias}-${entityMetadata.tableName}-for-${columnName || 'name'}` as string
|
168
|
-
|
169
|
-
if (andCondition) {
|
170
|
-
selectQueryBuilder.innerJoin(property, entityAlias)
|
171
|
-
} else {
|
172
|
-
selectQueryBuilder.leftJoin(property, entityAlias)
|
173
|
-
}
|
174
|
-
} else {
|
175
|
-
entityMetadata = metadata
|
176
|
-
}
|
177
|
-
|
178
|
-
var relationColumnMeta = entityMetadata.columns.find(column => column.propertyName === rcolumn)
|
179
|
-
if (!relationColumnMeta) {
|
180
|
-
console.warn(`relationColumn "${relationColumn}" in filtersMap for "${name}" is not a relation column`)
|
181
|
-
return
|
182
|
-
}
|
183
|
-
|
184
|
-
relation = relationColumnMeta.relationMetadata
|
185
|
-
entityMetadata = relation.inverseEntityMetadata
|
186
|
-
}
|
187
|
-
|
188
|
-
var columnMeta = entityMetadata.columns.find(column => column.propertyName === (columnName || 'name'))
|
189
|
-
if (!columnMeta) {
|
190
|
-
console.warn(`columnName "${columnName}" in filtersMap for "${name}" is not a column`)
|
191
|
-
return
|
192
|
-
}
|
193
|
-
} else {
|
194
|
-
var columnMeta = metadata.columns.find(column => column.propertyName === (columnName || name))
|
195
|
-
if (!columnMeta) {
|
196
|
-
/* relationId 에 대한 필터링은 해당 컬럼값 자체의 비교로 한다. */
|
197
|
-
var relationIdMeta = metadata.relationIds.find(relationId => relationId.propertyName === (columnName || name))
|
198
|
-
if (relationIdMeta) {
|
199
|
-
columnMeta = relationIdMeta.relation.joinColumns[0]
|
200
|
-
} else {
|
201
|
-
columnName
|
202
|
-
? console.warn(`columnName "${columnName}" in filtersMap for "${name}" is not a column`)
|
203
|
-
: console.warn(`name "${name}" is not a column`)
|
204
|
-
}
|
205
|
-
} else {
|
206
|
-
var relation = columnMeta.relationMetadata
|
207
|
-
}
|
208
|
-
|
209
|
-
if (relation) {
|
210
|
-
/* filterMap에 의해서 relationColumn 이 지정되지 않았더라도, name 또는 columnName의 column이 relation인 경우에는
|
211
|
-
- 조건절 구성을 위한 타겟필드명은 'name' 으로만 한정된다.
|
212
|
-
*/
|
213
|
-
var relationColumnMeta = columnMeta
|
214
|
-
var entityMetadata = relation.inverseEntityMetadata
|
215
|
-
columnMeta = entityMetadata.columns.find(column => column.propertyName === 'name')
|
216
|
-
if (!columnMeta) {
|
217
|
-
console.warn(`relation column "${columnName || name}" does not have "name" column`)
|
218
|
-
return
|
219
|
-
}
|
220
|
-
}
|
221
|
-
}
|
222
|
-
|
223
|
-
const dbNameForColumn = columnMeta.databaseName
|
224
|
-
const alias = relationColumnMeta ? `${name}-filter` : entityAlias
|
225
|
-
|
226
|
-
/* relation columne인 경우 name을 alias로 사용한다. */
|
227
|
-
const field = `${alias}.${dbNameForColumn}`
|
228
|
-
|
229
|
-
var { clause, parameters } = getClauseAndParameters(field, name, operator, value)
|
230
|
-
|
231
|
-
if (relationColumnMeta) {
|
232
|
-
const { propertyName } = relationColumnMeta
|
233
|
-
const property = `${entityAlias}.${propertyName}`
|
234
|
-
if (andCondition) {
|
235
|
-
selectQueryBuilder.innerJoin(property, alias, clause, parameters)
|
236
|
-
} else {
|
237
|
-
selectQueryBuilder.leftJoin(property, alias)
|
238
|
-
whereExpressionBuilder.orWhere(clause, parameters)
|
239
|
-
}
|
240
|
-
} else {
|
241
|
-
andCondition
|
242
|
-
? whereExpressionBuilder.andWhere(clause, parameters)
|
243
|
-
: whereExpressionBuilder.orWhere(clause, parameters)
|
244
|
-
}
|
245
|
-
}
|
246
|
-
|
247
|
-
/**
|
248
|
-
* Adds sorting to the SelectQueryBuilder based on the provided Sorting objects.
|
249
|
-
*
|
250
|
-
* @param selectQueryBuilder - The SelectQueryBuilder to which sorting should be applied.
|
251
|
-
* @param sortings - An array of Sorting objects defining the sort order.
|
252
|
-
* @param entityAlias - The alias of the entity in the query.
|
253
|
-
* @param filtersMap - A mapping of filter names to column names and relation column names.
|
254
|
-
* @param metadata - The EntityMetadata of the TypeORM entity.
|
255
|
-
*/
|
256
|
-
function addSorting<T>(
|
257
|
-
selectQueryBuilder: SelectQueryBuilder<T>,
|
258
|
-
sortings: Sorting[],
|
259
|
-
entityAlias: string,
|
260
|
-
filtersMap: { [name: string]: { columnName: string; relationColumn?: string } },
|
261
|
-
metadata: EntityMetadata
|
262
|
-
) {
|
263
|
-
sortings.forEach((sorting, index) => {
|
264
|
-
const sortField = determineSortField(sorting.name, entityAlias, filtersMap, selectQueryBuilder, metadata)
|
265
|
-
if (index === 0) {
|
266
|
-
selectQueryBuilder.orderBy(sortField, sorting.desc ? 'DESC' : 'ASC')
|
267
|
-
} else {
|
268
|
-
selectQueryBuilder.addOrderBy(sortField, sorting.desc ? 'DESC' : 'ASC')
|
269
|
-
}
|
270
|
-
})
|
271
|
-
}
|
272
|
-
|
273
|
-
/**
|
274
|
-
* Determines the sorting field for a given sorting name, considering possible relation columns.
|
275
|
-
*
|
276
|
-
* @param sortingName - The name of the field to sort by.
|
277
|
-
* @param entityAlias - The alias of the entity in the query.
|
278
|
-
* @param filtersMap - A mapping of filter names to column names and relation column names.
|
279
|
-
* @param selectQueryBuilder - The SelectQueryBuilder instance to apply sorting to.
|
280
|
-
* @param metadata - The EntityMetadata of the TypeORM entity.
|
281
|
-
* @returns {string} - The fully qualified sorting field.
|
282
|
-
*/
|
283
|
-
function determineSortField<T>(
|
284
|
-
sortingName: string,
|
285
|
-
entityAlias: string,
|
286
|
-
filtersMap: { [name: string]: { columnName: string; relationColumn?: string } },
|
287
|
-
selectQueryBuilder: SelectQueryBuilder<T>,
|
288
|
-
metadata: EntityMetadata
|
289
|
-
): string {
|
290
|
-
const filter = filtersMap[sortingName]
|
291
|
-
|
292
|
-
if (!filter) {
|
293
|
-
return sortingName.split('.').length > 1 ? sortingName : `${entityAlias}.${sortingName}`
|
294
|
-
}
|
295
|
-
|
296
|
-
const { columnName, relationColumn } = filter
|
297
|
-
|
298
|
-
if (relationColumn) {
|
299
|
-
const relationAlias = applyJoins(
|
300
|
-
selectQueryBuilder,
|
301
|
-
entityAlias,
|
302
|
-
relationColumn,
|
303
|
-
metadata,
|
304
|
-
'leftJoin',
|
305
|
-
columnName || sortingName,
|
306
|
-
true
|
307
|
-
)
|
308
|
-
return `${relationAlias}.${columnName}`
|
309
|
-
} else {
|
310
|
-
return `${entityAlias}.${columnName}`
|
311
|
-
}
|
312
|
-
}
|
313
|
-
|
314
|
-
/**
|
315
|
-
* Applies the necessary joins to the SelectQueryBuilder based on the relation column.
|
316
|
-
*
|
317
|
-
* @param selectQueryBuilder - The SelectQueryBuilder where the joins will be applied.
|
318
|
-
* @param entityAlias - The current alias of the entity in the query.
|
319
|
-
* @param relationColumn - The dot-notated string representing the relation chain (e.g., "user.profile.address").
|
320
|
-
* @param metadata - The EntityMetadata of the entity.
|
321
|
-
* @param joinType - The type of join to use ("innerJoin" or "leftJoin").
|
322
|
-
* @param columnName - The name of the column used for filtering or sorting, default to 'name'.
|
323
|
-
* @param selectField - Whether to include the field in the SELECT clause.
|
324
|
-
* @returns {string} - The alias to be used for the final field in the relation chain.
|
325
|
-
*/
|
326
|
-
function applyJoins<T>(
|
327
|
-
selectQueryBuilder: SelectQueryBuilder<T>,
|
328
|
-
entityAlias: string,
|
329
|
-
relationColumn: string,
|
330
|
-
metadata: EntityMetadata,
|
331
|
-
joinType: 'innerJoin' | 'leftJoin' = 'leftJoin',
|
332
|
-
columnName: string = 'name',
|
333
|
-
selectField: boolean = false
|
334
|
-
): string {
|
335
|
-
const columns = relationColumn.split('.')
|
336
|
-
let currentAlias = entityAlias
|
337
|
-
let currentMetadata = metadata
|
338
|
-
|
339
|
-
for (const column of columns) {
|
340
|
-
const relation = currentMetadata.relations.find(rel => rel.propertyName === column)
|
341
|
-
|
342
|
-
if (!relation) {
|
343
|
-
throw new Error(`Relation not found for column: ${column}`)
|
344
|
-
}
|
345
|
-
|
346
|
-
const nextAlias = `${currentAlias}_${relation.inverseEntityMetadata.tableName}_for_${columnName}`
|
347
|
-
|
348
|
-
if (!selectQueryBuilder.expressionMap.aliases.some(alias => alias.name === nextAlias)) {
|
349
|
-
selectQueryBuilder[joinType](`${currentAlias}.${column}`, nextAlias)
|
350
|
-
}
|
351
|
-
if (selectField && columns.at(-1) == column /* 최종 alias만 추가 */) {
|
352
|
-
selectQueryBuilder.addSelect(`${nextAlias}.${columnName}`, `${nextAlias}_${columnName}`)
|
353
|
-
}
|
354
|
-
|
355
|
-
currentAlias = nextAlias
|
356
|
-
currentMetadata = relation.inverseEntityMetadata
|
357
|
-
}
|
358
|
-
|
359
|
-
return currentAlias
|
360
|
-
}
|
361
|
-
|
362
|
-
/**
|
363
|
-
* Generates the SQL clause and parameters based on the provided filter.
|
364
|
-
*
|
365
|
-
* @param field - The database field to filter on.
|
366
|
-
* @param name - The name of the filter.
|
367
|
-
* @param operator - The operator to use in the filter.
|
368
|
-
* @param value - The value to filter with.
|
369
|
-
* @returns An object containing the SQL clause and the parameters.
|
370
|
-
*/
|
371
|
-
function getClauseAndParameters(
|
372
|
-
field: string,
|
373
|
-
name: string,
|
374
|
-
operator: string,
|
375
|
-
value: any
|
376
|
-
): { clause: string; parameters: { [key: string]: any } } {
|
377
|
-
const values = value instanceof Array ? value : [value]
|
378
|
-
let clause = ''
|
379
|
-
let parameters: { [key: string]: any } = {}
|
380
|
-
|
381
|
-
switch (operator) {
|
382
|
-
case 'eq':
|
383
|
-
clause = `${field} = :${name}`
|
384
|
-
parameters = { [name]: value }
|
385
|
-
break
|
386
|
-
case 'like':
|
387
|
-
clause = `${field} LIKE :${name}`
|
388
|
-
parameters = { [name]: `%${value}%` }
|
389
|
-
break
|
390
|
-
case 'search':
|
391
|
-
case 'i_like':
|
392
|
-
clause = `LOWER(${field}) LIKE :${name}`
|
393
|
-
parameters = { [name]: `%${String(value).toLowerCase()}%` }
|
394
|
-
break
|
395
|
-
case 'nlike':
|
396
|
-
clause = `${field} NOT LIKE :${name}`
|
397
|
-
parameters = { [name]: `%${value}%` }
|
398
|
-
break
|
399
|
-
case 'i_nlike':
|
400
|
-
clause = `LOWER(${field}) NOT LIKE :${name}`
|
401
|
-
parameters = { [name]: `%${String(value).toLowerCase()}%` }
|
402
|
-
break
|
403
|
-
case 'lt':
|
404
|
-
clause = `${field} < :${name}`
|
405
|
-
parameters = { [name]: value }
|
406
|
-
break
|
407
|
-
case 'gt':
|
408
|
-
clause = `${field} > :${name}`
|
409
|
-
parameters = { [name]: value }
|
410
|
-
break
|
411
|
-
case 'lte':
|
412
|
-
clause = `${field} <= :${name}`
|
413
|
-
parameters = { [name]: value }
|
414
|
-
break
|
415
|
-
case 'gte':
|
416
|
-
clause = `${field} >= :${name}`
|
417
|
-
parameters = { [name]: value }
|
418
|
-
break
|
419
|
-
case 'noteq':
|
420
|
-
clause = `${field} != :${name}`
|
421
|
-
parameters = { [name]: value }
|
422
|
-
break
|
423
|
-
case 'in':
|
424
|
-
clause = `${field} IN (:...${name})`
|
425
|
-
parameters = { [name]: values }
|
426
|
-
break
|
427
|
-
case 'notin':
|
428
|
-
clause = `${field} NOT IN (:...${name})`
|
429
|
-
parameters = { [name]: values }
|
430
|
-
break
|
431
|
-
case 'notin_with_null':
|
432
|
-
clause = `${field} IS NULL OR ${field} NOT IN (:...${name})`
|
433
|
-
parameters = { [name]: values }
|
434
|
-
break
|
435
|
-
case 'is_null':
|
436
|
-
clause = `${field} IS NULL`
|
437
|
-
break
|
438
|
-
case 'is_not_null':
|
439
|
-
clause = `${field} IS NOT NULL`
|
440
|
-
break
|
441
|
-
case 'is_false':
|
442
|
-
clause = `${field} IS FALSE`
|
443
|
-
break
|
444
|
-
case 'is_true':
|
445
|
-
clause = `${field} IS TRUE`
|
446
|
-
break
|
447
|
-
case 'is_not_false':
|
448
|
-
clause = `${field} IS NOT FALSE`
|
449
|
-
break
|
450
|
-
case 'is_not_true':
|
451
|
-
clause = `${field} IS NOT TRUE`
|
452
|
-
break
|
453
|
-
case 'is_present':
|
454
|
-
clause = `${field} IS PRESENT`
|
455
|
-
break
|
456
|
-
case 'is_blank':
|
457
|
-
clause = `${field} IS BLANK`
|
458
|
-
break
|
459
|
-
case 'is_empty_num_id':
|
460
|
-
clause = `${field} IS EMPTY NUMERIC ID`
|
461
|
-
break
|
462
|
-
case 'between':
|
463
|
-
clause = `${field} BETWEEN :${name}_1 AND :${name}_2`
|
464
|
-
parameters = { [`${name}_1`]: values[0], [`${name}_2`]: values[1] }
|
465
|
-
break
|
466
|
-
}
|
467
|
-
|
468
|
-
return { clause, parameters }
|
469
|
-
}
|