Telegram-Bots/gitlab-notification
4
1
Fork 0
Code Issues 21 Pull Requests 1 Packages Projects 2 Releases 1 Activity

release-0.0.6

Browse Source
This commit is contained in:
Struchkov Mark 2022-01-26 10:56:18 +03:00
parent 1392326ee3
commit 52e643f3a4
150 changed files with 892 additions and 1314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,36 @@
image: maven:3.8.4-openjdk-11
variables:
MAVEN_OPTS: "-Dmaven.repo.local=./.m2/repository"
stages:
- build
- deploy
build:
stage: build
only:
- /^\d+\.\d\.\d$/
except:
- branches
script:
- 'mvn -U clean package'
artifacts:
paths:
- gitlab-app/target/gitlab-notification.jar
docker-build-master:
image: docker:latest
stage: deploy
only:
- master
except:
- tags
services:
- docker:dind
before_script:
- echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
script:
- cd publisher-telegram
- docker build --no-cache -t "$CI_REGISTRY_IMAGE:latest" . -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
- docker push "$CI_REGISTRY_IMAGE:latest"
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"

53
bot-context/pom.xml
View File

@ -2,12 +2,12 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>gitlab-bot</artifactId>
<groupId>org.sadtech.bot.gitlab</groupId>
<version>3.0.1-RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>dev.struchkov.bot.gitlab</groupId>
<artifactId>gitlab-bot</artifactId>
<version>3.1.0</version>
</parent>
<artifactId>bot-context</artifactId>
<version>${gitlab.context.version}</version>
@ -19,12 +19,12 @@
</dependency>
<dependency>
<groupId>org.sadtech.haiti</groupId>
<groupId>dev.struchkov.haiti</groupId>
<artifactId>haiti-context</artifactId>
</dependency>
<dependency>
<groupId>org.sadtech.haiti.filter</groupId>
<groupId>dev.struchkov.haiti.filter</groupId>
<artifactId>haiti-filter-criteria</artifactId>
</dependency>
@ -39,43 +39,4 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<configuration>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
</plugin>
</plugins>
</build>
<developers>
<developer>
<id>uPagge</id>
<name>Struchkov Mark</name>
<email>upagge@ya.ru</email>
<organization>SADTECH</organization>
<organizationUrl>https://sadtech.org</organizationUrl>
<url>https://uPagge.sadtech.org</url>
<roles>
<role>Project lead</role>
</roles>
<timezone>+3</timezone>
</developer>
</developers>
</project>

2
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/Answer.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/Answer.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.context.domain;
package dev.struchkov.bot.gitlab.context.domain;
import lombok.AccessLevel;
import lombok.Getter;

4
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/AppLocale.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/AppLocale.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.gitlab.context.domain;
package dev.struchkov.bot.gitlab.context.domain;
import dev.struchkov.haiti.context.exception.NotFoundException;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NonNull;
import org.sadtech.haiti.context.exception.NotFoundException;
import java.util.Arrays;
import java.util.Locale;

2
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/IdAndStatusPr.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/IdAndStatusPr.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.context.domain;
package dev.struchkov.bot.gitlab.context.domain;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/MergeRequestState.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/MergeRequestState.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.context.domain;
package dev.struchkov.bot.gitlab.context.domain;
/**
* // TODO: 14.01.2021 Добавить описание.

2
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/MessageSend.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/MessageSend.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.context.domain;
package dev.struchkov.bot.gitlab.context.domain;
import lombok.AllArgsConstructor;
import lombok.Builder;

2
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/PersonInformation.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/PersonInformation.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.context.domain;
package dev.struchkov.bot.gitlab.context.domain;
import lombok.Data;

2
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/PipelineStatus.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/PipelineStatus.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.context.domain;
package dev.struchkov.bot.gitlab.context.domain;
/**
* // TODO: 17.01.2021 Добавить описание.

2
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/PointType.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/PointType.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.context.domain;
package dev.struchkov.bot.gitlab.context.domain;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

6
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/AppSetting.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/entity/AppSetting.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.gitlab.context.domain.entity;
package dev.struchkov.bot.gitlab.context.domain.entity;
import dev.struchkov.haiti.context.domain.BasicEntity;
import lombok.Getter;
import lombok.Setter;
import org.sadtech.bot.gitlab.context.domain.AppLocale;
import org.sadtech.haiti.context.domain.BasicEntity;
import dev.struchkov.bot.gitlab.context.domain.AppLocale;
import javax.persistence.Column;
import javax.persistence.Entity;

4
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Discussion.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/entity/Discussion.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.gitlab.context.domain.entity;
package dev.struchkov.bot.gitlab.context.domain.entity;
import dev.struchkov.haiti.context.domain.BasicEntity;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.sadtech.haiti.context.domain.BasicEntity;
import javax.persistence.CascadeType;
import javax.persistence.Column;

6
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/MergeRequest.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/entity/MergeRequest.java
View File

@ -1,10 +1,10 @@
package org.sadtech.bot.gitlab.context.domain.entity;
package dev.struchkov.bot.gitlab.context.domain.entity;
import dev.struchkov.haiti.context.domain.BasicEntity;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.sadtech.bot.gitlab.context.domain.MergeRequestState;
import org.sadtech.haiti.context.domain.BasicEntity;
import dev.struchkov.bot.gitlab.context.domain.MergeRequestState;
import javax.persistence.CollectionTable;
import javax.persistence.Column;

2
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/MergeRequestMini.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/entity/MergeRequestMini.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.context.domain.entity;
package dev.struchkov.bot.gitlab.context.domain.entity;
import lombok.EqualsAndHashCode;
import lombok.Getter;

4
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Note.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/entity/Note.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.gitlab.context.domain.entity;
package dev.struchkov.bot.gitlab.context.domain.entity;
import dev.struchkov.haiti.context.domain.BasicEntity;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.sadtech.haiti.context.domain.BasicEntity;
import javax.persistence.Column;
import javax.persistence.Entity;

4
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/NotifySetting.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/entity/NotifySetting.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.gitlab.context.domain.entity;
package dev.struchkov.bot.gitlab.context.domain.entity;
import dev.struchkov.haiti.context.domain.BasicEntity;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.sadtech.haiti.context.domain.BasicEntity;
import javax.persistence.Column;
import javax.persistence.Id;

4
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Person.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/entity/Person.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.gitlab.context.domain.entity;
package dev.struchkov.bot.gitlab.context.domain.entity;
import dev.struchkov.haiti.context.domain.BasicEntity;
import lombok.Getter;
import lombok.Setter;
import org.sadtech.haiti.context.domain.BasicEntity;
import javax.persistence.Column;
import javax.persistence.Entity;

6
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Pipeline.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/entity/Pipeline.java
View File

@ -1,10 +1,10 @@
package org.sadtech.bot.gitlab.context.domain.entity;
package dev.struchkov.bot.gitlab.context.domain.entity;
import dev.struchkov.haiti.context.domain.BasicEntity;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.sadtech.bot.gitlab.context.domain.PipelineStatus;
import org.sadtech.haiti.context.domain.BasicEntity;
import dev.struchkov.bot.gitlab.context.domain.PipelineStatus;
import javax.persistence.Column;
import javax.persistence.Entity;

4
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/entity/Project.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/entity/Project.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.gitlab.context.domain.entity;
package dev.struchkov.bot.gitlab.context.domain.entity;
import dev.struchkov.haiti.context.domain.BasicEntity;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.sadtech.haiti.context.domain.BasicEntity;
import javax.persistence.Column;
import javax.persistence.Entity;

4
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/filter/MergeRequestFilter.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/filter/MergeRequestFilter.java
View File

@ -1,12 +1,12 @@
package org.sadtech.bot.gitlab.context.domain.filter;
package dev.struchkov.bot.gitlab.context.domain.filter;
import dev.struchkov.bot.gitlab.context.domain.MergeRequestState;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.sadtech.bot.gitlab.context.domain.MergeRequestState;
import java.util.Set;

2
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/filter/PipelineFilter.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/filter/PipelineFilter.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.context.domain.filter;
package dev.struchkov.bot.gitlab.context.domain.filter;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;

12
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/GoodMorningNotify.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/GoodMorningNotify.java
View File

@ -1,12 +1,12 @@
package org.sadtech.bot.gitlab.context.domain.notify;
package dev.struchkov.bot.gitlab.context.domain.notify;
import dev.struchkov.bot.gitlab.context.domain.entity.MergeRequest;
import dev.struchkov.bot.gitlab.context.service.AppSettingService;
import dev.struchkov.bot.gitlab.context.utils.MessageUtils;
import dev.struchkov.bot.gitlab.context.utils.Smile;
import dev.struchkov.bot.gitlab.context.utils.UpdateDataComparator;
import lombok.Builder;
import lombok.Getter;
import org.sadtech.bot.gitlab.context.domain.entity.MergeRequest;
import org.sadtech.bot.gitlab.context.service.AppSettingService;
import org.sadtech.bot.gitlab.context.utils.MessageUtils;
import org.sadtech.bot.gitlab.context.utils.Smile;
import org.sadtech.bot.gitlab.context.utils.UpdateDataComparator;
import java.util.List;
import java.util.stream.Collectors;

6
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/NewProjectNotify.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/NewProjectNotify.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.gitlab.context.domain.notify;
package dev.struchkov.bot.gitlab.context.domain.notify;
import dev.struchkov.bot.gitlab.context.service.AppSettingService;
import dev.struchkov.bot.gitlab.context.utils.Smile;
import lombok.Builder;
import org.sadtech.bot.gitlab.context.service.AppSettingService;
import org.sadtech.bot.gitlab.context.utils.Smile;
/**
* // TODO: 15.01.2021 Добавить описание.

4
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/Notify.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/Notify.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.gitlab.context.domain.notify;
package dev.struchkov.bot.gitlab.context.domain.notify;
import dev.struchkov.bot.gitlab.context.service.AppSettingService;
import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;
import org.sadtech.bot.gitlab.context.service.AppSettingService;
import java.util.Set;
import java.util.stream.Collectors;

4
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/SimpleTextNotify.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/SimpleTextNotify.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.gitlab.context.domain.notify;
package dev.struchkov.bot.gitlab.context.domain.notify;
import dev.struchkov.bot.gitlab.context.service.AppSettingService;
import lombok.Builder;
import lombok.Getter;
import org.sadtech.bot.gitlab.context.service.AppSettingService;
/**
* // TODO: 20.09.2020 Добавить описание.

10
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/comment/AnswerCommentNotify.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/comment/AnswerCommentNotify.java
View File

@ -1,11 +1,11 @@
package org.sadtech.bot.gitlab.context.domain.notify.comment;
package dev.struchkov.bot.gitlab.context.domain.notify.comment;
import dev.struchkov.bot.gitlab.context.domain.Answer;
import dev.struchkov.bot.gitlab.context.utils.Smile;
import lombok.Builder;
import lombok.Getter;
import org.sadtech.bot.gitlab.context.domain.Answer;
import org.sadtech.bot.gitlab.context.domain.notify.Notify;
import org.sadtech.bot.gitlab.context.service.AppSettingService;
import org.sadtech.bot.gitlab.context.utils.Smile;
import dev.struchkov.bot.gitlab.context.domain.notify.Notify;
import dev.struchkov.bot.gitlab.context.service.AppSettingService;
import java.text.MessageFormat;
import java.util.List;

8
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/comment/CommentNotify.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/comment/CommentNotify.java
View File

@ -1,10 +1,10 @@
package org.sadtech.bot.gitlab.context.domain.notify.comment;
package dev.struchkov.bot.gitlab.context.domain.notify.comment;
import dev.struchkov.bot.gitlab.context.domain.notify.Notify;
import dev.struchkov.bot.gitlab.context.service.AppSettingService;
import dev.struchkov.bot.gitlab.context.utils.Smile;
import lombok.Builder;
import lombok.Getter;
import org.sadtech.bot.gitlab.context.domain.notify.Notify;
import org.sadtech.bot.gitlab.context.service.AppSettingService;
import org.sadtech.bot.gitlab.context.utils.Smile;
@Getter
public class CommentNotify extends Notify {

8
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pipeline/PipelineNotify.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pipeline/PipelineNotify.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.gitlab.context.domain.notify.pipeline;
package dev.struchkov.bot.gitlab.context.domain.notify.pipeline;
import lombok.Builder;
import org.sadtech.bot.gitlab.context.domain.notify.Notify;
import org.sadtech.bot.gitlab.context.service.AppSettingService;
import org.sadtech.bot.gitlab.context.utils.Smile;
import dev.struchkov.bot.gitlab.context.domain.notify.Notify;
import dev.struchkov.bot.gitlab.context.service.AppSettingService;
import dev.struchkov.bot.gitlab.context.utils.Smile;
import java.text.MessageFormat;

6
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/ConflictPrNotify.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/ConflictPrNotify.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.gitlab.context.domain.notify.pullrequest;
package dev.struchkov.bot.gitlab.context.domain.notify.pullrequest;
import lombok.Builder;
import lombok.Getter;
import org.sadtech.bot.gitlab.context.service.AppSettingService;
import org.sadtech.bot.gitlab.context.utils.Smile;
import dev.struchkov.bot.gitlab.context.service.AppSettingService;
import dev.struchkov.bot.gitlab.context.utils.Smile;
@Getter
public class ConflictPrNotify extends PrNotify {

6
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/ForgottenSmartPrNotify.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/ForgottenSmartPrNotify.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.gitlab.context.domain.notify.pullrequest;
package dev.struchkov.bot.gitlab.context.domain.notify.pullrequest;
import dev.struchkov.bot.gitlab.context.utils.Smile;
import lombok.Builder;
import lombok.Getter;
import org.sadtech.bot.gitlab.context.service.AppSettingService;
import org.sadtech.bot.gitlab.context.utils.Smile;
import dev.struchkov.bot.gitlab.context.service.AppSettingService;
/**
* // TODO: 11.10.2020 Добавить описание.

6
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/NewPrNotify.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/NewPrNotify.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.gitlab.context.domain.notify.pullrequest;
package dev.struchkov.bot.gitlab.context.domain.notify.pullrequest;
import lombok.Builder;
import lombok.Getter;
import org.sadtech.bot.gitlab.context.service.AppSettingService;
import org.sadtech.bot.gitlab.context.utils.Smile;
import dev.struchkov.bot.gitlab.context.service.AppSettingService;
import dev.struchkov.bot.gitlab.context.utils.Smile;
import java.util.Set;
import java.util.stream.Collectors;

4
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/PrNotify.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/PrNotify.java
View File

@ -1,7 +1,7 @@
package org.sadtech.bot.gitlab.context.domain.notify.pullrequest;
package dev.struchkov.bot.gitlab.context.domain.notify.pullrequest;
import lombok.Getter;
import org.sadtech.bot.gitlab.context.domain.notify.Notify;
import dev.struchkov.bot.gitlab.context.domain.notify.Notify;
@Getter
public abstract class PrNotify extends Notify {

8
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/StatusPrNotify.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/StatusPrNotify.java
View File

@ -1,10 +1,10 @@
package org.sadtech.bot.gitlab.context.domain.notify.pullrequest;
package dev.struchkov.bot.gitlab.context.domain.notify.pullrequest;
import lombok.Builder;
import lombok.Getter;
import org.sadtech.bot.gitlab.context.domain.MergeRequestState;
import org.sadtech.bot.gitlab.context.service.AppSettingService;
import org.sadtech.bot.gitlab.context.utils.Smile;
import dev.struchkov.bot.gitlab.context.domain.MergeRequestState;
import dev.struchkov.bot.gitlab.context.service.AppSettingService;
import dev.struchkov.bot.gitlab.context.utils.Smile;
@Getter
public class StatusPrNotify extends PrNotify {

6
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/pullrequest/UpdatePrNotify.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pullrequest/UpdatePrNotify.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.gitlab.context.domain.notify.pullrequest;
package dev.struchkov.bot.gitlab.context.domain.notify.pullrequest;
import dev.struchkov.bot.gitlab.context.utils.Smile;
import lombok.Builder;
import lombok.Getter;
import org.sadtech.bot.gitlab.context.service.AppSettingService;
import org.sadtech.bot.gitlab.context.utils.Smile;
import dev.struchkov.bot.gitlab.context.service.AppSettingService;
@Getter
public class UpdatePrNotify extends PrNotify {

6
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/task/TaskCloseNotify.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/task/TaskCloseNotify.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.gitlab.context.domain.notify.task;
package dev.struchkov.bot.gitlab.context.domain.notify.task;
import dev.struchkov.bot.gitlab.context.service.AppSettingService;
import dev.struchkov.bot.gitlab.context.utils.Smile;
import lombok.Builder;
import org.sadtech.bot.gitlab.context.service.AppSettingService;
import org.sadtech.bot.gitlab.context.utils.Smile;
/**
* // TODO: 10.09.2020 Добавить описание.

6
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/task/TaskNewNotify.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/task/TaskNewNotify.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.gitlab.context.domain.notify.task;
package dev.struchkov.bot.gitlab.context.domain.notify.task;
import dev.struchkov.bot.gitlab.context.service.AppSettingService;
import dev.struchkov.bot.gitlab.context.utils.Smile;
import lombok.Builder;
import lombok.Getter;
import org.sadtech.bot.gitlab.context.service.AppSettingService;
import org.sadtech.bot.gitlab.context.utils.Smile;
/**
* // TODO: 10.09.2020 Добавить описание.

4
bot-context/src/main/java/org/sadtech/bot/gitlab/context/domain/notify/task/TaskNotify.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/task/TaskNotify.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.gitlab.context.domain.notify.task;
package dev.struchkov.bot.gitlab.context.domain.notify.task;
import dev.struchkov.bot.gitlab.context.domain.notify.Notify;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import org.sadtech.bot.gitlab.context.domain.notify.Notify;
@Getter
@EqualsAndHashCode(callSuper = true)

6
bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/BitbucketBotException.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/exception/BitbucketBotException.java
View File

@ -1,6 +1,8 @@
package org.sadtech.bot.gitlab.context.exception;
package dev.struchkov.bot.gitlab.context.exception;
abstract class BitbucketBotException extends RuntimeException {
import dev.struchkov.haiti.context.exception.BasicException;
abstract class BitbucketBotException extends BasicException {
public BitbucketBotException(String message) {
super(message);

2
bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/RegException.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/exception/RegException.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.context.exception;
package dev.struchkov.bot.gitlab.context.exception;
public class RegException extends BitbucketBotException {

2
bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/UpdateException.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/exception/UpdateException.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.context.exception;
package dev.struchkov.bot.gitlab.context.exception;
public class UpdateException extends BitbucketBotException {

6
bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/AppSettingRepository.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/repository/AppSettingRepository.java
View File

@ -1,7 +1,7 @@
package org.sadtech.bot.gitlab.context.repository;
package dev.struchkov.bot.gitlab.context.repository;
import org.sadtech.bot.gitlab.context.domain.entity.AppSetting;
import org.sadtech.haiti.context.repository.SimpleManagerRepository;
import dev.struchkov.bot.gitlab.context.domain.entity.AppSetting;
import dev.struchkov.haiti.context.repository.SimpleManagerRepository;
/**
* // TODO: 16.01.2021 Добавить описание.

6
bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/DiscussionRepository.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/repository/DiscussionRepository.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.gitlab.context.repository;
package dev.struchkov.bot.gitlab.context.repository;
import dev.struchkov.bot.gitlab.context.domain.entity.Discussion;
import dev.struchkov.haiti.context.repository.SimpleManagerRepository;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.entity.Discussion;
import org.sadtech.haiti.context.repository.SimpleManagerRepository;
import java.util.List;

19
bot-context/src/main/java/dev/struchkov/bot/gitlab/context/repository/MergeRequestRepository.java Normal file
View File

@ -0,0 +1,19 @@
package dev.struchkov.bot.gitlab.context.repository;
import dev.struchkov.bot.gitlab.context.domain.entity.MergeRequest;
import dev.struchkov.haiti.context.repository.SimpleManagerRepository;
import dev.struchkov.haiti.filter.FilterOperation;
import lombok.NonNull;
import dev.struchkov.bot.gitlab.context.domain.IdAndStatusPr;
import dev.struchkov.bot.gitlab.context.domain.MergeRequestState;
import java.util.List;
import java.util.Set;
public interface MergeRequestRepository extends SimpleManagerRepository<MergeRequest, Long>, FilterOperation<MergeRequest> {
Set<IdAndStatusPr> findAllIdByStateIn(Set<MergeRequestState> states);
List<MergeRequest> findAllByAssignee(@NonNull Long userId);
}

10
bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/NoteRepository.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/repository/NoteRepository.java
View File

@ -1,10 +1,10 @@
package org.sadtech.bot.gitlab.context.repository;
package dev.struchkov.bot.gitlab.context.repository;
import dev.struchkov.bot.gitlab.context.domain.entity.Note;
import dev.struchkov.haiti.context.page.Pagination;
import dev.struchkov.haiti.context.page.Sheet;
import dev.struchkov.haiti.context.repository.SimpleManagerRepository;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.entity.Note;
import org.sadtech.haiti.context.page.Pagination;
import org.sadtech.haiti.context.page.Sheet;
import org.sadtech.haiti.context.repository.SimpleManagerRepository;
import java.util.List;

6
bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/NotifySettingRepository.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/repository/NotifySettingRepository.java
View File

@ -1,7 +1,7 @@
package org.sadtech.bot.gitlab.context.repository;
package dev.struchkov.bot.gitlab.context.repository;
import org.sadtech.bot.gitlab.context.domain.entity.NotifySetting;
import org.sadtech.haiti.context.repository.SimpleManagerRepository;
import dev.struchkov.bot.gitlab.context.domain.entity.NotifySetting;
import dev.struchkov.haiti.context.repository.SimpleManagerRepository;
/**
* // TODO: 20.09.2020 Добавить описание.

13
bot-context/src/main/java/dev/struchkov/bot/gitlab/context/repository/PersonRepository.java Normal file
View File

@ -0,0 +1,13 @@
package dev.struchkov.bot.gitlab.context.repository;
import dev.struchkov.bot.gitlab.context.domain.entity.Person;
import dev.struchkov.haiti.context.repository.SimpleManagerRepository;
/**
* // TODO: 15.01.2021 Добавить описание.
*
* @author upagge 15.01.2021
*/
public interface PersonRepository extends SimpleManagerRepository<Person, Long> {
}

21
bot-context/src/main/java/dev/struchkov/bot/gitlab/context/repository/PipelineRepository.java Normal file
View File

@ -0,0 +1,21 @@
package dev.struchkov.bot.gitlab.context.repository;
import dev.struchkov.bot.gitlab.context.domain.entity.Pipeline;
import dev.struchkov.haiti.context.page.Pagination;
import dev.struchkov.haiti.context.page.Sheet;
import dev.struchkov.haiti.context.repository.SimpleManagerRepository;
import dev.struchkov.haiti.filter.FilterOperation;
import lombok.NonNull;
import dev.struchkov.bot.gitlab.context.domain.PipelineStatus;
import java.util.Set;
/**
* // TODO: 17.01.2021 Добавить описание.
*
* @author upagge 17.01.2021
*/
public interface PipelineRepository extends SimpleManagerRepository<Pipeline, Long>, FilterOperation<Pipeline> {
Sheet<Pipeline> findAllByStatuses(@NonNull Set<PipelineStatus> statuses, @NonNull Pagination pagination);
}

6
bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/ProjectRepository.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/repository/ProjectRepository.java
View File

@ -1,7 +1,7 @@
package org.sadtech.bot.gitlab.context.repository;
package dev.struchkov.bot.gitlab.context.repository;
import org.sadtech.bot.gitlab.context.domain.entity.Project;
import org.sadtech.haiti.context.repository.SimpleManagerRepository;
import dev.struchkov.bot.gitlab.context.domain.entity.Project;
import dev.struchkov.haiti.context.repository.SimpleManagerRepository;
/**
* // TODO: 14.01.2021 Добавить описание.

4
bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/AppSettingService.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/service/AppSettingService.java
View File

@ -1,7 +1,7 @@
package org.sadtech.bot.gitlab.context.service;
package dev.struchkov.bot.gitlab.context.service;
import dev.struchkov.bot.gitlab.context.domain.AppLocale;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.AppLocale;
/**
* // TODO: 16.01.2021 Добавить описание.

2
bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/CleanService.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/service/CleanService.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.context.service;
package dev.struchkov.bot.gitlab.context.service;
/**
* // TODO: 08.02.2021 Добавить описание.

6
bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/DiscussionService.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/service/DiscussionService.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.gitlab.context.service;
package dev.struchkov.bot.gitlab.context.service;
import dev.struchkov.bot.gitlab.context.domain.entity.Discussion;
import dev.struchkov.haiti.context.service.SimpleManagerService;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.entity.Discussion;
import org.sadtech.haiti.context.service.SimpleManagerService;
import java.util.List;

14
bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/MergeRequestsService.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/service/MergeRequestsService.java
View File

@ -1,11 +1,11 @@
package org.sadtech.bot.gitlab.context.service;
package dev.struchkov.bot.gitlab.context.service;
import org.sadtech.bot.gitlab.context.domain.IdAndStatusPr;
import org.sadtech.bot.gitlab.context.domain.MergeRequestState;
import org.sadtech.bot.gitlab.context.domain.entity.MergeRequest;
import org.sadtech.bot.gitlab.context.domain.filter.MergeRequestFilter;
import org.sadtech.haiti.context.service.SimpleManagerService;
import org.sadtech.haiti.context.service.simple.FilterService;
import dev.struchkov.bot.gitlab.context.domain.IdAndStatusPr;
import dev.struchkov.bot.gitlab.context.domain.MergeRequestState;
import dev.struchkov.bot.gitlab.context.domain.entity.MergeRequest;
import dev.struchkov.haiti.context.service.SimpleManagerService;
import dev.struchkov.haiti.context.service.simple.FilterService;
import dev.struchkov.bot.gitlab.context.domain.filter.MergeRequestFilter;
import java.util.Set;

4
bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/MessageSendService.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/service/MessageSendService.java
View File

@ -1,7 +1,7 @@
package org.sadtech.bot.gitlab.context.service;
package dev.struchkov.bot.gitlab.context.service;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.notify.Notify;
import dev.struchkov.bot.gitlab.context.domain.notify.Notify;
@FunctionalInterface
public interface MessageSendService {

10
bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/NoteService.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/service/NoteService.java
View File

@ -1,10 +1,10 @@
package org.sadtech.bot.gitlab.context.service;
package dev.struchkov.bot.gitlab.context.service;
import dev.struchkov.bot.gitlab.context.domain.entity.Note;
import dev.struchkov.haiti.context.page.Pagination;
import dev.struchkov.haiti.context.page.Sheet;
import dev.struchkov.haiti.context.service.SimpleManagerService;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.entity.Note;
import org.sadtech.haiti.context.page.Pagination;
import org.sadtech.haiti.context.page.Sheet;
import org.sadtech.haiti.context.service.SimpleManagerService;
import java.util.List;

4
bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/NotifyService.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/service/NotifyService.java
View File

@ -1,6 +1,6 @@
package org.sadtech.bot.gitlab.context.service;
package dev.struchkov.bot.gitlab.context.service;
import org.sadtech.bot.gitlab.context.domain.notify.Notify;
import dev.struchkov.bot.gitlab.context.domain.notify.Notify;
/**
* Сервис по работе с изменениями в битбакете.

6
bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/PersonService.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/service/PersonService.java
View File

@ -1,7 +1,7 @@
package org.sadtech.bot.gitlab.context.service;
package dev.struchkov.bot.gitlab.context.service;
import org.sadtech.bot.gitlab.context.domain.entity.Person;
import org.sadtech.haiti.context.service.SimpleManagerService;
import dev.struchkov.bot.gitlab.context.domain.entity.Person;
import dev.struchkov.haiti.context.service.SimpleManagerService;
/**
* // TODO: 15.01.2021 Добавить описание.

23
bot-context/src/main/java/dev/struchkov/bot/gitlab/context/service/PipelineService.java Normal file
View File

@ -0,0 +1,23 @@
package dev.struchkov.bot.gitlab.context.service;
import dev.struchkov.bot.gitlab.context.domain.PipelineStatus;
import dev.struchkov.bot.gitlab.context.domain.entity.Pipeline;
import dev.struchkov.bot.gitlab.context.domain.filter.PipelineFilter;
import dev.struchkov.haiti.context.page.Pagination;
import dev.struchkov.haiti.context.page.Sheet;
import dev.struchkov.haiti.context.service.SimpleManagerService;
import dev.struchkov.haiti.context.service.simple.FilterService;
import lombok.NonNull;
import java.util.Set;
/**
* // TODO: 17.01.2021 Добавить описание.
*
* @author upagge 17.01.2021
*/
public interface PipelineService extends SimpleManagerService<Pipeline, Long>, FilterService<Pipeline, PipelineFilter> {
Sheet<Pipeline> getAllByStatuses(@NonNull Set<PipelineStatus> statuses, @NonNull Pagination pagination);
}

7
bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/ProjectService.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/service/ProjectService.java
View File

@ -1,7 +1,7 @@
package org.sadtech.bot.gitlab.context.service;
package dev.struchkov.bot.gitlab.context.service;
import org.sadtech.bot.gitlab.context.domain.entity.Project;
import org.sadtech.haiti.context.service.SimpleManagerService;
import dev.struchkov.bot.gitlab.context.domain.entity.Project;
import dev.struchkov.haiti.context.service.SimpleManagerService;
/**
* // TODO: 14.01.2021 Добавить описание.
@ -10,5 +10,4 @@ import org.sadtech.haiti.context.service.SimpleManagerService;
*/
public interface ProjectService extends SimpleManagerService<Project, Long> {
}

4
bot-context/src/main/java/org/sadtech/bot/gitlab/context/utils/MessageUtils.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/utils/MessageUtils.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.gitlab.context.utils;
package dev.struchkov.bot.gitlab.context.utils;
import dev.struchkov.bot.gitlab.context.domain.entity.MergeRequest;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.entity.MergeRequest;
import java.util.List;
import java.util.Optional;

2
bot-context/src/main/java/org/sadtech/bot/gitlab/context/utils/Smile.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/utils/Smile.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.context.utils;
package dev.struchkov.bot.gitlab.context.utils;
import lombok.AllArgsConstructor;
import lombok.Getter;

4
bot-context/src/main/java/org/sadtech/bot/gitlab/context/utils/UpdateDataComparator.java → bot-context/src/main/java/dev/struchkov/bot/gitlab/context/utils/UpdateDataComparator.java
View File

@ -1,6 +1,6 @@
package org.sadtech.bot.gitlab.context.utils;
package dev.struchkov.bot.gitlab.context.utils;
import org.sadtech.bot.gitlab.context.domain.entity.MergeRequest;
import dev.struchkov.bot.gitlab.context.domain.entity.MergeRequest;
import java.util.Comparator;

9
bot-context/src/main/java/org/sadtech/bot/gitlab/context/exception/NotFoundException.java
View File

@ -1,9 +0,0 @@
package org.sadtech.bot.gitlab.context.exception;
public class NotFoundException extends BitbucketBotException {
public NotFoundException(String message) {
super(message);
}
}

19
bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/MergeRequestRepository.java
View File

@ -1,19 +0,0 @@
package org.sadtech.bot.gitlab.context.repository;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.IdAndStatusPr;
import org.sadtech.bot.gitlab.context.domain.MergeRequestState;
import org.sadtech.bot.gitlab.context.domain.entity.MergeRequest;
import org.sadtech.haiti.context.repository.SimpleManagerRepository;
import org.sadtech.haiti.filter.FilterOperation;
import java.util.List;
import java.util.Set;
public interface MergeRequestRepository extends SimpleManagerRepository<MergeRequest, Long>, FilterOperation<MergeRequest> {
Set<IdAndStatusPr> findAllIdByStateIn(Set<MergeRequestState> states);
List<MergeRequest> findAllByAssignee(@NonNull Long userId);
}

13
bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/PersonRepository.java
View File

@ -1,13 +0,0 @@
package org.sadtech.bot.gitlab.context.repository;
import org.sadtech.bot.gitlab.context.domain.entity.Person;
import org.sadtech.haiti.context.repository.SimpleManagerRepository;
/**
* // TODO: 15.01.2021 Добавить описание.
*
* @author upagge 15.01.2021
*/
public interface PersonRepository extends SimpleManagerRepository<Person, Long> {
}

21
bot-context/src/main/java/org/sadtech/bot/gitlab/context/repository/PipelineRepository.java
View File

@ -1,21 +0,0 @@
package org.sadtech.bot.gitlab.context.repository;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.PipelineStatus;
import org.sadtech.bot.gitlab.context.domain.entity.Pipeline;
import org.sadtech.haiti.context.page.Pagination;
import org.sadtech.haiti.context.page.Sheet;
import org.sadtech.haiti.context.repository.SimpleManagerRepository;
import org.sadtech.haiti.filter.FilterOperation;
import java.util.Set;
/**
* // TODO: 17.01.2021 Добавить описание.
*
* @author upagge 17.01.2021
*/
public interface PipelineRepository extends SimpleManagerRepository<Pipeline, Long>, FilterOperation<Pipeline> {
Sheet<Pipeline> findAllByStatuses(@NonNull Set<PipelineStatus> statuses, @NonNull Pagination pagination);
}

23
bot-context/src/main/java/org/sadtech/bot/gitlab/context/service/PipelineService.java
View File

@ -1,23 +0,0 @@
package org.sadtech.bot.gitlab.context.service;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.PipelineStatus;
import org.sadtech.bot.gitlab.context.domain.entity.Pipeline;
import org.sadtech.bot.gitlab.context.domain.filter.PipelineFilter;
import org.sadtech.haiti.context.page.Pagination;
import org.sadtech.haiti.context.page.Sheet;
import org.sadtech.haiti.context.service.SimpleManagerService;
import org.sadtech.haiti.context.service.simple.FilterService;
import java.util.Set;
/**
* // TODO: 17.01.2021 Добавить описание.
*
* @author upagge 17.01.2021
*/
public interface PipelineService extends SimpleManagerService<Pipeline, Long>, FilterService<Pipeline, PipelineFilter> {
Sheet<Pipeline> getAllByStatuses(@NonNull Set<PipelineStatus> statuses, @NonNull Pagination pagination);
}

61
bot-core/pom.xml
View File

@ -2,29 +2,29 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.sadtech.bot.gitlab</groupId>
<artifactId>gitlab-bot</artifactId>
<version>3.0.1-RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>dev.struchkov.bot.gitlab</groupId>
<artifactId>gitlab-bot</artifactId>
<version>3.1.0</version>
</parent>
<artifactId>bot-core</artifactId>
<version>${gitlab.core.version}</version>
<dependencies>
<dependency>
<groupId>org.sadtech.haiti.filter</groupId>
<groupId>dev.struchkov.haiti.filter</groupId>
<artifactId>haiti-filter-criteria</artifactId>
</dependency>
<dependency>
<groupId>org.sadtech.bot.gitlab</groupId>
<groupId>dev.struchkov.bot.gitlab</groupId>
<artifactId>bot-context</artifactId>
</dependency>
<dependency>
<groupId>org.sadtech.haiti.data</groupId>
<groupId>dev.struchkov.haiti.data</groupId>
<artifactId>haiti-database</artifactId>
</dependency>
@ -66,12 +66,12 @@
</dependency>
<dependency>
<groupId>org.sadtech.haiti</groupId>
<artifactId>haiti-utils</artifactId>
<groupId>dev.struchkov.haiti.utils</groupId>
<artifactId>haiti-utils-network</artifactId>
</dependency>
<dependency>
<groupId>org.sadtech.bot.gitlab</groupId>
<groupId>dev.struchkov.bot.gitlab</groupId>
<artifactId>gitlab-sdk</artifactId>
</dependency>
@ -92,43 +92,4 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<configuration>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
</plugin>
</plugins>
</build>
<developers>
<developer>
<id>uPagge</id>
<name>Struchkov Mark</name>
<email>upagge@ya.ru</email>
<organization>SADTECH</organization>
<organizationUrl>https://sadtech.org</organizationUrl>
<url>https://uPagge.sadtech.org</url>
<roles>
<role>Project lead</role>
</roles>
<timezone>+3</timezone>
</developer>
</developers>
</project>

2
bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/AppProperty.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/config/properties/AppProperty.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.core.config.properties;
package dev.struchkov.bot.gitlab.core.config.properties;
import lombok.Getter;
import lombok.Setter;

6
bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/GitlabProperty.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/config/properties/GitlabProperty.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.core.config.properties;
package dev.struchkov.bot.gitlab.core.config.properties;
import lombok.Getter;
import lombok.Setter;
@ -16,6 +16,8 @@ import org.springframework.stereotype.Component;
@ConfigurationProperties("gitlab-bot.gitlab")
public class GitlabProperty {
private String baseUrl;
/**
* Адрес, по которому можно получить открытые ПР
*/
@ -60,4 +62,6 @@ public class GitlabProperty {
private String urlOneDiscussion;
private String replaceUrl;
}

2
bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/InitProperty.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/config/properties/InitProperty.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.core.config.properties;
package dev.struchkov.bot.gitlab.core.config.properties;
import lombok.Getter;
import lombok.Setter;

2
bot-core/src/main/java/org/sadtech/bot/gitlab/core/config/properties/PersonProperty.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/config/properties/PersonProperty.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.core.config.properties;
package dev.struchkov.bot.gitlab.core.config.properties;
import lombok.Getter;
import lombok.Setter;

6
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/convert/DiscussionJsonConverter.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/convert/DiscussionJsonConverter.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.gitlab.core.service.convert;
package dev.struchkov.bot.gitlab.core.service.convert;
import dev.struchkov.bot.gitlab.context.domain.entity.Discussion;
import dev.struchkov.bot.gitlab.sdk.domain.DiscussionJson;
import lombok.RequiredArgsConstructor;
import org.sadtech.bot.gitlab.context.domain.entity.Discussion;
import org.sadtech.bot.gitlab.sdk.domain.DiscussionJson;
import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;

12
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/convert/MergeRequestJsonConverter.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/convert/MergeRequestJsonConverter.java
View File

@ -1,11 +1,11 @@
package org.sadtech.bot.gitlab.core.service.convert;
package dev.struchkov.bot.gitlab.core.service.convert;
import dev.struchkov.bot.gitlab.context.domain.MergeRequestState;
import dev.struchkov.bot.gitlab.context.domain.entity.MergeRequest;
import dev.struchkov.bot.gitlab.sdk.domain.MergeRequestJson;
import dev.struchkov.bot.gitlab.sdk.domain.MergeRequestStateJson;
import dev.struchkov.haiti.context.exception.ConvertException;
import lombok.RequiredArgsConstructor;
import org.sadtech.bot.gitlab.context.domain.MergeRequestState;
import org.sadtech.bot.gitlab.context.domain.entity.MergeRequest;
import org.sadtech.bot.gitlab.sdk.domain.MergeRequestJson;
import org.sadtech.bot.gitlab.sdk.domain.MergeRequestStateJson;
import org.sadtech.haiti.context.exception.ConvertException;
import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;

6
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/convert/NoteJsonConvert.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/convert/NoteJsonConvert.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.gitlab.core.service.convert;
package dev.struchkov.bot.gitlab.core.service.convert;
import dev.struchkov.bot.gitlab.context.domain.entity.Note;
import dev.struchkov.bot.gitlab.sdk.domain.NoteJson;
import lombok.RequiredArgsConstructor;
import org.sadtech.bot.gitlab.context.domain.entity.Note;
import org.sadtech.bot.gitlab.sdk.domain.NoteJson;
import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;

6
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/convert/PersonJsonConverter.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/convert/PersonJsonConverter.java
View File

@ -1,7 +1,7 @@
package org.sadtech.bot.gitlab.core.service.convert;
package dev.struchkov.bot.gitlab.core.service.convert;
import org.sadtech.bot.gitlab.context.domain.entity.Person;
import org.sadtech.bot.gitlab.sdk.domain.PersonJson;
import dev.struchkov.bot.gitlab.context.domain.entity.Person;
import dev.struchkov.bot.gitlab.sdk.domain.PersonJson;
import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;

32
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/convert/PipelineJsonConverter.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/convert/PipelineJsonConverter.java
View File

@ -1,24 +1,24 @@
package org.sadtech.bot.gitlab.core.service.convert;
package dev.struchkov.bot.gitlab.core.service.convert;
import dev.struchkov.bot.gitlab.context.domain.PipelineStatus;
import dev.struchkov.bot.gitlab.context.domain.entity.Pipeline;
import dev.struchkov.bot.gitlab.sdk.domain.PipelineJson;
import dev.struchkov.bot.gitlab.sdk.domain.PipelineStatusJson;
import lombok.RequiredArgsConstructor;
import org.sadtech.bot.gitlab.context.domain.PipelineStatus;
import org.sadtech.bot.gitlab.context.domain.entity.Pipeline;
import org.sadtech.bot.gitlab.sdk.domain.PipelineJson;
import org.sadtech.bot.gitlab.sdk.domain.PipelineStatusJson;
import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.CANCELED;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.CREATED;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.FAILED;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.MANUAL;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.PENDING;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.PREPARING;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.RUNNING;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.SCHEDULED;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.SKIPPED;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.SUCCESS;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.WAITING_FOR_RESOURCE;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.CANCELED;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.CREATED;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.FAILED;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.MANUAL;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.PENDING;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.PREPARING;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.RUNNING;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.SCHEDULED;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.SKIPPED;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.SUCCESS;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.WAITING_FOR_RESOURCE;
/**
* // TODO: 17.01.2021 Добавить описание.

6
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/convert/ProjectJsonConverter.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/convert/ProjectJsonConverter.java
View File

@ -1,7 +1,7 @@
package org.sadtech.bot.gitlab.core.service.convert;
package dev.struchkov.bot.gitlab.core.service.convert;
import org.sadtech.bot.gitlab.context.domain.entity.Project;
import org.sadtech.bot.gitlab.sdk.domain.ProjectJson;
import dev.struchkov.bot.gitlab.context.domain.entity.Project;
import dev.struchkov.bot.gitlab.sdk.domain.ProjectJson;
import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;

12
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/AppSettingServiceImpl.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/AppSettingServiceImpl.java
View File

@ -1,12 +1,12 @@
package org.sadtech.bot.gitlab.core.service.impl;
package dev.struchkov.bot.gitlab.core.service.impl;
import dev.struchkov.bot.gitlab.context.domain.AppLocale;
import dev.struchkov.bot.gitlab.context.domain.entity.AppSetting;
import dev.struchkov.bot.gitlab.context.repository.AppSettingRepository;
import dev.struchkov.bot.gitlab.context.service.AppSettingService;
import dev.struchkov.haiti.context.exception.NotFoundException;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import org.sadtech.bot.gitlab.context.domain.AppLocale;
import org.sadtech.bot.gitlab.context.domain.entity.AppSetting;
import org.sadtech.bot.gitlab.context.repository.AppSettingRepository;
import org.sadtech.bot.gitlab.context.service.AppSettingService;
import org.sadtech.haiti.context.exception.NotFoundException;
import org.springframework.context.MessageSource;
import org.springframework.stereotype.Service;

24
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/CleanServiceImpl.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/CleanServiceImpl.java
View File

@ -1,15 +1,15 @@
package org.sadtech.bot.gitlab.core.service.impl;
package dev.struchkov.bot.gitlab.core.service.impl;
import dev.struchkov.bot.gitlab.context.domain.entity.MergeRequest;
import dev.struchkov.bot.gitlab.context.domain.entity.Pipeline;
import dev.struchkov.bot.gitlab.context.domain.filter.MergeRequestFilter;
import dev.struchkov.bot.gitlab.context.domain.filter.PipelineFilter;
import dev.struchkov.bot.gitlab.context.service.CleanService;
import dev.struchkov.bot.gitlab.context.service.MergeRequestsService;
import dev.struchkov.bot.gitlab.context.service.PipelineService;
import dev.struchkov.haiti.context.page.Sheet;
import dev.struchkov.haiti.context.page.impl.PaginationImpl;
import lombok.RequiredArgsConstructor;
import org.sadtech.bot.gitlab.context.domain.entity.MergeRequest;
import org.sadtech.bot.gitlab.context.domain.entity.Pipeline;
import org.sadtech.bot.gitlab.context.domain.filter.MergeRequestFilter;
import org.sadtech.bot.gitlab.context.domain.filter.PipelineFilter;
import org.sadtech.bot.gitlab.context.service.CleanService;
import org.sadtech.bot.gitlab.context.service.MergeRequestsService;
import org.sadtech.bot.gitlab.context.service.PipelineService;
import org.sadtech.haiti.context.page.Sheet;
import org.sadtech.haiti.core.page.PaginationImpl;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
@ -17,8 +17,8 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.sadtech.bot.gitlab.context.domain.MergeRequestState.CLOSED;
import static org.sadtech.bot.gitlab.context.domain.MergeRequestState.MERGED;
import static dev.struchkov.bot.gitlab.context.domain.MergeRequestState.CLOSED;
import static dev.struchkov.bot.gitlab.context.domain.MergeRequestState.MERGED;
/**
* // TODO: 08.02.2021 Добавить описание.

40
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/DiscussionServiceImpl.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/DiscussionServiceImpl.java
View File

@ -1,26 +1,27 @@
package org.sadtech.bot.gitlab.core.service.impl;
package dev.struchkov.bot.gitlab.core.service.impl;
import dev.struchkov.bot.gitlab.context.domain.PersonInformation;
import dev.struchkov.bot.gitlab.context.domain.entity.Discussion;
import dev.struchkov.bot.gitlab.context.domain.entity.MergeRequest;
import dev.struchkov.bot.gitlab.context.domain.entity.Note;
import dev.struchkov.bot.gitlab.context.domain.notify.comment.CommentNotify;
import dev.struchkov.bot.gitlab.context.domain.notify.task.TaskCloseNotify;
import dev.struchkov.bot.gitlab.context.domain.notify.task.TaskNewNotify;
import dev.struchkov.bot.gitlab.context.repository.DiscussionRepository;
import dev.struchkov.bot.gitlab.context.service.DiscussionService;
import dev.struchkov.bot.gitlab.context.service.NotifyService;
import dev.struchkov.bot.gitlab.context.service.PersonService;
import dev.struchkov.bot.gitlab.core.config.properties.GitlabProperty;
import dev.struchkov.bot.gitlab.core.config.properties.PersonProperty;
import dev.struchkov.bot.gitlab.core.utils.StringUtils;
import dev.struchkov.haiti.context.exception.NotFoundException;
import dev.struchkov.haiti.core.service.AbstractSimpleManagerService;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import okhttp3.FormBody;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import org.sadtech.bot.gitlab.context.domain.PersonInformation;
import org.sadtech.bot.gitlab.context.domain.entity.Discussion;
import org.sadtech.bot.gitlab.context.domain.entity.MergeRequest;
import org.sadtech.bot.gitlab.context.domain.entity.Note;
import org.sadtech.bot.gitlab.context.domain.notify.comment.CommentNotify;
import org.sadtech.bot.gitlab.context.domain.notify.task.TaskCloseNotify;
import org.sadtech.bot.gitlab.context.domain.notify.task.TaskNewNotify;
import org.sadtech.bot.gitlab.context.repository.DiscussionRepository;
import org.sadtech.bot.gitlab.context.service.DiscussionService;
import org.sadtech.bot.gitlab.context.service.NotifyService;
import org.sadtech.bot.gitlab.context.service.PersonService;
import org.sadtech.bot.gitlab.core.config.properties.GitlabProperty;
import org.sadtech.bot.gitlab.core.config.properties.PersonProperty;
import org.sadtech.haiti.context.exception.NotFoundException;
import org.sadtech.haiti.core.service.AbstractSimpleManagerService;
import org.springframework.stereotype.Service;
import java.io.IOException;
@ -34,9 +35,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import static org.sadtech.haiti.utils.network.HttpParse.AUTHORIZATION;
import static org.sadtech.haiti.utils.network.HttpParse.BEARER;
/**
* // TODO: 11.02.2021 Добавить описание.
*
@ -180,7 +178,7 @@ public class DiscussionServiceImpl extends AbstractSimpleManagerService<Discussi
@Override
public void answer(@NonNull String discussionId, @NonNull String text) {
final Discussion discussion = discussionRepository.findById(discussionId)
.orElseThrow(() -> new org.sadtech.haiti.context.exception.NotFoundException("Дисскусия " + discussionId + " не найдена"));
.orElseThrow(() -> new NotFoundException("Дисскусия " + discussionId + " не найдена"));
final MergeRequest mergeRequest = discussion.getMergeRequest();
final Long projectId = mergeRequest.getProjectId();
@ -190,7 +188,7 @@ public class DiscussionServiceImpl extends AbstractSimpleManagerService<Discussi
Request request = new Request.Builder()
.post(formBody)
.header(AUTHORIZATION, BEARER + personProperty.getToken())
.header(StringUtils.H_PRIVATE_TOKEN, personProperty.getToken())
.url(requestUrl)
.build();

46
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/MergeRequestsServiceImpl.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/MergeRequestsServiceImpl.java
View File

@ -1,28 +1,28 @@
package org.sadtech.bot.gitlab.core.service.impl;
package dev.struchkov.bot.gitlab.core.service.impl;
import dev.struchkov.bot.gitlab.context.domain.IdAndStatusPr;
import dev.struchkov.bot.gitlab.context.domain.MergeRequestState;
import dev.struchkov.bot.gitlab.context.domain.PersonInformation;
import dev.struchkov.bot.gitlab.context.domain.entity.Discussion;
import dev.struchkov.bot.gitlab.context.domain.entity.MergeRequest;
import dev.struchkov.bot.gitlab.context.domain.entity.Project;
import dev.struchkov.bot.gitlab.context.domain.filter.MergeRequestFilter;
import dev.struchkov.bot.gitlab.context.domain.notify.pullrequest.ConflictPrNotify;
import dev.struchkov.bot.gitlab.context.domain.notify.pullrequest.NewPrNotify;
import dev.struchkov.bot.gitlab.context.domain.notify.pullrequest.StatusPrNotify;
import dev.struchkov.bot.gitlab.context.domain.notify.pullrequest.UpdatePrNotify;
import dev.struchkov.bot.gitlab.context.repository.MergeRequestRepository;
import dev.struchkov.bot.gitlab.context.service.DiscussionService;
import dev.struchkov.bot.gitlab.context.service.MergeRequestsService;
import dev.struchkov.bot.gitlab.context.service.NotifyService;
import dev.struchkov.bot.gitlab.context.service.PersonService;
import dev.struchkov.bot.gitlab.context.service.ProjectService;
import dev.struchkov.haiti.context.exception.NotFoundException;
import dev.struchkov.haiti.context.page.Pagination;
import dev.struchkov.haiti.context.page.Sheet;
import dev.struchkov.haiti.context.service.simple.FilterService;
import dev.struchkov.haiti.core.service.AbstractSimpleManagerService;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.IdAndStatusPr;
import org.sadtech.bot.gitlab.context.domain.MergeRequestState;
import org.sadtech.bot.gitlab.context.domain.PersonInformation;
import org.sadtech.bot.gitlab.context.domain.entity.Discussion;
import org.sadtech.bot.gitlab.context.domain.entity.MergeRequest;
import org.sadtech.bot.gitlab.context.domain.entity.Project;
import org.sadtech.bot.gitlab.context.domain.filter.MergeRequestFilter;
import org.sadtech.bot.gitlab.context.domain.notify.pullrequest.ConflictPrNotify;
import org.sadtech.bot.gitlab.context.domain.notify.pullrequest.NewPrNotify;
import org.sadtech.bot.gitlab.context.domain.notify.pullrequest.StatusPrNotify;
import org.sadtech.bot.gitlab.context.domain.notify.pullrequest.UpdatePrNotify;
import org.sadtech.bot.gitlab.context.repository.MergeRequestRepository;
import org.sadtech.bot.gitlab.context.service.DiscussionService;
import org.sadtech.bot.gitlab.context.service.MergeRequestsService;
import org.sadtech.bot.gitlab.context.service.NotifyService;
import org.sadtech.bot.gitlab.context.service.PersonService;
import org.sadtech.bot.gitlab.context.service.ProjectService;
import org.sadtech.haiti.context.exception.NotFoundException;
import org.sadtech.haiti.context.page.Pagination;
import org.sadtech.haiti.context.page.Sheet;
import org.sadtech.haiti.context.service.simple.FilterService;
import org.sadtech.haiti.core.service.AbstractSimpleManagerService;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;

8
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/NotifyServiceImpl.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/NotifyServiceImpl.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.gitlab.core.service.impl;
package dev.struchkov.bot.gitlab.core.service.impl;
import dev.struchkov.bot.gitlab.context.domain.notify.Notify;
import dev.struchkov.bot.gitlab.context.service.MessageSendService;
import dev.struchkov.bot.gitlab.context.service.NotifyService;
import lombok.RequiredArgsConstructor;
import org.sadtech.bot.gitlab.context.domain.notify.Notify;
import org.sadtech.bot.gitlab.context.service.MessageSendService;
import org.sadtech.bot.gitlab.context.service.NotifyService;
import org.springframework.stereotype.Service;
@Service

10
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/PersonServiceImpl.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/PersonServiceImpl.java
View File

@ -1,10 +1,10 @@
package org.sadtech.bot.gitlab.core.service.impl;
package dev.struchkov.bot.gitlab.core.service.impl;
import dev.struchkov.bot.gitlab.context.domain.entity.Person;
import dev.struchkov.bot.gitlab.context.repository.PersonRepository;
import dev.struchkov.bot.gitlab.context.service.PersonService;
import dev.struchkov.haiti.core.service.AbstractSimpleManagerService;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.entity.Person;
import org.sadtech.bot.gitlab.context.repository.PersonRepository;
import org.sadtech.bot.gitlab.context.service.PersonService;
import org.sadtech.haiti.core.service.AbstractSimpleManagerService;
import org.springframework.stereotype.Service;
/**

38
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/PipelineServiceImpl.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/PipelineServiceImpl.java
View File

@ -1,20 +1,20 @@
package org.sadtech.bot.gitlab.core.service.impl;
package dev.struchkov.bot.gitlab.core.service.impl;
import dev.struchkov.bot.gitlab.context.domain.PersonInformation;
import dev.struchkov.bot.gitlab.context.domain.PipelineStatus;
import dev.struchkov.bot.gitlab.context.domain.entity.Pipeline;
import dev.struchkov.bot.gitlab.context.domain.filter.PipelineFilter;
import dev.struchkov.bot.gitlab.context.domain.notify.pipeline.PipelineNotify;
import dev.struchkov.bot.gitlab.context.repository.PipelineRepository;
import dev.struchkov.bot.gitlab.context.service.NotifyService;
import dev.struchkov.bot.gitlab.context.service.PersonService;
import dev.struchkov.bot.gitlab.context.service.PipelineService;
import dev.struchkov.bot.gitlab.core.service.impl.filter.PipelineFilterService;
import dev.struchkov.haiti.context.exception.NotFoundException;
import dev.struchkov.haiti.context.page.Pagination;
import dev.struchkov.haiti.context.page.Sheet;
import dev.struchkov.haiti.core.service.AbstractSimpleManagerService;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.PersonInformation;
import org.sadtech.bot.gitlab.context.domain.PipelineStatus;
import org.sadtech.bot.gitlab.context.domain.entity.Pipeline;
import org.sadtech.bot.gitlab.context.domain.filter.PipelineFilter;
import org.sadtech.bot.gitlab.context.domain.notify.pipeline.PipelineNotify;
import org.sadtech.bot.gitlab.context.repository.PipelineRepository;
import org.sadtech.bot.gitlab.context.service.NotifyService;
import org.sadtech.bot.gitlab.context.service.PersonService;
import org.sadtech.bot.gitlab.context.service.PipelineService;
import org.sadtech.bot.gitlab.core.service.impl.filter.PipelineFilterService;
import org.sadtech.haiti.context.exception.NotFoundException;
import org.sadtech.haiti.context.page.Pagination;
import org.sadtech.haiti.context.page.Sheet;
import org.sadtech.haiti.core.service.AbstractSimpleManagerService;
import org.springframework.stereotype.Service;
import java.util.Optional;
@ -22,10 +22,10 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.CANCELED;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.FAILED;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.SKIPPED;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.SUCCESS;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.CANCELED;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.FAILED;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.SKIPPED;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.SUCCESS;
/**
* // TODO: 17.01.2021 Добавить описание.

25
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/ProjectServiceImpl.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/ProjectServiceImpl.java
View File

@ -1,16 +1,16 @@
package org.sadtech.bot.gitlab.core.service.impl;
package dev.struchkov.bot.gitlab.core.service.impl;
import dev.struchkov.bot.gitlab.context.domain.PersonInformation;
import dev.struchkov.bot.gitlab.context.domain.entity.Project;
import dev.struchkov.bot.gitlab.context.domain.notify.NewProjectNotify;
import dev.struchkov.bot.gitlab.context.repository.ProjectRepository;
import dev.struchkov.bot.gitlab.context.service.NotifyService;
import dev.struchkov.bot.gitlab.context.service.PersonService;
import dev.struchkov.bot.gitlab.context.service.ProjectService;
import dev.struchkov.haiti.context.exception.NotFoundException;
import dev.struchkov.haiti.context.repository.SimpleManagerRepository;
import dev.struchkov.haiti.core.service.AbstractSimpleManagerService;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.PersonInformation;
import org.sadtech.bot.gitlab.context.domain.entity.Project;
import org.sadtech.bot.gitlab.context.domain.notify.NewProjectNotify;
import org.sadtech.bot.gitlab.context.repository.ProjectRepository;
import org.sadtech.bot.gitlab.context.service.NotifyService;
import org.sadtech.bot.gitlab.context.service.PersonService;
import org.sadtech.bot.gitlab.context.service.ProjectService;
import org.sadtech.haiti.context.exception.NotFoundException;
import org.sadtech.haiti.context.repository.SimpleManagerRepository;
import org.sadtech.haiti.core.service.AbstractSimpleManagerService;
import org.springframework.stereotype.Service;
/**
@ -30,7 +30,8 @@ public class ProjectServiceImpl extends AbstractSimpleManagerService<Project, Lo
SimpleManagerRepository<Project, Long> repository,
ProjectRepository projectRepository,
NotifyService notifyService,
PersonService personService, PersonInformation personInformation
PersonService personService,
PersonInformation personInformation
) {
super(repository);
this.projectRepository = projectRepository;

20
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/filter/MergeRequestFilterService.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/filter/MergeRequestFilterService.java
View File

@ -1,15 +1,15 @@
package org.sadtech.bot.gitlab.core.service.impl.filter;
package dev.struchkov.bot.gitlab.core.service.impl.filter;
import dev.struchkov.bot.gitlab.context.domain.entity.MergeRequest;
import dev.struchkov.bot.gitlab.context.domain.entity.MergeRequest_;
import dev.struchkov.bot.gitlab.context.domain.filter.MergeRequestFilter;
import dev.struchkov.bot.gitlab.context.repository.MergeRequestRepository;
import dev.struchkov.haiti.core.service.AbstractFilterService;
import dev.struchkov.haiti.filter.Filter;
import dev.struchkov.haiti.filter.FilterQuery;
import dev.struchkov.haiti.filter.criteria.CriteriaFilter;
import dev.struchkov.haiti.filter.criteria.CriteriaQuery;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.entity.MergeRequest;
import org.sadtech.bot.gitlab.context.domain.entity.MergeRequest_;
import org.sadtech.bot.gitlab.context.domain.filter.MergeRequestFilter;
import org.sadtech.bot.gitlab.context.repository.MergeRequestRepository;
import org.sadtech.haiti.core.service.AbstractFilterService;
import org.sadtech.haiti.filter.Filter;
import org.sadtech.haiti.filter.FilterQuery;
import org.sadtech.haiti.filter.criteria.CriteriaFilter;
import org.sadtech.haiti.filter.criteria.CriteriaQuery;
import org.springframework.stereotype.Service;
@Service

20
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/filter/PipelineFilterService.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/filter/PipelineFilterService.java
View File

@ -1,15 +1,15 @@
package org.sadtech.bot.gitlab.core.service.impl.filter;
package dev.struchkov.bot.gitlab.core.service.impl.filter;
import dev.struchkov.bot.gitlab.context.domain.entity.Pipeline;
import dev.struchkov.bot.gitlab.context.domain.entity.Pipeline_;
import dev.struchkov.bot.gitlab.context.domain.filter.PipelineFilter;
import dev.struchkov.bot.gitlab.context.repository.PipelineRepository;
import dev.struchkov.haiti.core.service.AbstractFilterService;
import dev.struchkov.haiti.filter.Filter;
import dev.struchkov.haiti.filter.FilterQuery;
import dev.struchkov.haiti.filter.criteria.CriteriaFilter;
import dev.struchkov.haiti.filter.criteria.CriteriaQuery;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.entity.Pipeline;
import org.sadtech.bot.gitlab.context.domain.entity.Pipeline_;
import org.sadtech.bot.gitlab.context.domain.filter.PipelineFilter;
import org.sadtech.bot.gitlab.context.repository.PipelineRepository;
import org.sadtech.haiti.core.service.AbstractFilterService;
import org.sadtech.haiti.filter.Filter;
import org.sadtech.haiti.filter.FilterQuery;
import org.sadtech.haiti.filter.criteria.CriteriaFilter;
import org.sadtech.haiti.filter.criteria.CriteriaQuery;
import org.springframework.stereotype.Service;
/**

14
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/impl/note/NoteServiceImpl.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/note/NoteServiceImpl.java
View File

@ -1,13 +1,13 @@
package org.sadtech.bot.gitlab.core.service.impl.note;
package dev.struchkov.bot.gitlab.core.service.impl.note;
import dev.struchkov.bot.gitlab.context.domain.entity.Note;
import dev.struchkov.bot.gitlab.context.repository.NoteRepository;
import dev.struchkov.bot.gitlab.context.service.NoteService;
import dev.struchkov.haiti.context.page.Pagination;
import dev.struchkov.haiti.context.page.Sheet;
import dev.struchkov.haiti.core.service.AbstractSimpleManagerService;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import org.sadtech.bot.gitlab.context.domain.entity.Note;
import org.sadtech.bot.gitlab.context.repository.NoteRepository;
import org.sadtech.bot.gitlab.context.service.NoteService;
import org.sadtech.haiti.context.page.Pagination;
import org.sadtech.haiti.context.page.Sheet;
import org.sadtech.haiti.core.service.AbstractSimpleManagerService;
import org.springframework.stereotype.Service;
import java.util.List;

33
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/parser/DiscussionParser.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/parser/DiscussionParser.java
View File

@ -1,17 +1,18 @@
package org.sadtech.bot.gitlab.core.service.parser;
package dev.struchkov.bot.gitlab.core.service.parser;
import dev.struchkov.bot.gitlab.context.domain.entity.Discussion;
import dev.struchkov.bot.gitlab.context.domain.entity.MergeRequest;
import dev.struchkov.bot.gitlab.context.service.DiscussionService;
import dev.struchkov.bot.gitlab.context.service.MergeRequestsService;
import dev.struchkov.bot.gitlab.core.config.properties.GitlabProperty;
import dev.struchkov.bot.gitlab.core.config.properties.PersonProperty;
import dev.struchkov.bot.gitlab.core.utils.StringUtils;
import dev.struchkov.bot.gitlab.sdk.domain.DiscussionJson;
import dev.struchkov.haiti.context.domain.ExistsContainer;
import dev.struchkov.haiti.context.page.Sheet;
import dev.struchkov.haiti.context.page.impl.PaginationImpl;
import dev.struchkov.haiti.utils.network.HttpParse;
import lombok.RequiredArgsConstructor;
import org.sadtech.bot.gitlab.context.domain.entity.Discussion;
import org.sadtech.bot.gitlab.context.domain.entity.MergeRequest;
import org.sadtech.bot.gitlab.context.service.DiscussionService;
import org.sadtech.bot.gitlab.context.service.MergeRequestsService;
import org.sadtech.bot.gitlab.core.config.properties.GitlabProperty;
import org.sadtech.bot.gitlab.core.config.properties.PersonProperty;
import org.sadtech.bot.gitlab.sdk.domain.DiscussionJson;
import org.sadtech.haiti.context.domain.ExistsContainer;
import org.sadtech.haiti.context.page.Sheet;
import org.sadtech.haiti.core.page.PaginationImpl;
import org.sadtech.haiti.utils.network.HttpParse;
import org.springframework.core.convert.ConversionService;
import org.springframework.stereotype.Component;
@ -21,9 +22,7 @@ import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import static org.sadtech.haiti.utils.network.HttpParse.ACCEPT;
import static org.sadtech.haiti.utils.network.HttpParse.AUTHORIZATION;
import static org.sadtech.haiti.utils.network.HttpParse.BEARER;
import static dev.struchkov.haiti.utils.network.HttpParse.ACCEPT;
/**
* // TODO: 11.02.2021 Добавить описание.
@ -102,7 +101,7 @@ public class DiscussionParser {
private List<DiscussionJson> getDiscussionJson(MergeRequest mergeRequest, int page) {
return HttpParse.request(MessageFormat.format(gitlabProperty.getUrlDiscussion(), mergeRequest.getProjectId(), mergeRequest.getTwoId(), page))
.header(ACCEPT)
.header(AUTHORIZATION, BEARER + personProperty.getToken())
.header(StringUtils.H_PRIVATE_TOKEN, personProperty.getToken())
.executeList(DiscussionJson.class);
}
@ -117,7 +116,7 @@ public class DiscussionParser {
if (discussion.getMergeRequest() != null) {
final Optional<Discussion> optNewDiscussion = HttpParse.request(MessageFormat.format(gitlabProperty.getUrlOneDiscussion(), discussion.getMergeRequest().getProjectId(), discussion.getMergeRequest().getTwoId(), discussion.getId()))
.header(ACCEPT)
.header(AUTHORIZATION, BEARER + personProperty.getToken())
.header(StringUtils.H_PRIVATE_TOKEN, personProperty.getToken())
.execute(DiscussionJson.class)
.map(json -> {
final Discussion newDiscussion = conversionService.convert(json, Discussion.class);

50
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/parser/MergeRequestParser.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/parser/MergeRequestParser.java
View File

@ -1,23 +1,23 @@
package org.sadtech.bot.gitlab.core.service.parser;
package dev.struchkov.bot.gitlab.core.service.parser;
import dev.struchkov.bot.gitlab.context.domain.IdAndStatusPr;
import dev.struchkov.bot.gitlab.context.domain.MergeRequestState;
import dev.struchkov.bot.gitlab.context.domain.entity.MergeRequest;
import dev.struchkov.bot.gitlab.context.domain.entity.Project;
import dev.struchkov.bot.gitlab.context.service.MergeRequestsService;
import dev.struchkov.bot.gitlab.context.service.ProjectService;
import dev.struchkov.bot.gitlab.core.config.properties.GitlabProperty;
import dev.struchkov.bot.gitlab.core.config.properties.PersonProperty;
import dev.struchkov.bot.gitlab.core.utils.StringUtils;
import dev.struchkov.bot.gitlab.sdk.domain.CommitJson;
import dev.struchkov.bot.gitlab.sdk.domain.MergeRequestJson;
import dev.struchkov.haiti.context.domain.ExistsContainer;
import dev.struchkov.haiti.context.exception.NotFoundException;
import dev.struchkov.haiti.context.page.Sheet;
import dev.struchkov.haiti.context.page.impl.PaginationImpl;
import dev.struchkov.haiti.utils.network.HttpParse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.sadtech.bot.gitlab.context.domain.IdAndStatusPr;
import org.sadtech.bot.gitlab.context.domain.MergeRequestState;
import org.sadtech.bot.gitlab.context.domain.entity.MergeRequest;
import org.sadtech.bot.gitlab.context.domain.entity.Project;
import org.sadtech.bot.gitlab.context.service.MergeRequestsService;
import org.sadtech.bot.gitlab.context.service.ProjectService;
import org.sadtech.bot.gitlab.core.config.properties.GitlabProperty;
import org.sadtech.bot.gitlab.core.config.properties.PersonProperty;
import org.sadtech.bot.gitlab.sdk.domain.CommitJson;
import org.sadtech.bot.gitlab.sdk.domain.MergeRequestJson;
import org.sadtech.haiti.context.domain.ExistsContainer;
import org.sadtech.haiti.context.exception.NotFoundException;
import org.sadtech.haiti.context.page.Sheet;
import org.sadtech.haiti.core.page.PaginationImpl;
import org.sadtech.haiti.utils.network.HttpHeader;
import org.sadtech.haiti.utils.network.HttpParse;
import org.springframework.core.convert.ConversionService;
import org.springframework.stereotype.Service;
@ -27,9 +27,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.sadtech.haiti.utils.network.HttpParse.ACCEPT;
import static org.sadtech.haiti.utils.network.HttpParse.AUTHORIZATION;
import static org.sadtech.haiti.utils.network.HttpParse.BEARER;
import static dev.struchkov.haiti.utils.network.HttpParse.ACCEPT;
@Slf4j
@Service
@ -53,7 +51,7 @@ public class MergeRequestParser {
for (IdAndStatusPr existId : existIds) {
final MergeRequest mergeRequest = HttpParse.request(MessageFormat.format(gitlabProperty.getUrlPullRequest(), existId.getProjectId(), existId.getTwoId()))
.header(ACCEPT)
.header(AUTHORIZATION, BEARER + personProperty.getToken())
.header(StringUtils.H_PRIVATE_TOKEN, personProperty.getToken())
.execute(MergeRequestJson.class)
.map(json -> {
final MergeRequest newMergeRequest = conversionService.convert(json, MergeRequest.class);
@ -67,7 +65,6 @@ public class MergeRequestParser {
}
public void parsingNewMergeRequest() {
int page = 0;
Sheet<Project> projectSheet = projectService.getAll(PaginationImpl.of(page, COUNT));
@ -80,7 +77,6 @@ public class MergeRequestParser {
projectSheet = projectService.getAll(PaginationImpl.of(++page, COUNT));
}
}
private void projectProcessing(Project project) {
@ -113,10 +109,10 @@ public class MergeRequestParser {
private void parsingCommits(MergeRequest mergeRequest) {
final List<CommitJson> commitJson = HttpParse.request(
MessageFormat.format(gitlabProperty.getUrlCommit(), mergeRequest.getProjectId(), mergeRequest.getTwoId())
)
MessageFormat.format(gitlabProperty.getUrlCommit(), mergeRequest.getProjectId(), mergeRequest.getTwoId())
)
.header(ACCEPT)
.header(AUTHORIZATION, BEARER + personProperty.getToken())
.header(StringUtils.H_PRIVATE_TOKEN, personProperty.getToken())
.executeList(CommitJson.class);
if (commitJson != null && !commitJson.isEmpty()) {
mergeRequest.setDateLastCommit(commitJson.get(0).getCreatedDate());
@ -125,7 +121,7 @@ public class MergeRequestParser {
private List<MergeRequestJson> getMergeRequestJsons(Project project, int page) {
return HttpParse.request(MessageFormat.format(gitlabProperty.getUrlPullRequestOpen(), project.getId(), page))
.header(HttpHeader.of(AUTHORIZATION, BEARER + personProperty.getToken()))
.header(StringUtils.H_PRIVATE_TOKEN, personProperty.getToken())
.header(ACCEPT)
.executeList(MergeRequestJson.class);
}

59
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/parser/PipelineParser.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/parser/PipelineParser.java
View File

@ -1,19 +1,20 @@
package org.sadtech.bot.gitlab.core.service.parser;
package dev.struchkov.bot.gitlab.core.service.parser;
import dev.struchkov.bot.gitlab.context.domain.PipelineStatus;
import dev.struchkov.bot.gitlab.context.domain.entity.Pipeline;
import dev.struchkov.bot.gitlab.context.domain.entity.Project;
import dev.struchkov.bot.gitlab.context.service.PipelineService;
import dev.struchkov.bot.gitlab.context.service.ProjectService;
import dev.struchkov.bot.gitlab.core.config.properties.GitlabProperty;
import dev.struchkov.bot.gitlab.core.config.properties.PersonProperty;
import dev.struchkov.bot.gitlab.core.utils.StringUtils;
import dev.struchkov.bot.gitlab.sdk.domain.PipelineJson;
import dev.struchkov.haiti.context.domain.ExistsContainer;
import dev.struchkov.haiti.context.exception.ConvertException;
import dev.struchkov.haiti.context.page.Sheet;
import dev.struchkov.haiti.context.page.impl.PaginationImpl;
import dev.struchkov.haiti.utils.network.HttpParse;
import lombok.RequiredArgsConstructor;
import org.sadtech.bot.gitlab.context.domain.PipelineStatus;
import org.sadtech.bot.gitlab.context.domain.entity.Pipeline;
import org.sadtech.bot.gitlab.context.domain.entity.Project;
import org.sadtech.bot.gitlab.context.service.PipelineService;
import org.sadtech.bot.gitlab.context.service.ProjectService;
import org.sadtech.bot.gitlab.core.config.properties.GitlabProperty;
import org.sadtech.bot.gitlab.core.config.properties.PersonProperty;
import org.sadtech.bot.gitlab.sdk.domain.PipelineJson;
import org.sadtech.haiti.context.domain.ExistsContainer;
import org.sadtech.haiti.context.exception.ConvertException;
import org.sadtech.haiti.context.page.Sheet;
import org.sadtech.haiti.core.page.PaginationImpl;
import org.sadtech.haiti.utils.network.HttpParse;
import org.springframework.core.convert.ConversionService;
import org.springframework.stereotype.Service;
@ -25,15 +26,13 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.CREATED;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.MANUAL;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.PENDING;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.PREPARING;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.RUNNING;
import static org.sadtech.bot.gitlab.context.domain.PipelineStatus.WAITING_FOR_RESOURCE;
import static org.sadtech.haiti.utils.network.HttpParse.ACCEPT;
import static org.sadtech.haiti.utils.network.HttpParse.AUTHORIZATION;
import static org.sadtech.haiti.utils.network.HttpParse.BEARER;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.CREATED;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.MANUAL;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.PENDING;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.PREPARING;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.RUNNING;
import static dev.struchkov.bot.gitlab.context.domain.PipelineStatus.WAITING_FOR_RESOURCE;
import static dev.struchkov.haiti.utils.network.HttpParse.ACCEPT;
/**
* // TODO: 17.01.2021 Добавить описание.
@ -92,10 +91,10 @@ public class PipelineParser {
for (Long newId : idsNotFound) {
final Pipeline newPipeline = HttpParse.request(
MessageFormat.format(gitlabProperty.getUrlPipeline(), project.getId(), newId)
)
MessageFormat.format(gitlabProperty.getUrlPipeline(), project.getId(), newId)
)
.header(ACCEPT)
.header(AUTHORIZATION, BEARER + personProperty.getToken())
.header(StringUtils.H_PRIVATE_TOKEN, personProperty.getToken())
.execute(PipelineJson.class)
.map(json -> {
final Pipeline pipeline = conversionService.convert(json, Pipeline.class);
@ -117,7 +116,7 @@ public class PipelineParser {
private List<PipelineJson> getPipelineJsons(Long projectId, int page, LocalDateTime afterUpdate) {
return HttpParse.request(MessageFormat.format(gitlabProperty.getUrlPipelines(), projectId, page))
.header(ACCEPT)
.header(HttpParse.AUTHORIZATION, HttpParse.BEARER + personProperty.getToken())
.header(StringUtils.H_PRIVATE_TOKEN, personProperty.getToken())
.getParameter("updated_after", afterUpdate.minusHours(12L).toString())
.executeList(PipelineJson.class);
}
@ -131,10 +130,10 @@ public class PipelineParser {
for (Pipeline pipeline : pipelines) {
final Pipeline newPipeline = HttpParse.request(
MessageFormat.format(gitlabProperty.getUrlPipeline(), pipeline.getProject().getId(), pipeline.getId())
)
MessageFormat.format(gitlabProperty.getUrlPipeline(), pipeline.getProject().getId(), pipeline.getId())
)
.header(ACCEPT)
.header(AUTHORIZATION, BEARER + personProperty.getToken())
.header(StringUtils.H_PRIVATE_TOKEN, personProperty.getToken())
.execute(PipelineJson.class)
.map(json -> conversionService.convert(json, Pipeline.class))
.orElseThrow(() -> new ConvertException("Ошибка обновления Pipelines"));

36
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/parser/ProjectParser.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/parser/ProjectParser.java
View File

@ -1,19 +1,19 @@
package org.sadtech.bot.gitlab.core.service.parser;
package dev.struchkov.bot.gitlab.core.service.parser;
import dev.struchkov.bot.gitlab.context.domain.entity.Person;
import dev.struchkov.bot.gitlab.context.domain.entity.Project;
import dev.struchkov.bot.gitlab.context.service.PersonService;
import dev.struchkov.bot.gitlab.context.service.ProjectService;
import dev.struchkov.bot.gitlab.core.config.properties.GitlabProperty;
import dev.struchkov.bot.gitlab.core.config.properties.PersonProperty;
import dev.struchkov.bot.gitlab.core.utils.StringUtils;
import dev.struchkov.bot.gitlab.sdk.domain.PersonJson;
import dev.struchkov.bot.gitlab.sdk.domain.ProjectJson;
import dev.struchkov.haiti.context.domain.ExistsContainer;
import dev.struchkov.haiti.context.exception.ConvertException;
import dev.struchkov.haiti.utils.network.HttpParse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.sadtech.bot.gitlab.context.domain.entity.Person;
import org.sadtech.bot.gitlab.context.domain.entity.Project;
import org.sadtech.bot.gitlab.context.service.PersonService;
import org.sadtech.bot.gitlab.context.service.ProjectService;
import org.sadtech.bot.gitlab.core.config.properties.GitlabProperty;
import org.sadtech.bot.gitlab.core.config.properties.PersonProperty;
import org.sadtech.bot.gitlab.sdk.domain.PersonJson;
import org.sadtech.bot.gitlab.sdk.domain.ProjectJson;
import org.sadtech.haiti.context.domain.ExistsContainer;
import org.sadtech.haiti.context.exception.ConvertException;
import org.sadtech.haiti.utils.network.HttpHeader;
import org.sadtech.haiti.utils.network.HttpParse;
import org.springframework.core.convert.ConversionService;
import org.springframework.stereotype.Service;
@ -23,9 +23,7 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import static org.sadtech.haiti.utils.network.HttpParse.ACCEPT;
import static org.sadtech.haiti.utils.network.HttpParse.AUTHORIZATION;
import static org.sadtech.haiti.utils.network.HttpParse.BEARER;
import static dev.struchkov.haiti.utils.network.HttpParse.ACCEPT;
/**
* // TODO: 14.01.2021 Добавить описание.
@ -96,7 +94,7 @@ public class ProjectParser {
.map(
userId -> HttpParse.request(gitlabProperty.getUsersUrl() + "/" + userId)
.header(ACCEPT)
.header(AUTHORIZATION, BEARER + personProperty.getToken())
.header(StringUtils.H_PRIVATE_TOKEN, personProperty.getToken())
.execute(PersonJson.class)
.map(json -> conversionService.convert(json, Person.class)).orElseThrow(() -> new ConvertException("Ошибка преобразования нового пользователя"))
).collect(Collectors.toList());
@ -111,14 +109,14 @@ public class ProjectParser {
final String url = MessageFormat.format(gitlabProperty.getUrlProject(), page);
return HttpParse.request(url + param)
.header(ACCEPT)
.header(HttpHeader.of(AUTHORIZATION, BEARER + personProperty.getToken()))
.header(StringUtils.H_PRIVATE_TOKEN, personProperty.getToken())
.executeList(ProjectJson.class);
}
public void parseByUrl(String projectUrl) {
final Project project = HttpParse.request(projectUrl)
.header(ACCEPT)
.header(AUTHORIZATION, BEARER + personProperty.getToken())
.header(StringUtils.H_PRIVATE_TOKEN, personProperty.getToken())
.execute(ProjectJson.class)
.map(json -> conversionService.convert(json, Project.class))
.orElseThrow(() -> new ConvertException("Ошибка получения проекта"));

2
bot-core/src/main/java/org/sadtech/bot/gitlab/core/utils/Pair.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/utils/Pair.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.core.utils;
package dev.struchkov.bot.gitlab.core.utils;
import lombok.AllArgsConstructor;
import lombok.Data;

4
bot-core/src/main/java/org/sadtech/bot/gitlab/core/utils/StringUtils.java → bot-core/src/main/java/dev/struchkov/bot/gitlab/core/utils/StringUtils.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.gitlab.core.utils;
package dev.struchkov.bot.gitlab.core.utils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@ -11,6 +11,8 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class StringUtils {
public static final String H_PRIVATE_TOKEN = "PRIVATE-TOKEN";
public static String cutOff(String string, int length) {
if (string != null) {
return string.length() > length ? string.substring(0, length) + "..." : string;

70
bot-core/src/main/java/org/sadtech/bot/gitlab/core/scheduler/NotificationScheduler.java
View File

@ -1,70 +0,0 @@
package org.sadtech.bot.gitlab.core.scheduler;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
public class NotificationScheduler {
//
// private final PullRequestsService pullRequestsService;
// private final NotifyService notifyService;
// private final AppProperty appProperty;
//
// // Утреннее сообщение
// @Scheduled(cron = "0 15 8 * * MON-FRI")
// public void goodMorning() {
// List<Person> allRegister = personService.getAllRegister();
// for (Person user : allRegister) {
// List<PullRequest> pullRequestsReviews = pullRequestsService.getAllByReviewerAndStatuses(
// user.getLogin(),
// ReviewerStatus.NEEDS_WORK,
// Collections.singleton(PullRequestStatus.OPEN)
// );
// List<PullRequest> pullRequestsNeedWork = pullRequestsService.getAllByAuthorAndReviewerStatus(user.getLogin(), ReviewerStatus.UNAPPROVED);
// notifyService.send(
// GoodMorningNotify.builder()
// .personName(user.getFullName())
// .pullRequestsNeedWork(pullRequestsNeedWork)
// .pullRequestsReviews(pullRequestsReviews)
// .recipients(Collections.singleton(user.getLogin()))
// .version(appProperty.getVersion())
// .build()
// );
// }
// }
//
// @Scheduled(cron = "0 44 10 * * MON-FRI")
// public void tks() {
// notifyService.send(
// SimpleTextNotify
// .builder()
// .recipients(
// usersTks.stream()
// .map(Person::getLogin)
// .collect(Collectors.toSet())
// )
// .message("☎️ Внимание созвон" + Smile.HR + "https://meet.google.com/avj-cdyy-enu")
// .build()
// );
// }
//
// @Scheduled(cron = "0 0 18 * * FRI")
// public void goodWeekEnd() {
// List<Person> allRegister = personService.getAllRegister();
// notifyService.send(
// SimpleTextNotify.builder()
// .entityType(EntityType.PERSON)
// .message("Ну вот и все! Веселых выходных " + Smile.MIG + Smile.BR +
// "До понедельника" + Smile.BUY + Smile.TWO_BR)
// .recipients(
// allRegister.stream()
// .map(Person::getLogin)
// .collect(Collectors.toSet())
// )
// .build()
// );
// }
}

59
bot-data/pom.xml
View File

@ -2,12 +2,12 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>gitlab-bot</artifactId>
<groupId>org.sadtech.bot.gitlab</groupId>
<version>3.0.1-RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>dev.struchkov.bot.gitlab</groupId>
<artifactId>gitlab-bot</artifactId>
<version>3.1.0</version>
</parent>
<artifactId>bot-data</artifactId>
<version>${gitlab.data.version}</version>
@ -18,56 +18,17 @@
<dependencies>
<dependency>
<groupId>org.sadtech.bot.gitlab</groupId>
<groupId>dev.struchkov.haiti.data</groupId>
<artifactId>haiti-database</artifactId>
</dependency>
<dependency>
<groupId>dev.struchkov.bot.gitlab</groupId>
<artifactId>bot-context</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.sadtech.haiti.data</groupId>
<artifactId>haiti-database</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<configuration>
<skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
</plugin>
</plugins>
</build>
<developers>
<developer>
<id>uPagge</id>
<name>Struchkov Mark</name>
<email>upagge@ya.ru</email>
<organization>SADTECH</organization>
<organizationUrl>https://sadtech.org</organizationUrl>
<url>https://uPagge.sadtech.org</url>
<roles>
<role>Project lead</role>
</roles>
<timezone>+3</timezone>
</developer>
</developers>
</project>

8
bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/AppSettingRepositoryImpl.java → bot-data/src/main/java/dev/struchkov/bot/gitlab/data/impl/AppSettingRepositoryImpl.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.gitlab.data.impl;
package dev.struchkov.bot.gitlab.data.impl;
import org.sadtech.bot.gitlab.context.domain.entity.AppSetting;
import org.sadtech.bot.gitlab.context.repository.AppSettingRepository;
import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository;
import dev.struchkov.bot.gitlab.context.domain.entity.AppSetting;
import dev.struchkov.bot.gitlab.context.repository.AppSettingRepository;
import dev.struchkov.haiti.database.repository.manager.AbstractSimpleManagerRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

10
bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/DiscussionRepositoryImpl.java → bot-data/src/main/java/dev/struchkov/bot/gitlab/data/impl/DiscussionRepositoryImpl.java
View File

@ -1,10 +1,10 @@
package org.sadtech.bot.gitlab.data.impl;
package dev.struchkov.bot.gitlab.data.impl;
import dev.struchkov.bot.gitlab.context.domain.entity.Discussion;
import dev.struchkov.bot.gitlab.context.repository.DiscussionRepository;
import dev.struchkov.bot.gitlab.data.jpa.DiscussionJpaRepository;
import dev.struchkov.haiti.database.repository.manager.AbstractSimpleManagerRepository;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.entity.Discussion;
import org.sadtech.bot.gitlab.context.repository.DiscussionRepository;
import org.sadtech.bot.gitlab.data.jpa.DiscussionJpaRepository;
import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository;
import org.springframework.stereotype.Repository;
import java.util.List;

14
bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/MergeRequestRepositoryImpl.java → bot-data/src/main/java/dev/struchkov/bot/gitlab/data/impl/MergeRequestRepositoryImpl.java
View File

@ -1,12 +1,12 @@
package org.sadtech.bot.gitlab.data.impl;
package dev.struchkov.bot.gitlab.data.impl;
import dev.struchkov.bot.gitlab.context.domain.IdAndStatusPr;
import dev.struchkov.bot.gitlab.context.domain.MergeRequestState;
import dev.struchkov.bot.gitlab.context.domain.entity.MergeRequest;
import dev.struchkov.bot.gitlab.context.repository.MergeRequestRepository;
import dev.struchkov.bot.gitlab.data.jpa.MergeRequestJpaRepository;
import dev.struchkov.haiti.database.repository.manager.FilterManagerRepository;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.IdAndStatusPr;
import org.sadtech.bot.gitlab.context.domain.MergeRequestState;
import org.sadtech.bot.gitlab.context.domain.entity.MergeRequest;
import org.sadtech.bot.gitlab.context.repository.MergeRequestRepository;
import org.sadtech.bot.gitlab.data.jpa.MergeRequestJpaRepository;
import org.sadtech.haiti.database.repository.manager.FilterManagerRepository;
import org.springframework.stereotype.Repository;
import java.util.List;

16
bot-data/src/main/java/org/sadtech/bot/gitlab/data/impl/NoteRepositoryImpl.java → bot-data/src/main/java/dev/struchkov/bot/gitlab/data/impl/NoteRepositoryImpl.java
View File

@ -1,13 +1,13 @@
package org.sadtech.bot.gitlab.data.impl;
package dev.struchkov.bot.gitlab.data.impl;
import dev.struchkov.bot.gitlab.context.domain.entity.Note;
import dev.struchkov.bot.gitlab.context.repository.NoteRepository;
import dev.struchkov.bot.gitlab.data.jpa.NoteRepositoryJpa;
import dev.struchkov.haiti.context.page.Pagination;
import dev.struchkov.haiti.context.page.Sheet;
import dev.struchkov.haiti.database.repository.manager.AbstractSimpleManagerRepository;
import dev.struchkov.haiti.database.util.Converter;
import lombok.NonNull;
import org.sadtech.bot.gitlab.context.domain.entity.Note;
import org.sadtech.bot.gitlab.context.repository.NoteRepository;
import org.sadtech.bot.gitlab.data.jpa.NoteRepositoryJpa;
import org.sadtech.haiti.context.page.Pagination;
import org.sadtech.haiti.context.page.Sheet;
import org.sadtech.haiti.database.repository.manager.AbstractSimpleManagerRepository;
import org.sadtech.haiti.database.util.Converter;
import org.springframework.stereotype.Repository;
import java.util.List;

Some files were not shown because too many files have changed in this diff Show More