Skip to content

Commit

Permalink
fix: Copy translations & new schema
Browse files Browse the repository at this point in the history
  • Loading branch information
@JanCizmar
JanCizmar committed Aug 7, 2023
1 parent f6bb629 commit ae0ab8e
Show file tree
Hide file tree
Showing 2 changed files with 125 additions and 75 deletions.
28 changes: 24 additions & 4 deletions backend/data/src/main/kotlin/io/tolgee/service/translation/TranslationService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ class TranslationService(

@Transactional
fun setState(keyIds: List<Long>, languageIds: List<Long>, state: TranslationState) {
val translations = getTranslations(keyIds, languageIds)
val translations = getTargetTranslations(keyIds, languageIds)
translations.forEach { it.state = state }
saveAll(translations)
}
Expand All @@ -384,7 +384,7 @@ class TranslationService(
) = translationRepository.getAllByKeyIdInAndLanguageIdIn(keyIds, languageIds)

fun clear(keyIds: List<Long>, languageIds: List<Long>) {
val translations = getTranslations(keyIds, languageIds)
val translations = getTargetTranslations(keyIds, languageIds)
translations.forEach {
it.state = TranslationState.UNTRANSLATED
it.text = null
Expand All @@ -396,8 +396,8 @@ class TranslationService(
}

fun copy(keyIds: List<Long>, sourceLanguageId: Long, targetLanguageIds: List<Long>) {
val sourceTranslations = getTranslations(keyIds, listOf(sourceLanguageId)).associateBy { it.key.id }
val targetTranslations = getTranslations(keyIds, targetLanguageIds).onEach {
val sourceTranslations = getTargetTranslations(keyIds, listOf(sourceLanguageId)).associateBy { it.key.id }
val targetTranslations = getTargetTranslations(keyIds, targetLanguageIds).onEach {
it.text = sourceTranslations[it.key.id]?.text
if (!it.text.isNullOrEmpty()) {
it.state = TranslationState.TRANSLATED
Expand All @@ -408,4 +408,24 @@ class TranslationService(
}
saveAll(targetTranslations)
}

private fun getTargetTranslations(
keyIds: List<Long>,
targetLanguageIds: List<Long>
): List<Translation> {
val existing = getTranslations(keyIds, targetLanguageIds)
val existingMap = existing.groupBy { it.key.id }
.map { entry ->
entry.key to
entry.value.associateBy { translation -> translation.language.id }
}.toMap()
return keyIds.flatMap { keyId ->
targetLanguageIds.map { languageId ->
existingMap[keyId]?.get(languageId) ?: getOrCreate(
entityManager.getReference(Key::class.java, keyId),
entityManager.getReference(Language::class.java, languageId)
)
}
}
}
}
172 changes: 101 additions & 71 deletions webapp/src/service/apiSchema.generated.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,12 @@ export interface paths {
"/v2/public/licensing/prepare-set-key": {
post: operations["prepareSetLicenseKey"];
};
"/v2/public/business-events/report": {
post: operations["report_1"];
};
"/v2/public/business-events/identify": {
post: operations["identify"];
};
"/v2/projects": {
get: operations["getAll"];
post: operations["createProject"];
Expand Down Expand Up @@ -338,9 +344,6 @@ export interface paths {
"/v2/ee-license/prepare-set-license-key": {
post: operations["prepareSetLicenseKey_1"];
};
"/v2/business-events/report": {
post: operations["report_1"];
};
"/v2/api-keys": {
get: operations["allByUser"];
post: operations["create_10"];
Expand Down Expand Up @@ -632,10 +635,13 @@ export interface components {
/** @description The user's permission type. This field is null if uses granular permissions */
type?: "NONE" | "VIEW" | "TRANSLATE" | "REVIEW" | "EDIT" | "MANAGE";
/**
* @description List of languages user can translate to. If null, all languages editing is permitted.
* @deprecated
* @description Deprecated (use translateLanguageIds).
*
* List of languages current user has TRANSLATE permission to. If null, all languages edition is permitted.
* @example 200001,200004
*/
translateLanguageIds?: number[];
permittedLanguageIds?: number[];
/**
* @description List of languages user can change state to. If null, changing state of all language values is permitted.
* @example 200001,200004
Expand All @@ -647,13 +653,10 @@ export interface components {
*/
viewLanguageIds?: number[];
/**
* @deprecated
* @description Deprecated (use translateLanguageIds).
*
* List of languages current user has TRANSLATE permission to. If null, all languages edition is permitted.
* @description List of languages user can translate to. If null, all languages editing is permitted.
* @example 200001,200004
*/
permittedLanguageIds?: number[];
translateLanguageIds?: number[];
/**
* @description Granted scopes to the user. When user has type permissions, this field contains permission scopes of the type.
* @example KEYS_EDIT,TRANSLATIONS_VIEW
Expand Down Expand Up @@ -1175,13 +1178,13 @@ export interface components {
*/
name: string;
/**
* @description Language tag according to BCP 47 definition
* @example cs-CZ
* @description Language name in this language
* @example čeština
*/
originalName: string;
/**
* @description Language name in this language
* @example čeština
* @description Language tag according to BCP 47 definition
* @example cs-CZ
*/
tag: string;
/**
Expand Down Expand Up @@ -1220,13 +1223,13 @@ export interface components {
/** Format: int64 */
id: number;
/** Format: int64 */
expiresAt?: number;
/** Format: int64 */
lastUsedAt?: number;
/** Format: int64 */
createdAt: number;
/** Format: int64 */
updatedAt: number;
/** Format: int64 */
lastUsedAt?: number;
/** Format: int64 */
expiresAt?: number;
description: string;
};
SetOrganizationRoleDto: {
Expand Down Expand Up @@ -1360,16 +1363,16 @@ export interface components {
key: string;
/** Format: int64 */
id: number;
userFullName?: string;
projectName: string;
scopes: string[];
username?: string;
/** Format: int64 */
lastUsedAt?: number;
/** Format: int64 */
projectId: number;
username?: string;
/** Format: int64 */
expiresAt?: number;
/** Format: int64 */
lastUsedAt?: number;
userFullName?: string;
projectName: string;
scopes: string[];
description: string;
};
SuperTokenRequest: {
Expand Down Expand Up @@ -1509,6 +1512,18 @@ export interface components {
credits?: components["schemas"]["SumUsageItemModel"];
total: number;
};
BusinessEventReportRequest: {
eventName: string;
anonymousUserId?: string;
/** Format: int64 */
organizationId?: number;
/** Format: int64 */
projectId?: number;
data?: { [key: string]: { [key: string]: unknown } };
};
IdentifyRequest: {
anonymousUserId: string;
};
CreateProjectDTO: {
name: string;
languages: components["schemas"]["LanguageDto"][];
Expand Down Expand Up @@ -1879,14 +1894,6 @@ export interface components {
createdAt: string;
location?: string;
};
BusinessEventReportRequest: {
eventName: string;
/** Format: int64 */
organizationId?: number;
/** Format: int64 */
projectId?: number;
data?: { [key: string]: { [key: string]: unknown } };
};
CreateApiKeyDto: {
/** Format: int64 */
projectId: number;
Expand Down Expand Up @@ -2016,6 +2023,8 @@ export interface components {
name: string;
/** Format: int64 */
id: number;
basePermissions: components["schemas"]["PermissionModel"];
avatar?: components["schemas"]["Avatar"];
/**
* @description The role of currently authorized user.
*
Expand All @@ -2024,8 +2033,6 @@ export interface components {
currentUserRole?: "MEMBER" | "OWNER";
/** @example btforg */
slug: string;
avatar?: components["schemas"]["Avatar"];
basePermissions: components["schemas"]["PermissionModel"];
/** @example This is a beautiful organization full of beautiful and clever people */
description?: string;
};
Expand Down Expand Up @@ -2128,18 +2135,18 @@ export interface components {
name: string;
/** Format: int64 */
id: number;
translation?: string;
namespace?: string;
baseTranslation?: string;
namespace?: string;
translation?: string;
};
KeySearchSearchResultModel: {
view?: components["schemas"]["KeySearchResultView"];
name: string;
/** Format: int64 */
id: number;
translation?: string;
namespace?: string;
baseTranslation?: string;
namespace?: string;
translation?: string;
};
PagedModelKeySearchSearchResultModel: {
_embedded?: {
Expand Down Expand Up @@ -2585,13 +2592,13 @@ export interface components {
/** Format: int64 */
id: number;
/** Format: int64 */
expiresAt?: number;
/** Format: int64 */
lastUsedAt?: number;
/** Format: int64 */
createdAt: number;
/** Format: int64 */
updatedAt: number;
/** Format: int64 */
lastUsedAt?: number;
/** Format: int64 */
expiresAt?: number;
description: string;
};
OrganizationRequestParamsDto: {
Expand Down Expand Up @@ -2711,16 +2718,16 @@ export interface components {
permittedLanguageIds?: number[];
/** Format: int64 */
id: number;
userFullName?: string;
projectName: string;
scopes: string[];
username?: string;
/** Format: int64 */
lastUsedAt?: number;
/** Format: int64 */
projectId: number;
username?: string;
/** Format: int64 */
expiresAt?: number;
/** Format: int64 */
lastUsedAt?: number;
userFullName?: string;
projectName: string;
scopes: string[];
description: string;
};
PagedModelUserAccountModel: {
Expand Down Expand Up @@ -5222,6 +5229,52 @@ export interface operations {
};
};
};
report_1: {
responses: {
/** OK */
200: unknown;
/** Bad Request */
400: {
content: {
"*/*": string;
};
};
/** Not Found */
404: {
content: {
"*/*": string;
};
};
};
requestBody: {
content: {
"application/json": components["schemas"]["BusinessEventReportRequest"];
};
};
};
identify: {
responses: {
/** OK */
200: unknown;
/** Bad Request */
400: {
content: {
"*/*": string;
};
};
/** Not Found */
404: {
content: {
"*/*": string;
};
};
};
requestBody: {
content: {
"application/json": components["schemas"]["IdentifyRequest"];
};
};
};
getAll: {
parameters: {
query: {
Expand Down Expand Up @@ -6462,29 +6515,6 @@ export interface operations {
};
};
};
report_1: {
responses: {
/** OK */
200: unknown;
/** Bad Request */
400: {
content: {
"*/*": string;
};
};
/** Not Found */
404: {
content: {
"*/*": string;
};
};
};
requestBody: {
content: {
"application/json": components["schemas"]["BusinessEventReportRequest"];
};
};
};
allByUser: {
parameters: {
query: {
Expand Down

0 comments on commit ae0ab8e

Please sign in to comment.