Skip to content

LPD-74358 putSiteStructuredContentByExternalReferenceCode does not save the updated values #169139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
liferay-continuous-integration wants to merge 4 commits into from
Closed

LPD-74358 putSiteStructuredContentByExternalReferenceCode does not save the updated values #169139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1acaa0
LPD-74358 Use DDMValueUtil to handle different types
ak-ragnor Dec 15, 2025
bd134db
LPD-74358 If value is null dont add it to field value
ak-ragnor Dec 19, 2025
d0f0b6d
LPD-74358 Add Util to get contentField values based on type
ak-ragnor Dec 23, 2025
84e7892
LPD-74358 Add test for complex structure
ak-ragnor Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 31 additions & 87 deletions ...a/com/liferay/headless/delivery/internal/resource/v1_0/StructuredContentResourceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import com.liferay.asset.link.model.AssetLink;
import com.liferay.asset.link.service.AssetLinkLocalService;
import com.liferay.document.library.kernel.service.DLAppService;
import com.liferay.document.library.util.DLURLHelper;
import com.liferay.dynamic.data.mapping.io.DDMFormValuesSerializer;
import com.liferay.dynamic.data.mapping.model.DDMFormField;
import com.liferay.dynamic.data.mapping.model.DDMStructure;
Expand Down Expand Up @@ -68,15 +67,12 @@
import com.liferay.petra.function.UnsafeConsumer;
import com.liferay.petra.string.StringBundler;
import com.liferay.petra.string.StringPool;
import com.liferay.portal.kernel.json.JSONFactory;
import com.liferay.portal.kernel.json.JSONObject;
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.model.Group;
import com.liferay.portal.kernel.model.Layout;
import com.liferay.portal.kernel.model.Organization;
import com.liferay.portal.kernel.model.User;
import com.liferay.portal.kernel.repository.model.FileEntry;
import com.liferay.portal.kernel.search.BooleanClauseOccur;
import com.liferay.portal.kernel.search.BooleanQuery;
import com.liferay.portal.kernel.search.Document;
Expand Down Expand Up @@ -1050,38 +1046,6 @@ private int[] _getExpirationDateArray(
};
}

private String _getFileEntryJSONObject(JSONObject jsonObject, boolean image)
throws Exception {

FileEntry fileEntry = _dlAppService.getFileEntry(
jsonObject.getLong("id"));

jsonObject.put(
"extension", fileEntry.getExtension()
).put(
"fileEntryId", fileEntry.getFileEntryId()
).put(
"groupId", fileEntry.getGroupId()
).put(
"size", fileEntry.getSize()
);

if (image) {
jsonObject.put(
"url", _dlurlHelper.getImagePreviewURL(fileEntry, null));
}
else {
jsonObject.put(
"url",
_dlurlHelper.getPreviewURL(
fileEntry, fileEntry.getFileVersion(), null, ""));
}

jsonObject.put("uuid", fileEntry.getUuid());

return jsonObject.toString();
}

private List<DDMFormField> _getRootDDMFormFields(
DDMStructure ddmStructure) {

Expand Down Expand Up @@ -1194,28 +1158,6 @@ private Page<StructuredContent> _getStructuredContentsPage(
sorts, this::_toStructuredContent);
}

private String _getValue(ContentFieldValue contentFieldValue)
throws Exception {

if (contentFieldValue.getData() != null) {
return contentFieldValue.getData();
}
else if (contentFieldValue.getDocument() != null) {
return _getFileEntryJSONObject(
_jsonFactory.createJSONObject(
String.valueOf(contentFieldValue.getDocument())),
false);
}
else if (contentFieldValue.getImage() != null) {
return _getFileEntryJSONObject(
_jsonFactory.createJSONObject(
String.valueOf(contentFieldValue.getImage())),
true);
}

return null;
}

private boolean _isNeverExpire(
StructuredContent structuredContent, JournalArticle journalArticle) {

Expand All @@ -1234,10 +1176,9 @@ private boolean _isNeverExpire(
return neverExpire;
}

private void _populateContentFieldValuesMap(
ContentField[] contentFields,
Map<String, List<ContentFieldValue>> contentFieldValuesMap)
throws Exception {
private void _populateContentFieldsMap(
ContentField[] contentFields,
Map<String, List<ContentField>> contentFieldsMap) {

if (ArrayUtil.isEmpty(contentFields)) {
return;
Expand All @@ -1247,18 +1188,16 @@ private void _populateContentFieldValuesMap(
ContentFieldValue contentFieldValue =
contentField.getContentFieldValue();

if ((contentFieldValue != null) &&
(_getValue(contentFieldValue) != null)) {

List<ContentFieldValue> contentFieldValues =
contentFieldValuesMap.computeIfAbsent(
if (contentFieldValue != null) {
List<ContentField> contentFieldsList =
contentFieldsMap.computeIfAbsent(
contentField.getName(), key -> new ArrayList<>());

contentFieldValues.add(contentFieldValue);
contentFieldsList.add(contentField);
}

_populateContentFieldValuesMap(
contentField.getNestedContentFields(), contentFieldValuesMap);
_populateContentFieldsMap(
contentField.getNestedContentFields(), contentFieldsMap);
}
}

Expand Down Expand Up @@ -1316,13 +1255,12 @@ private Fields _toFields(
return fields;
}

Map<String, List<ContentFieldValue>> contentFieldValuesMap =
new HashMap<>();
Map<String, List<ContentField>> contentFieldsMap = new HashMap<>();

_populateContentFieldValuesMap(contentFields, contentFieldValuesMap);
_populateContentFieldsMap(contentFields, contentFieldsMap);

for (Map.Entry<String, List<ContentFieldValue>> entry :
contentFieldValuesMap.entrySet()) {
for (Map.Entry<String, List<ContentField>> entry :
contentFieldsMap.entrySet()) {

Field field = fields.get(entry.getKey());

Expand All @@ -1332,12 +1270,24 @@ private Fields _toFields(

List<Serializable> fieldValues = new ArrayList<>();

for (ContentFieldValue contentFieldValue : entry.getValue()) {
fieldValues.add(
FieldConstants.getSerializable(
contextAcceptLanguage.getPreferredLocale(),
LocaleUtil.ROOT, field.getDataType(),
_getValue(contentFieldValue)));
for (ContentField contentField : entry.getValue()) {
Value value = DDMValueUtil.toDDMValue(
contentField,
DDMFormFieldUtil.getDDMFormField(
_ddmStructureService, ddmStructure,
contentField.getName()),
_dlAppService, journalArticle.getGroupId(),
_journalArticleService, _layoutLocalService,
contextAcceptLanguage.getPreferredLocale());

if (value != null) {
fieldValues.add(
FieldConstants.getSerializable(
contextAcceptLanguage.getPreferredLocale(),
LocaleUtil.ROOT, field.getDataType(),
value.getString(
contextAcceptLanguage.getPreferredLocale())));
}
}

if (ListUtil.isNotEmpty(fieldValues)) {
Expand Down Expand Up @@ -1662,9 +1612,6 @@ private void _validateContentFields(
@Reference
private DLAppService _dlAppService;

@Reference
private DLURLHelper _dlurlHelper;

@Reference
private DTOConverterRegistry _dtoConverterRegistry;

Expand Down Expand Up @@ -1710,9 +1657,6 @@ private void _validateContentFields(
@Reference(target = "(ddm.form.values.serializer.type=json)")
private DDMFormValuesSerializer _jsonDDMFormValuesSerializer;

@Reference
private JSONFactory _jsonFactory;

@Reference
private LayoutDisplayPageProviderRegistry
_layoutDisplayPageProviderRegistry;
Expand Down
2 changes: 2 additions & 0 deletions modules/apps/headless/headless-delivery/headless-delivery-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ dependencies {
testIntegrationImplementation project(":apps:headless:headless-delivery:headless-delivery-client")
testIntegrationImplementation project(":apps:info:info-api")
testIntegrationImplementation project(":apps:journal:journal-api")
testIntegrationImplementation project(":apps:journal:journal-article-dynamic-data-mapping-form-field-type-api")
testIntegrationImplementation project(":apps:journal:journal-test-util")
testIntegrationImplementation project(":apps:knowledge-base:knowledge-base-api")
testIntegrationImplementation project(":apps:layout:layout-api")
testIntegrationImplementation project(":apps:layout:layout-dynamic-data-mapping-form-field-type-api")
testIntegrationImplementation project(":apps:layout:layout-page-template-api")
testIntegrationImplementation project(":apps:layout:layout-page-template-test-util")
testIntegrationImplementation project(":apps:layout:layout-test-util")
Expand Down
Loading