.
This commit is contained in:
+8
-71
@@ -1,89 +1,26 @@
|
|||||||
# GitLab CI pipeline for marketing-parser.
|
image: eclipse-temurin:21-jdk
|
||||||
# CI: runs Maven unit tests, enforces JaCoCo coverage, and publishes reports on merge requests and protected-branch pushes.
|
|
||||||
# CD: existing publish job pushes the Docker image to ghcr.io on push to analyze-graphics.
|
|
||||||
# Optional: SSH deploy when CI/CD variable ENABLE_SSH_DEPLOY=true and deploy secrets are set.
|
|
||||||
#
|
|
||||||
# CI/CD variables (Settings → CI/CD → Variables):
|
|
||||||
# GHCR_USERNAME, GHCR_TOKEN — for docker push (GitHub user + PAT with write:packages)
|
|
||||||
# ENABLE_SSH_DEPLOY = true (optional; omit or false to skip deploy job)
|
|
||||||
# DEPLOY_HOST, DEPLOY_USER, DEPLOY_SSH_KEY, DEPLOY_SCRIPT — optional deploy
|
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository"
|
MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository"
|
||||||
|
|
||||||
default:
|
stages:
|
||||||
tags:
|
- test
|
||||||
- marketing-parser
|
|
||||||
|
|
||||||
workflow:
|
|
||||||
rules:
|
|
||||||
# Merge requests whose target branch is analyze-graphics
|
|
||||||
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "analyze-graphics"
|
|
||||||
# Direct pushes to analyze-graphics
|
|
||||||
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "analyze-graphics"
|
|
||||||
# Manual pipeline (Run pipeline in UI)
|
|
||||||
- if: $CI_PIPELINE_SOURCE == "web"
|
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
key: ${CI_COMMIT_REF_SLUG}
|
key: ${CI_COMMIT_REF_SLUG}
|
||||||
paths:
|
paths:
|
||||||
- .m2/repository
|
- .m2/repository
|
||||||
|
|
||||||
stages:
|
test:
|
||||||
- test
|
|
||||||
- publish
|
|
||||||
- deploy
|
|
||||||
|
|
||||||
build-and-test:
|
|
||||||
stage: test
|
stage: test
|
||||||
image: maven:3.9.9-eclipse-temurin-21
|
before_script:
|
||||||
|
- chmod +x mvnw
|
||||||
script:
|
script:
|
||||||
- mvn -B -ntp clean verify
|
- ./mvnw --batch-mode clean verify
|
||||||
after_script:
|
|
||||||
- |
|
|
||||||
if [ "$CI_JOB_STATUS" != "success" ]; then
|
|
||||||
echo "ALERT: marketing-parser unit tests or JaCoCo coverage threshold failed."
|
|
||||||
fi
|
|
||||||
artifacts:
|
artifacts:
|
||||||
when: always
|
when: always
|
||||||
expire_in: 7 days
|
|
||||||
paths:
|
paths:
|
||||||
- target/site/jacoco
|
- target/site/jacoco/
|
||||||
- target/surefire-reports
|
|
||||||
reports:
|
reports:
|
||||||
junit:
|
junit:
|
||||||
- target/surefire-reports/TEST-*.xml
|
- target/surefire-reports/TEST-*.xml
|
||||||
|
|
||||||
docker-build-push:
|
|
||||||
stage: publish
|
|
||||||
needs: [build-and-test]
|
|
||||||
rules:
|
|
||||||
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "analyze-graphics" && $GHCR_USERNAME && $GHCR_TOKEN
|
|
||||||
image: docker:24-cli
|
|
||||||
services:
|
|
||||||
- docker:24-dind
|
|
||||||
variables:
|
|
||||||
DOCKER_HOST: tcp://docker:2375
|
|
||||||
DOCKER_TLS_CERTDIR: ""
|
|
||||||
before_script:
|
|
||||||
- until docker info; do sleep 1; done
|
|
||||||
- echo "$GHCR_TOKEN" | docker login ghcr.io -u "$GHCR_USERNAME" --password-stdin
|
|
||||||
script:
|
|
||||||
- IMG=$(echo "$CI_PROJECT_PATH" | tr '[:upper:]' '[:lower:]')
|
|
||||||
- docker build -t "ghcr.io/${IMG}:latest" -t "ghcr.io/${IMG}:${CI_COMMIT_SHA}" .
|
|
||||||
- docker push "ghcr.io/${IMG}:latest"
|
|
||||||
- docker push "ghcr.io/${IMG}:${CI_COMMIT_SHA}"
|
|
||||||
|
|
||||||
deploy:
|
|
||||||
stage: deploy
|
|
||||||
needs: [docker-build-push]
|
|
||||||
rules:
|
|
||||||
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "analyze-graphics" && $ENABLE_SSH_DEPLOY == "true" && $GHCR_USERNAME && $GHCR_TOKEN
|
|
||||||
image: alpine:3.20
|
|
||||||
before_script:
|
|
||||||
- apk add --no-cache openssh-client
|
|
||||||
- mkdir -p ~/.ssh
|
|
||||||
- echo "$DEPLOY_SSH_KEY" | tr -d '\r' > ~/.ssh/id_rsa
|
|
||||||
- chmod 600 ~/.ssh/id_rsa
|
|
||||||
script:
|
|
||||||
- ssh -o StrictHostKeyChecking=no "$DEPLOY_USER@$DEPLOY_HOST" "$DEPLOY_SCRIPT"
|
|
||||||
|
|||||||
@@ -228,7 +228,7 @@
|
|||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
<execution>
|
<execution>
|
||||||
<id>check</id>
|
<id>qg01-coverage-check</id>
|
||||||
<phase>verify</phase>
|
<phase>verify</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>check</goal>
|
<goal>check</goal>
|
||||||
|
|||||||
@@ -64,6 +64,11 @@ class JwtServiceTest {
|
|||||||
assertThrows(JwtException.class, () -> jwtService.parseAndValidate(token));
|
assertThrows(JwtException.class, () -> jwtService.parseAndValidate(token));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void parseAndValidateShouldThrowForMalformedToken() {
|
||||||
|
assertThrows(JwtException.class, () -> jwtService.parseAndValidate("not-a-jwt"));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void constructorWithoutConfiguredSecretShouldUseDefaultSigningKey() {
|
void constructorWithoutConfiguredSecretShouldUseDefaultSigningKey() {
|
||||||
JwtService serviceWithDefaultKey = new JwtService("");
|
JwtService serviceWithDefaultKey = new JwtService("");
|
||||||
@@ -76,6 +81,7 @@ class JwtServiceTest {
|
|||||||
void extractTokenFromHeaderShouldHandleBearerPrefixBlankAndRawToken() {
|
void extractTokenFromHeaderShouldHandleBearerPrefixBlankAndRawToken() {
|
||||||
assertNull(jwtService.extractTokenFromHeader(null));
|
assertNull(jwtService.extractTokenFromHeader(null));
|
||||||
assertNull(jwtService.extractTokenFromHeader(" "));
|
assertNull(jwtService.extractTokenFromHeader(" "));
|
||||||
|
assertEquals("", jwtService.extractTokenFromHeader("Bearer "));
|
||||||
assertEquals("sample-token", jwtService.extractTokenFromHeader("Bearer sample-token"));
|
assertEquals("sample-token", jwtService.extractTokenFromHeader("Bearer sample-token"));
|
||||||
assertEquals("raw-token", jwtService.extractTokenFromHeader("raw-token"));
|
assertEquals("raw-token", jwtService.extractTokenFromHeader("raw-token"));
|
||||||
}
|
}
|
||||||
@@ -114,6 +120,17 @@ class JwtServiceTest {
|
|||||||
assertNull(jwtService.extractUserIdFromToken("not-a-jwt"));
|
assertNull(jwtService.extractUserIdFromToken("not-a-jwt"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void extractUserIdFromTokenShouldReturnNullForInvalidSignature() {
|
||||||
|
String token = createToken(
|
||||||
|
Base64.getEncoder().encodeToString("another-valid-secret-key-1234567".getBytes(StandardCharsets.UTF_8)),
|
||||||
|
"qa@example.com",
|
||||||
|
Instant.now().plusSeconds(3600),
|
||||||
|
Map.of("uid", 123L));
|
||||||
|
|
||||||
|
assertNull(jwtService.extractUserIdFromToken(token));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void extractUserIdFromHeaderShouldExtractFromBearerToken() {
|
void extractUserIdFromHeaderShouldExtractFromBearerToken() {
|
||||||
String token = createToken(TEST_SECRET, "qa@example.com", Instant.now().plusSeconds(3600), Map.of("uid", 501L));
|
String token = createToken(TEST_SECRET, "qa@example.com", Instant.now().plusSeconds(3600), Map.of("uid", 501L));
|
||||||
@@ -131,6 +148,7 @@ class JwtServiceTest {
|
|||||||
@Test
|
@Test
|
||||||
void extractEmailFromTokenShouldReturnNullForInvalidToken() {
|
void extractEmailFromTokenShouldReturnNullForInvalidToken() {
|
||||||
assertNull(jwtService.extractEmailFromToken("broken-token"));
|
assertNull(jwtService.extractEmailFromToken("broken-token"));
|
||||||
|
assertNull(jwtService.extractEmailFromToken(" "));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
@@ -350,8 +350,8 @@ class PostingTaskServiceTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void executeTaskShouldFailWhenCredentialsAreMissing() {
|
void executeTaskShouldFailWhenCredentialsAreMissingForNonFacebookPlatforms() {
|
||||||
PostingTask task = task("task-1", "user-1", "facebook", "pending");
|
PostingTask task = task("task-1", "user-1", "linkedin", "pending");
|
||||||
List<String> savedStatuses = new ArrayList<>();
|
List<String> savedStatuses = new ArrayList<>();
|
||||||
|
|
||||||
when(taskRepository.findById("task-1")).thenReturn(Optional.of(task));
|
when(taskRepository.findById("task-1")).thenReturn(Optional.of(task));
|
||||||
@@ -360,13 +360,14 @@ class PostingTaskServiceTest {
|
|||||||
savedStatuses.add(savedTask.getStatus());
|
savedStatuses.add(savedTask.getStatus());
|
||||||
return savedTask;
|
return savedTask;
|
||||||
});
|
});
|
||||||
when(credentialsService.getCredentials("user-1", "facebook")).thenReturn(null);
|
when(credentialsService.getCredentials("user-1", "linkedin")).thenReturn(null);
|
||||||
|
|
||||||
postingTaskService.executeTask("task-1");
|
postingTaskService.executeTask("task-1");
|
||||||
|
|
||||||
assertEquals(List.of("processing", "failed"), savedStatuses);
|
assertEquals(List.of("processing", "failed"), savedStatuses);
|
||||||
assertEquals("failed", task.getStatus());
|
assertEquals("failed", task.getStatus());
|
||||||
assertEquals("Credentials not found for platform: facebook", task.getErrorMessage());
|
assertEquals("Credentials not found for platform: linkedin", task.getErrorMessage());
|
||||||
|
verifyNoInteractions(linkedInPostingService);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -383,6 +384,47 @@ class PostingTaskServiceTest {
|
|||||||
assertEquals("Platform not supported: instagram", task.getErrorMessage());
|
assertEquals("Platform not supported: instagram", task.getErrorMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void executeTaskShouldCompleteWhenFacebookReturnsNullPostId() throws Exception {
|
||||||
|
PostingTask task = task("task-1", "user-1", "facebook", "pending");
|
||||||
|
task.setPostText("Silent post");
|
||||||
|
task.setHashtags(List.of("#silent"));
|
||||||
|
|
||||||
|
when(taskRepository.findById("task-1")).thenReturn(Optional.of(task));
|
||||||
|
when(taskRepository.save(any(PostingTask.class))).thenAnswer(invocation -> invocation.getArgument(0));
|
||||||
|
when(facebookPostingService.postToPage("Silent post", List.of("#silent"))).thenReturn(null);
|
||||||
|
|
||||||
|
postingTaskService.executeTask("task-1");
|
||||||
|
|
||||||
|
assertEquals("completed", task.getStatus());
|
||||||
|
assertNull(task.getErrorMessage());
|
||||||
|
verify(facebookPostingService).postToPage("Silent post", List.of("#silent"));
|
||||||
|
verify(facebookPostingService, never()).sendPrivateMessage(anyString(), anyString());
|
||||||
|
verify(facebookPostingService, never()).sendPrivateImageMessage(anyString(), any());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void executeTaskShouldFailWhenTelegramPublishingTimesOut() {
|
||||||
|
PostingTask task = task("task-1", "user-1", "telegram", "pending");
|
||||||
|
task.setPostText("Timeout post");
|
||||||
|
task.setHashtags(List.of("#timeout"));
|
||||||
|
|
||||||
|
when(taskRepository.findById("task-1")).thenReturn(Optional.of(task));
|
||||||
|
when(taskRepository.save(any(PostingTask.class))).thenAnswer(invocation -> invocation.getArgument(0));
|
||||||
|
when(credentialsService.getCredentials("user-1", "telegram")).thenReturn("{\"botToken\":\"t\",\"chatId\":\"1\"}");
|
||||||
|
when(telegramPostingService.postToTelegram(
|
||||||
|
"{\"botToken\":\"t\",\"chatId\":\"1\"}",
|
||||||
|
"Timeout post",
|
||||||
|
List.of("#timeout")))
|
||||||
|
.thenThrow(new RuntimeException("Network timeout"));
|
||||||
|
|
||||||
|
postingTaskService.executeTask("task-1");
|
||||||
|
|
||||||
|
assertEquals("failed", task.getStatus());
|
||||||
|
assertEquals("Network timeout", task.getErrorMessage());
|
||||||
|
assertNotNull(task.getExecutedAt());
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void executeTaskShouldHandleFacebookExpiredToken() throws Exception {
|
void executeTaskShouldHandleFacebookExpiredToken() throws Exception {
|
||||||
PostingTask task = task("task-1", "user-1", "facebook", "pending");
|
PostingTask task = task("task-1", "user-1", "facebook", "pending");
|
||||||
|
|||||||
Reference in New Issue
Block a user