#442 add content aliases

CHANGELOG.md

@@ -10,6 +10,8 @@ see wiki for more information: [wiki](https://github.com/thmarx/cms/wiki)
 
 * **MAINTENANCE** multiple dependencies updated
 * **MAINTENANCE** maven wrapper added to project
+* **FEATURE** Developer Experience [PR-440](https://github.com/CondationCMS/cms-server/pull/440)
+* **FEATURE** Aliases for content [442](https://github.com/CondationCMS/cms-server/issues/442)
 
 ### Developer experience
 

cms-api/src/main/java/com/condation/cms/api/db/Content.java

@@ -35,6 +35,8 @@
 public interface Content {
 	boolean isVisible (String uri);
 
+	boolean isVisible (ContentNode node);
+
 	List<ContentNode>  listSections(final ReadOnlyFile contentFile);
 
 	List<ContentNode> listContent(final ReadOnlyFile base, final String start);

cms-content/src/main/java/com/condation/cms/content/ContentResolver.java

@@ -101,24 +101,37 @@ private Optional<ContentResponse> getContent(final RequestContext context, boole
 			var tempFile = contentPath.resolve("index.md");
 			if (tempFile.exists()) {
 				contentFile = tempFile;
-			} else {
-				return Optional.empty();
 			}
 		} else {
 			var temp = contentBase.resolve(path + ".md");
 			if (temp.exists()) {
 				contentFile = temp;
-			} else {
-				return Optional.empty();
 			}
 		}
 
-		var uri = PathUtil.toRelativeFile(contentFile, contentBase);
-		if (checkVisibility && !db.getContent().isVisible(uri)) {
+		// handle alias
+		ContentNode contentNode = null;
+		if (contentFile == null || !contentFile.exists()) {
+			var query = db.getContent().query((node, count) -> node);
+			var result = query.whereContains("aliases", "/" + path).get();
+			if (!result.isEmpty()) {
+				contentNode = result.getFirst();
+				contentFile = contentBase.resolve(contentNode.uri());
+			}
+		} else {
+			var uri = PathUtil.toRelativeFile(contentFile, contentBase);
+			contentNode = db.getContent().byUri(uri).get();
+		}
+
+		if (contentNode == null) {
 			return Optional.empty();
 		}
 
-		final ContentNode contentNode = db.getContent().byUri(uri).get();
+		if (checkVisibility && !db.getContent().isVisible(contentNode)) {
+			return Optional.empty();
+		}
+
+
 		if (contentNode.isRedirect()) {
 			return Optional.of(new ContentResponse(contentNode));
 		} else if (!Constants.NodeType.PAGE.equals(contentNode.nodeType())) {
@@ -137,7 +150,7 @@ private Optional<ContentResponse> getContent(final RequestContext context, boole
 			var contentType = contentNode.contentType();
 
 			return Optional.of(new ContentResponse(content, contentType, contentNode));
-		} catch (Exception ex) {
+		} catch (IOException ex) {
 			log.error(null, ex);
 			return Optional.empty();
 		}

cms-filesystem/src/main/java/com/condation/cms/filesystem/FileContent.java

@@ -49,6 +49,11 @@ public boolean isVisible(String uri) {
 		return fileSystem.isVisible(uri);
 	}
 
+	@Override
+	public boolean isVisible(ContentNode node) {
+		return fileSystem.isVisible(node.uri());
+	}
+
 	@Override
 	public List<ContentNode> listSections(ReadOnlyFile contentFile) {
 		String folder = PathUtil.toRelativePath(contentFile, cmsFileSystem.contentBase());

cms-server/hosts/test/content/alias-hidden.md

@@ -0,0 +1,12 @@
+---
+title: StartseiteView
+template: test.ftl
+tags: [eins,zwei,drei]
+date: 2023-12-02
+datetime: 2023-12-02T13:10:12
+published: false
+aliases:
+  - /hidden
+---
+
+Und hier der Inhalt

cms-server/hosts/test/content/test.md

@@ -4,6 +4,9 @@ template: test.ftl
 tags: [eins,zwei,drei]
 date: 2023-12-02
 datetime: 2023-12-02T13:10:12
+aliases:
+  - /alias2
+  - /alias3/sub1
 ---
 
 Und hier der Inhalt

cms-server/src/test/java/com/condation/cms/content/ContentResolverTest.java

@@ -100,5 +100,31 @@ public void test_hidden_folder() throws IOException {
 		optional = contentResolver.getErrorContent(context);
 		Assertions.assertThat(optional).isPresent();
 	}
+
+	@Test
+	public void testAliases() throws IOException {
+
+		var context = TestHelper.requestContext("alias2");
+		var optional = contentResolver.getContent(context);
+		Assertions.assertThat(optional).isPresent();
+		Assertions.assertThat(optional.get().node().data()).containsEntry("title", "StartseiteView");
+
+		context = TestHelper.requestContext("alias3/sub1");
+		optional = contentResolver.getContent(context);
+		Assertions.assertThat(optional).isPresent();
+		Assertions.assertThat(optional.get().node().data()).containsEntry("title", "StartseiteView");
+	}
+
+	@Test
+	public void test_not_published() throws IOException {
+
+		var context = TestHelper.requestContext("alias-hidden");
+		var optional = contentResolver.getContent(context);
+		Assertions.assertThat(optional).isEmpty();
+
+		context = TestHelper.requestContext("hidden");
+		optional = contentResolver.getContent(context);
+		Assertions.assertThat(optional).isEmpty();
+	}
 
 }