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

Предварительная версия

Browse Source
This commit is contained in:
upagge 2020-09-17 17:09:18 +03:00
parent bdd13c5c92
commit 23da158ba9
No known key found for this signature in database
GPG Key ID: 15CD012E46F6BA34
154 changed files with 1029 additions and 768 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
bitbucket-app/pom.xml Normal file
View File

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<artifactId>bitbucketbot</artifactId>
<groupId>org.sadtech.bot.bitbucketbot</groupId>
<version>2.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>bitbucket-app</artifactId>
<dependencies>
<dependency>
<groupId>org.sadtech.bot.bitbucketbot</groupId>
<artifactId>bot-core</artifactId>
<version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.sadtech.bot.bitbucketbot</groupId>
<artifactId>bot-rest</artifactId>
<version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.sadtech.bot.bitbucketbot</groupId>
<artifactId>telegram-bot</artifactId>
<version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.sadtech.bot.bitbucketbot</groupId>
<artifactId>bitbucket-sdk</artifactId>
<version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>

17
bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/BitbucketbotApplication.java Normal file
View File

@ -0,0 +1,17 @@
package org.sadtech.bot.vcs.bitbucket;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
@EnableJpaRepositories(basePackages = "org.sadtech.bot.vcs.core.repository.jpa")
@SpringBootApplication(scanBasePackages = "org.sadtech.bot.vcs")
@EntityScan(basePackages = "org.sadtech.bot.vcs.core.domain.entity")
public class BitbucketbotApplication {
public static void main(String[] args) {
SpringApplication.run(BitbucketbotApplication.class, args);
}
}

2
src/main/java/org/sadtech/bot/bitbucketbot/config/AppConfig.java → bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/app/config/AppConfig.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.config;
package org.sadtech.bot.vcs.bitbucket.app.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

14
bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/exception/BitbucketAppException.java Normal file
View File

@ -0,0 +1,14 @@
package org.sadtech.bot.vcs.bitbucket.exception;
/**
* // TODO: 16.09.2020 Добавить описание.
*
* @author upagge 16.09.2020
*/
public class BitbucketAppException extends RuntimeException {
public BitbucketAppException(String message) {
super(message);
}
}

14
bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/exception/ConvertException.java Normal file
View File

@ -0,0 +1,14 @@
package org.sadtech.bot.vcs.bitbucket.exception;
/**
* // TODO: 16.09.2020 Добавить описание.
*
* @author upagge 16.09.2020
*/
public class ConvertException extends BitbucketAppException {
public ConvertException(String message) {
super(message);
}
}

4
src/main/java/org/sadtech/bot/bitbucketbot/scheduler/parser/CommentAndTaskScheduler.java → bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/scheduler/CommentAndTaskScheduler.java
View File

@ -1,7 +1,7 @@
package org.sadtech.bot.bitbucketbot.scheduler.parser;
package org.sadtech.bot.vcs.bitbucket.scheduler;
import lombok.RequiredArgsConstructor;
import org.sadtech.bot.bitbucketbot.service.parser.CommentAndTaskParser;
import org.sadtech.bot.vcs.bitbucket.service.CommentAndTaskParser;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

4
src/main/java/org/sadtech/bot/bitbucketbot/scheduler/parser/PersonScheduler.java → bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/scheduler/PersonScheduler.java
View File

@ -1,7 +1,7 @@
package org.sadtech.bot.bitbucketbot.scheduler.parser;
package org.sadtech.bot.vcs.bitbucket.scheduler;
import lombok.RequiredArgsConstructor;
import org.sadtech.bot.bitbucketbot.service.impl.parser.PersonBitbucketParser;
import org.sadtech.bot.vcs.bitbucket.service.parser.PersonBitbucketParser;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

4
src/main/java/org/sadtech/bot/bitbucketbot/scheduler/parser/PullRequestParserScheduler.java → bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/scheduler/PullRequestParserScheduler.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.bitbucketbot.scheduler.parser;
package org.sadtech.bot.vcs.bitbucket.scheduler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.sadtech.bot.bitbucketbot.service.parser.PullRequestParser;
import org.sadtech.bot.vcs.core.service.parser.PullRequestParser;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;

33
src/main/java/org/sadtech/bot/bitbucketbot/service/parser/CommentAndTaskParser.java → bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/CommentAndTaskParser.java
View File

@ -1,25 +1,24 @@
package org.sadtech.bot.bitbucketbot.service.parser;
package org.sadtech.bot.vcs.bitbucket.service;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import org.sadtech.basic.context.page.Sheet;
import org.sadtech.basic.core.page.PaginationImpl;
import org.sadtech.bot.bitbucketbot.config.InitProperty;
import org.sadtech.bot.bitbucketbot.config.properties.BitbucketProperty;
import org.sadtech.bot.bitbucketbot.config.properties.CommentSchedulerProperty;
import org.sadtech.bot.bitbucketbot.domain.entity.Comment;
import org.sadtech.bot.bitbucketbot.domain.entity.PullRequest;
import org.sadtech.bot.bitbucketbot.domain.entity.PullRequestMini;
import org.sadtech.bot.bitbucketbot.domain.entity.Task;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.CommentJson;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.Severity;
import org.sadtech.bot.bitbucketbot.exception.NotFoundException;
import org.sadtech.bot.bitbucketbot.service.CommentService;
import org.sadtech.bot.bitbucketbot.service.PullRequestsService;
import org.sadtech.bot.bitbucketbot.service.TaskService;
import org.sadtech.bot.bitbucketbot.service.Utils;
import org.sadtech.bot.bitbucketbot.service.executor.DataScan;
import org.sadtech.bot.bitbucketbot.service.impl.ExecutorScanner;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.Severity;
import org.sadtech.bot.vcs.bitbucket.service.executor.DataScan;
import org.sadtech.bot.vcs.core.config.properties.BitbucketProperty;
import org.sadtech.bot.vcs.core.config.properties.CommentSchedulerProperty;
import org.sadtech.bot.vcs.core.config.properties.InitProperty;
import org.sadtech.bot.vcs.core.domain.entity.Comment;
import org.sadtech.bot.vcs.core.domain.entity.PullRequest;
import org.sadtech.bot.vcs.core.domain.entity.PullRequestMini;
import org.sadtech.bot.vcs.core.domain.entity.Task;
import org.sadtech.bot.vcs.core.exception.NotFoundException;
import org.sadtech.bot.vcs.core.service.CommentService;
import org.sadtech.bot.vcs.core.service.PullRequestsService;
import org.sadtech.bot.vcs.core.service.TaskService;
import org.sadtech.bot.vcs.core.service.Utils;
import org.springframework.core.convert.ConversionService;
import org.springframework.stereotype.Component;

12
src/main/java/org/sadtech/bot/bitbucketbot/service/impl/ExecutorScanner.java → bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/ExecutorScanner.java
View File

@ -1,13 +1,13 @@
package org.sadtech.bot.bitbucketbot.service.impl;
package org.sadtech.bot.vcs.bitbucket.service;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.sadtech.bot.bitbucketbot.config.properties.BitbucketProperty;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.CommentJson;
import org.sadtech.bot.bitbucketbot.service.executor.DataScan;
import org.sadtech.bot.bitbucketbot.service.executor.Executor;
import org.sadtech.bot.bitbucketbot.service.executor.Seeker;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson;
import org.sadtech.bot.vcs.bitbucket.service.executor.DataScan;
import org.sadtech.bot.vcs.bitbucket.service.executor.Executor;
import org.sadtech.bot.vcs.bitbucket.service.executor.Seeker;
import org.sadtech.bot.vcs.core.config.properties.BitbucketProperty;
import org.springframework.stereotype.Service;
import java.util.ArrayList;

9
src/main/java/org/sadtech/bot/bitbucketbot/service/converter/CommentJsonToComment.java → bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/converter/CommentJsonToComment.java
View File

@ -1,8 +1,9 @@
package org.sadtech.bot.bitbucketbot.service.converter;
package org.sadtech.bot.vcs.bitbucket.service.converter;
import org.sadtech.bot.bitbucketbot.domain.entity.Comment;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.CommentJson;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.Severity;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.Severity;
import org.sadtech.bot.vcs.core.domain.entity.Comment;
import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;

14
src/main/java/org/sadtech/bot/bitbucketbot/service/converter/CommentJsonToTaskConvert.java → bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/converter/CommentJsonToTaskConvert.java
View File

@ -1,11 +1,11 @@
package org.sadtech.bot.bitbucketbot.service.converter;
package org.sadtech.bot.vcs.bitbucket.service.converter;
import org.sadtech.basic.context.exception.ConvertException;
import org.sadtech.bot.bitbucketbot.domain.TaskStatus;
import org.sadtech.bot.bitbucketbot.domain.entity.Task;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.CommentJson;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.CommentState;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.Severity;
import org.sadtech.bot.vcs.bitbucket.exception.ConvertException;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentState;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.Severity;
import org.sadtech.bot.vcs.core.domain.TaskStatus;
import org.sadtech.bot.vcs.core.domain.entity.Task;
import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;

29
src/main/java/org/sadtech/bot/bitbucketbot/service/converter/PullRequestJsonConverter.java → bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/converter/PullRequestJsonConverter.java
View File

@ -1,16 +1,17 @@
package org.sadtech.bot.bitbucketbot.service.converter;
package org.sadtech.bot.vcs.bitbucket.service.converter;
import lombok.RequiredArgsConstructor;
import org.sadtech.bot.bitbucketbot.domain.PullRequestStatus;
import org.sadtech.bot.bitbucketbot.domain.ReviewerStatus;
import org.sadtech.bot.bitbucketbot.domain.entity.PullRequest;
import org.sadtech.bot.bitbucketbot.domain.entity.Reviewer;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.Outcome;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.Properties;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.PullRequestJson;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.PullRequestState;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.UserDecisionJson;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.UserPullRequestStatus;
import org.sadtech.bot.vcs.bitbucket.exception.ConvertException;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.Outcome;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.Properties;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.PullRequestJson;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.PullRequestState;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.UserDecisionJson;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.UserPullRequestStatus;
import org.sadtech.bot.vcs.core.domain.PullRequestStatus;
import org.sadtech.bot.vcs.core.domain.ReviewerStatus;
import org.sadtech.bot.vcs.core.domain.entity.PullRequest;
import org.sadtech.bot.vcs.core.domain.entity.Reviewer;
import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;
@ -64,8 +65,9 @@ public class PullRequestJsonConverter implements Converter<PullRequestJson, Pull
return PullRequestStatus.MERGED;
case DECLINED:
return PullRequestStatus.DECLINED;
default:
throw new ConvertException("Неподдерживаемый тип ПР");
}
return null;
}
private List<Reviewer> convertReviewers(List<UserDecisionJson> jsonReviewers) {
@ -89,8 +91,9 @@ public class PullRequestJsonConverter implements Converter<PullRequestJson, Pull
return ReviewerStatus.UNAPPROVED;
case UNAPPROVED:
return ReviewerStatus.NEEDS_WORK;
default:
throw new ConvertException("Неподдерживаемый статус ревьювера");
}
return null;
}
}

6
src/main/java/org/sadtech/bot/bitbucketbot/service/converter/UserJsonConverter.java → bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/converter/UserJsonConverter.java
View File

@ -1,7 +1,7 @@
package org.sadtech.bot.bitbucketbot.service.converter;
package org.sadtech.bot.vcs.bitbucket.service.converter;
import org.sadtech.bot.bitbucketbot.domain.entity.Person;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.UserJson;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.UserJson;
import org.sadtech.bot.vcs.core.domain.entity.Person;
import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;

2
src/main/java/org/sadtech/bot/bitbucketbot/service/executor/DataScan.java → bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/executor/DataScan.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.service.executor;
package org.sadtech.bot.vcs.bitbucket.service.executor;
import lombok.Data;

3
src/main/java/org/sadtech/bot/bitbucketbot/service/executor/Executor.java → bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/executor/Executor.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.service.executor;
package org.sadtech.bot.vcs.bitbucket.service.executor;
import lombok.NonNull;
@ -9,4 +9,5 @@ public interface Executor<T, D> {
boolean registration(@NonNull List<T> seeker);
List<D> getResult();
}

4
src/main/java/org/sadtech/bot/bitbucketbot/service/executor/ResultScan.java → bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/executor/ResultScan.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.bitbucketbot.service.executor;
package org.sadtech.bot.vcs.bitbucket.service.executor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.CommentJson;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson;
@Getter
@RequiredArgsConstructor

6
src/main/java/org/sadtech/bot/bitbucketbot/service/executor/Seeker.java → bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/executor/Seeker.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.bitbucketbot.service.executor;
package org.sadtech.bot.vcs.bitbucket.service.executor;
import lombok.RequiredArgsConstructor;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.CommentJson;
import org.sadtech.bot.bitbucketbot.service.Utils;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentJson;
import org.sadtech.bot.vcs.core.service.Utils;
import java.util.Optional;
import java.util.concurrent.Callable;

16
src/main/java/org/sadtech/bot/bitbucketbot/service/impl/parser/PersonBitbucketParser.java → bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/parser/PersonBitbucketParser.java
View File

@ -1,13 +1,13 @@
package org.sadtech.bot.bitbucketbot.service.impl.parser;
package org.sadtech.bot.vcs.bitbucket.service.parser;
import lombok.RequiredArgsConstructor;
import org.sadtech.bot.bitbucketbot.config.properties.BitbucketProperty;
import org.sadtech.bot.bitbucketbot.domain.entity.Person;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.UserJson;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.sheet.UserSheetJson;
import org.sadtech.bot.bitbucketbot.service.PersonService;
import org.sadtech.bot.bitbucketbot.service.Utils;
import org.sadtech.bot.bitbucketbot.service.parser.PersonParser;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.UserJson;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.sheet.UserSheetJson;
import org.sadtech.bot.vcs.core.config.properties.BitbucketProperty;
import org.sadtech.bot.vcs.core.domain.entity.Person;
import org.sadtech.bot.vcs.core.service.PersonService;
import org.sadtech.bot.vcs.core.service.Utils;
import org.sadtech.bot.vcs.core.service.parser.PersonParser;
import org.springframework.core.convert.ConversionService;
import org.springframework.stereotype.Service;

34
src/main/java/org/sadtech/bot/bitbucketbot/service/impl/parser/PullRequestBitbucketParser.java → bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/service/parser/PullRequestBitbucketParser.java
View File

@ -1,21 +1,21 @@
package org.sadtech.bot.bitbucketbot.service.impl.parser;
package org.sadtech.bot.vcs.bitbucket.service.parser;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.sadtech.bot.bitbucketbot.config.properties.BitbucketProperty;
import org.sadtech.bot.bitbucketbot.domain.IdAndStatusPr;
import org.sadtech.bot.bitbucketbot.domain.PullRequestStatus;
import org.sadtech.bot.bitbucketbot.domain.entity.Person;
import org.sadtech.bot.bitbucketbot.domain.entity.PullRequest;
import org.sadtech.bot.bitbucketbot.domain.filter.PullRequestFilter;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.PullRequestJson;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.sheet.PullRequestSheetJson;
import org.sadtech.bot.bitbucketbot.service.PersonService;
import org.sadtech.bot.bitbucketbot.service.PullRequestsService;
import org.sadtech.bot.bitbucketbot.service.Utils;
import org.sadtech.bot.bitbucketbot.service.parser.PullRequestParser;
import org.sadtech.bot.bitbucketbot.utils.Pair;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.PullRequestJson;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.sheet.PullRequestSheetJson;
import org.sadtech.bot.vcs.core.config.properties.BitbucketProperty;
import org.sadtech.bot.vcs.core.domain.IdAndStatusPr;
import org.sadtech.bot.vcs.core.domain.PullRequestStatus;
import org.sadtech.bot.vcs.core.domain.entity.Person;
import org.sadtech.bot.vcs.core.domain.entity.PullRequest;
import org.sadtech.bot.vcs.core.domain.filter.PullRequestFilter;
import org.sadtech.bot.vcs.core.service.PersonService;
import org.sadtech.bot.vcs.core.service.PullRequestsService;
import org.sadtech.bot.vcs.core.service.Utils;
import org.sadtech.bot.vcs.core.service.parser.PullRequestParser;
import org.sadtech.bot.vcs.core.utils.Pair;
import org.springframework.core.convert.ConversionService;
import org.springframework.stereotype.Service;
@ -27,16 +27,12 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.sadtech.bot.bitbucketbot.domain.PullRequestStatus.DECLINED;
import static org.sadtech.bot.bitbucketbot.domain.PullRequestStatus.MERGED;
import static org.sadtech.bot.bitbucketbot.domain.PullRequestStatus.OPEN;
@Slf4j
@Service
@RequiredArgsConstructor
public class PullRequestBitbucketParser implements PullRequestParser {
private static final Set<PullRequestStatus> OLD_STATUSES = Stream.of(MERGED, OPEN, DECLINED).collect(Collectors.toSet());
private static final Set<PullRequestStatus> OLD_STATUSES = Stream.of(PullRequestStatus.MERGED, PullRequestStatus.OPEN, PullRequestStatus.DECLINED).collect(Collectors.toSet());
private final PullRequestsService pullRequestsService;
private final PersonService personService;

8
src/main/java/org/sadtech/bot/bitbucketbot/utils/Converter.java → bitbucket-app/src/main/java/org/sadtech/bot/vcs/bitbucket/utils/Converter.java
View File

@ -1,10 +1,10 @@
package org.sadtech.bot.bitbucketbot.utils;
package org.sadtech.bot.vcs.bitbucket.utils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.sadtech.bot.bitbucketbot.domain.TaskStatus;
import org.sadtech.bot.bitbucketbot.dto.bitbucket.CommentState;
import org.sadtech.bot.bitbucketbot.exception.NotFoundException;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.CommentState;
import org.sadtech.bot.vcs.core.domain.TaskStatus;
import org.sadtech.bot.vcs.core.exception.NotFoundException;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class Converter {

0
src/main/resources/application-dev.yaml → bitbucket-app/src/main/resources/application-dev.yaml
View File

0
src/main/resources/application-prod.yaml → bitbucket-app/src/main/resources/application-prod.yaml
View File

5
bitbucket-app/src/main/resources/application.yaml Normal file
View File

@ -0,0 +1,5 @@
server:
port: 8018
telegram-config:
bot-username: tsc_test_two_bot
bot-token: 1304335862:AAFXGxRkTZBiL9Gjce_oFoP2cOn7j8qEwDI

0
src/main/resources/liquibase/change-log.xml → bitbucket-app/src/main/resources/liquibase/change-log.xml
View File

0
src/main/resources/liquibase/v.2.0.0/2020-09-06-create-table.xml → bitbucket-app/src/main/resources/liquibase/v.2.0.0/2020-09-06-create-table.xml
View File

0
src/main/resources/liquibase/v.2.0.0/2020-09-06-cumulative.xml → bitbucket-app/src/main/resources/liquibase/v.2.0.0/2020-09-06-cumulative.xml
View File

0
src/main/resources/liquibase/v.2.0.0/2020-09-15-fix-task-comments.xml → bitbucket-app/src/main/resources/liquibase/v.2.0.0/2020-09-15-fix-task-comments.xml
View File

2
src/main/resources/logback.xml → bitbucket-app/src/main/resources/logback.xml
View File

@ -18,7 +18,7 @@
</appender>
<root level="info">
<appender-ref ref="FILE"/>
<appender-ref ref="STDOUT"/>
</root>
</configuration>

0
src/main/resources/public/index.html → bitbucket-app/src/main/resources/public/index.html
View File

0
src/main/resources/public/static/css/signin.css → bitbucket-app/src/main/resources/public/static/css/signin.css
View File

28
bitbucket-sdk/pom.xml Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<artifactId>bitbucketbot</artifactId>
<groupId>org.sadtech.bot.bitbucketbot</groupId>
<version>2.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>bitbucket-sdk</artifactId>
<version>2.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
</dependencies>
</project>

2
src/main/java/org/sadtech/bot/bitbucketbot/domain/BitbucketUserRole.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/BitbucketUserRole.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.domain;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
/**
* TODO: Добавить комментарий енума.

4
src/main/java/org/sadtech/bot/bitbucketbot/dto/bitbucket/CommentJson.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/CommentJson.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.bitbucketbot.dto.bitbucket;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import lombok.Data;
import org.sadtech.bot.bitbucketbot.utils.LocalDateTimeFromEpochDeserializer;
import org.sadtech.bot.vcs.bitbucket.sdk.utils.LocalDateTimeFromEpochDeserializer;
import java.time.LocalDateTime;
import java.util.List;

2
src/main/java/org/sadtech/bot/bitbucketbot/dto/bitbucket/CommentState.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/CommentState.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.dto.bitbucket;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
public enum CommentState {

2
src/main/java/org/sadtech/bot/bitbucketbot/dto/bitbucket/FromRefJson.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/FromRefJson.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.dto.bitbucket;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
import lombok.Data;

2
src/main/java/org/sadtech/bot/bitbucketbot/dto/bitbucket/LinkJson.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/LinkJson.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.dto.bitbucket;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
import lombok.Data;

2
src/main/java/org/sadtech/bot/bitbucketbot/dto/bitbucket/MergeResult.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/MergeResult.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.dto.bitbucket;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
import lombok.Data;

2
src/main/java/org/sadtech/bot/bitbucketbot/dto/bitbucket/Outcome.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Outcome.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.dto.bitbucket;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
public enum Outcome {

2
src/main/java/org/sadtech/bot/bitbucketbot/dto/bitbucket/ProjectJson.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/ProjectJson.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.dto.bitbucket;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
import lombok.Data;

2
src/main/java/org/sadtech/bot/bitbucketbot/dto/bitbucket/Properties.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Properties.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.dto.bitbucket;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
import lombok.Data;

4
src/main/java/org/sadtech/bot/bitbucketbot/dto/bitbucket/PullRequestJson.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/PullRequestJson.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.bitbucketbot.dto.bitbucket;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import lombok.Data;
import org.sadtech.bot.bitbucketbot.utils.LocalDateTimeFromEpochDeserializer;
import org.sadtech.bot.vcs.bitbucket.sdk.utils.LocalDateTimeFromEpochDeserializer;
import java.time.LocalDateTime;
import java.util.List;

2
src/main/java/org/sadtech/bot/bitbucketbot/dto/bitbucket/PullRequestState.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/PullRequestState.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.dto.bitbucket;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
/**
* TODO: Добавить комментарий енума.

2
src/main/java/org/sadtech/bot/bitbucketbot/dto/bitbucket/RepositoryJson.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/RepositoryJson.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.dto.bitbucket;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
import lombok.Data;

2
src/main/java/org/sadtech/bot/bitbucketbot/dto/bitbucket/SelfJson.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/SelfJson.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.dto.bitbucket;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
import lombok.Data;

2
src/main/java/org/sadtech/bot/bitbucketbot/dto/bitbucket/Severity.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Severity.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.dto.bitbucket;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
public enum Severity {

2
src/main/java/org/sadtech/bot/bitbucketbot/dto/bitbucket/Sheet.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/Sheet.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.dto.bitbucket;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
import lombok.Data;

3
src/main/java/org/sadtech/bot/bitbucketbot/dto/bitbucket/UserDecisionJson.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/UserDecisionJson.java
View File

@ -1,7 +1,6 @@
package org.sadtech.bot.bitbucketbot.dto.bitbucket;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
import lombok.Data;
import org.sadtech.bot.bitbucketbot.domain.BitbucketUserRole;
/**
* TODO: Добавить описание класса.

2
src/main/java/org/sadtech/bot/bitbucketbot/dto/bitbucket/UserJson.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/UserJson.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.dto.bitbucket;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
import lombok.Data;

2
src/main/java/org/sadtech/bot/bitbucketbot/dto/bitbucket/UserPullRequestStatus.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/UserPullRequestStatus.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.dto.bitbucket;
package org.sadtech.bot.vcs.bitbucket.sdk.domain;
/**
* TODO: Добавить комментарий енума.

13
bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/sheet/PullRequestSheetJson.java Normal file
View File

@ -0,0 +1,13 @@
package org.sadtech.bot.vcs.bitbucket.sdk.domain.sheet;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.PullRequestJson;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.Sheet;
/**
* TODO: Добавить описание класса.
*
* @author upagge [02.02.2020]
*/
public class PullRequestSheetJson extends Sheet<PullRequestJson> {
}

13
bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/domain/sheet/UserSheetJson.java Normal file
View File

@ -0,0 +1,13 @@
package org.sadtech.bot.vcs.bitbucket.sdk.domain.sheet;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.Sheet;
import org.sadtech.bot.vcs.bitbucket.sdk.domain.UserJson;
/**
* TODO: Добавить описание класса.
*
* @author upagge [02.02.2020]
*/
public class UserSheetJson extends Sheet<UserJson> {
}

6
src/main/java/org/sadtech/bot/bitbucketbot/utils/LocalDateTimeFromEpochDeserializer.java → bitbucket-sdk/src/main/java/org/sadtech/bot/vcs/bitbucket/sdk/utils/LocalDateTimeFromEpochDeserializer.java
View File

@ -1,16 +1,14 @@
package org.sadtech.bot.bitbucketbot.utils;
package org.sadtech.bot.vcs.bitbucket.sdk.utils;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
@Slf4j
public class LocalDateTimeFromEpochDeserializer extends JsonDeserializer<LocalDateTime> {
@Override
@ -20,7 +18,7 @@ public class LocalDateTimeFromEpochDeserializer extends JsonDeserializer<LocalDa
Instant instant = Instant.ofEpochMilli(time);
return instant.atZone(ZoneId.systemDefault()).toLocalDateTime();
} catch (IOException e) {
log.error(e.getMessage());
}
return null;
}

82
bot-core/pom.xml Normal file
View File

@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<artifactId>bitbucketbot</artifactId>
<groupId>org.sadtech.bot.bitbucketbot</groupId>
<version>2.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>bot-core</artifactId>
<version>2.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.sadtech.basic.filter</groupId>
<artifactId>criteria-filter</artifactId>
</dependency>
<dependency>
<groupId>org.sadtech.basic</groupId>
<artifactId>project-database</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
</dependencies>
</project>

2
src/main/java/org/sadtech/bot/bitbucketbot/config/properties/BitbucketProperty.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/BitbucketProperty.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.config.properties;
package org.sadtech.bot.vcs.core.config.properties;
import lombok.Getter;
import lombok.Setter;

4
src/main/java/org/sadtech/bot/bitbucketbot/config/properties/CommentSchedulerProperty.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/CommentSchedulerProperty.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.bitbucketbot.config.properties;
package org.sadtech.bot.vcs.core.config.properties;
import lombok.Getter;
import lombok.Setter;
import org.sadtech.bot.bitbucketbot.scheduler.SchedulerComments;
import org.sadtech.bot.vcs.core.scheduler.SchedulerComments;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

2
src/main/java/org/sadtech/bot/bitbucketbot/config/InitProperty.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/config/properties/InitProperty.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.config;
package org.sadtech.bot.vcs.core.config.properties;
import lombok.Getter;
import lombok.Setter;

2
src/main/java/org/sadtech/bot/bitbucketbot/domain/Answer.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/Answer.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.domain;
package org.sadtech.bot.vcs.core.domain;
import lombok.AccessLevel;
import lombok.Getter;

2
src/main/java/org/sadtech/bot/bitbucketbot/domain/AuthType.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/AuthType.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.domain;
package org.sadtech.bot.vcs.core.domain;
/**
* TODO: Добавить комментарий енума.

2
src/main/java/org/sadtech/bot/bitbucketbot/domain/IdAndStatusPr.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/IdAndStatusPr.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.domain;
package org.sadtech.bot.vcs.core.domain;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
src/main/java/org/sadtech/bot/bitbucketbot/domain/MessageSend.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/MessageSend.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.domain;
package org.sadtech.bot.vcs.core.domain;
import lombok.AllArgsConstructor;
import lombok.Builder;

2
src/main/java/org/sadtech/bot/bitbucketbot/domain/PullRequestStatus.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/PullRequestStatus.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.domain;
package org.sadtech.bot.vcs.core.domain;
/**
* @author upagge [31.01.2020]

2
src/main/java/org/sadtech/bot/bitbucketbot/domain/ReviewerStatus.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/ReviewerStatus.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.domain;
package org.sadtech.bot.vcs.core.domain;
import lombok.Getter;

2
src/main/java/org/sadtech/bot/bitbucketbot/domain/TaskStatus.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/TaskStatus.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.domain;
package org.sadtech.bot.vcs.core.domain;
public enum TaskStatus {

2
src/main/java/org/sadtech/bot/bitbucketbot/domain/UserAuth.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/UserAuth.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.domain;
package org.sadtech.bot.vcs.core.domain;
/**
* TODO: Добавить описание класса.

2
src/main/java/org/sadtech/bot/bitbucketbot/domain/change/Change.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/Change.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.domain.change;
package org.sadtech.bot.vcs.core.domain.change;
import lombok.EqualsAndHashCode;
import lombok.Getter;

2
src/main/java/org/sadtech/bot/bitbucketbot/domain/change/ChangeType.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/ChangeType.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.domain.change;
package org.sadtech.bot.vcs.core.domain.change;
public enum ChangeType {

10
src/main/java/org/sadtech/bot/bitbucketbot/domain/change/comment/AnswerCommentChange.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/comment/AnswerCommentChange.java
View File

@ -1,12 +1,12 @@
package org.sadtech.bot.bitbucketbot.domain.change.comment;
package org.sadtech.bot.vcs.core.domain.change.comment;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import org.sadtech.bot.bitbucketbot.domain.Answer;
import org.sadtech.bot.bitbucketbot.domain.change.Change;
import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
import org.sadtech.bot.bitbucketbot.utils.Smile;
import org.sadtech.bot.vcs.core.domain.Answer;
import org.sadtech.bot.vcs.core.domain.change.Change;
import org.sadtech.bot.vcs.core.domain.change.ChangeType;
import org.sadtech.bot.vcs.core.utils.Smile;
import java.text.MessageFormat;
import java.util.List;

8
src/main/java/org/sadtech/bot/bitbucketbot/domain/change/comment/CommentChange.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/comment/CommentChange.java
View File

@ -1,11 +1,11 @@
package org.sadtech.bot.bitbucketbot.domain.change.comment;
package org.sadtech.bot.vcs.core.domain.change.comment;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import org.sadtech.bot.bitbucketbot.domain.change.Change;
import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
import org.sadtech.bot.bitbucketbot.utils.Smile;
import org.sadtech.bot.vcs.core.domain.change.Change;
import org.sadtech.bot.vcs.core.domain.change.ChangeType;
import org.sadtech.bot.vcs.core.utils.Smile;
import java.text.MessageFormat;
import java.util.Set;

6
src/main/java/org/sadtech/bot/bitbucketbot/domain/change/pullrequest/ConflictPrChange.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/pullrequest/ConflictPrChange.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.bitbucketbot.domain.change.pullrequest;
package org.sadtech.bot.vcs.core.domain.change.pullrequest;
import lombok.Builder;
import lombok.Getter;
import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
import org.sadtech.bot.bitbucketbot.utils.Smile;
import org.sadtech.bot.vcs.core.domain.change.ChangeType;
import org.sadtech.bot.vcs.core.utils.Smile;
import java.text.MessageFormat;
import java.util.Set;

6
src/main/java/org/sadtech/bot/bitbucketbot/domain/change/pullrequest/NewPrChange.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/pullrequest/NewPrChange.java
View File

@ -1,10 +1,10 @@
package org.sadtech.bot.bitbucketbot.domain.change.pullrequest;
package org.sadtech.bot.vcs.core.domain.change.pullrequest;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
import org.sadtech.bot.bitbucketbot.utils.Smile;
import org.sadtech.bot.vcs.core.domain.change.ChangeType;
import org.sadtech.bot.vcs.core.utils.Smile;
import java.text.MessageFormat;
import java.util.Set;

6
src/main/java/org/sadtech/bot/bitbucketbot/domain/change/pullrequest/PrChange.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/pullrequest/PrChange.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.bitbucketbot.domain.change.pullrequest;
package org.sadtech.bot.vcs.core.domain.change.pullrequest;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import org.sadtech.bot.bitbucketbot.domain.change.Change;
import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
import org.sadtech.bot.vcs.core.domain.change.Change;
import org.sadtech.bot.vcs.core.domain.change.ChangeType;
import java.util.Set;

14
src/main/java/org/sadtech/bot/bitbucketbot/domain/change/pullrequest/ReviewersPrChange.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/pullrequest/ReviewersPrChange.java
View File

@ -1,20 +1,20 @@
package org.sadtech.bot.bitbucketbot.domain.change.pullrequest;
package org.sadtech.bot.vcs.core.domain.change.pullrequest;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
import org.sadtech.bot.bitbucketbot.domain.util.ReviewerChange;
import org.sadtech.bot.bitbucketbot.utils.Smile;
import org.sadtech.bot.vcs.core.domain.change.ChangeType;
import org.sadtech.bot.vcs.core.domain.util.ReviewerChange;
import org.sadtech.bot.vcs.core.utils.Smile;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import static org.sadtech.bot.bitbucketbot.domain.util.ReviewerChange.Type.DELETED;
import static org.sadtech.bot.bitbucketbot.domain.util.ReviewerChange.Type.NEW;
import static org.sadtech.bot.bitbucketbot.domain.util.ReviewerChange.Type.OLD;
import static org.sadtech.bot.vcs.core.domain.util.ReviewerChange.Type.DELETED;
import static org.sadtech.bot.vcs.core.domain.util.ReviewerChange.Type.NEW;
import static org.sadtech.bot.vcs.core.domain.util.ReviewerChange.Type.OLD;
@Getter
@EqualsAndHashCode(callSuper = true)

8
src/main/java/org/sadtech/bot/bitbucketbot/domain/change/pullrequest/StatusPrChange.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/pullrequest/StatusPrChange.java
View File

@ -1,11 +1,11 @@
package org.sadtech.bot.bitbucketbot.domain.change.pullrequest;
package org.sadtech.bot.vcs.core.domain.change.pullrequest;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import org.sadtech.bot.bitbucketbot.domain.PullRequestStatus;
import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
import org.sadtech.bot.bitbucketbot.utils.Smile;
import org.sadtech.bot.vcs.core.domain.PullRequestStatus;
import org.sadtech.bot.vcs.core.domain.change.ChangeType;
import org.sadtech.bot.vcs.core.utils.Smile;
import java.text.MessageFormat;
import java.util.Set;

6
src/main/java/org/sadtech/bot/bitbucketbot/domain/change/pullrequest/UpdatePrChange.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/pullrequest/UpdatePrChange.java
View File

@ -1,10 +1,10 @@
package org.sadtech.bot.bitbucketbot.domain.change.pullrequest;
package org.sadtech.bot.vcs.core.domain.change.pullrequest;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
import org.sadtech.bot.bitbucketbot.utils.Smile;
import org.sadtech.bot.vcs.core.domain.change.ChangeType;
import org.sadtech.bot.vcs.core.utils.Smile;
import java.text.MessageFormat;
import java.util.Set;

6
src/main/java/org/sadtech/bot/bitbucketbot/domain/change/task/TaskChange.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/task/TaskChange.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.bitbucketbot.domain.change.task;
package org.sadtech.bot.vcs.core.domain.change.task;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import org.sadtech.bot.bitbucketbot.domain.change.Change;
import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
import org.sadtech.bot.vcs.core.domain.change.Change;
import org.sadtech.bot.vcs.core.domain.change.ChangeType;
import java.util.Set;

6
src/main/java/org/sadtech/bot/bitbucketbot/domain/change/task/TaskCloseChange.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/task/TaskCloseChange.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.bitbucketbot.domain.change.task;
package org.sadtech.bot.vcs.core.domain.change.task;
import lombok.Builder;
import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
import org.sadtech.bot.bitbucketbot.utils.Smile;
import org.sadtech.bot.vcs.core.domain.change.ChangeType;
import org.sadtech.bot.vcs.core.utils.Smile;
import java.text.MessageFormat;
import java.util.Set;

6
src/main/java/org/sadtech/bot/bitbucketbot/domain/change/task/TaskNewChange.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/change/task/TaskNewChange.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.bitbucketbot.domain.change.task;
package org.sadtech.bot.vcs.core.domain.change.task;
import lombok.Builder;
import lombok.Getter;
import org.sadtech.bot.bitbucketbot.domain.change.ChangeType;
import org.sadtech.bot.bitbucketbot.utils.Smile;
import org.sadtech.bot.vcs.core.domain.change.ChangeType;
import org.sadtech.bot.vcs.core.utils.Smile;
import java.text.MessageFormat;
import java.util.Set;

2
src/main/java/org/sadtech/bot/bitbucketbot/domain/entity/Comment.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/entity/Comment.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.domain.entity;
package org.sadtech.bot.vcs.core.domain.entity;
import lombok.EqualsAndHashCode;
import lombok.Getter;

2
src/main/java/org/sadtech/bot/bitbucketbot/domain/entity/Person.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/entity/Person.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.domain.entity;
package org.sadtech.bot.vcs.core.domain.entity;
import lombok.EqualsAndHashCode;
import lombok.Getter;

4
src/main/java/org/sadtech/bot/bitbucketbot/domain/entity/PullRequest.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/entity/PullRequest.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.bitbucketbot.domain.entity;
package org.sadtech.bot.vcs.core.domain.entity;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.sadtech.bot.bitbucketbot.domain.PullRequestStatus;
import org.sadtech.bot.vcs.core.domain.PullRequestStatus;
import javax.persistence.CascadeType;
import javax.persistence.Column;

2
src/main/java/org/sadtech/bot/bitbucketbot/domain/entity/PullRequestMini.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/entity/PullRequestMini.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.domain.entity;
package org.sadtech.bot.vcs.core.domain.entity;
import lombok.EqualsAndHashCode;
import lombok.Getter;

4
src/main/java/org/sadtech/bot/bitbucketbot/domain/entity/Reviewer.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/entity/Reviewer.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.bitbucketbot.domain.entity;
package org.sadtech.bot.vcs.core.domain.entity;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.sadtech.bot.bitbucketbot.domain.ReviewerStatus;
import org.sadtech.bot.vcs.core.domain.ReviewerStatus;
import javax.persistence.CascadeType;
import javax.persistence.Column;

4
src/main/java/org/sadtech/bot/bitbucketbot/domain/entity/Task.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/entity/Task.java
View File

@ -1,9 +1,9 @@
package org.sadtech.bot.bitbucketbot.domain.entity;
package org.sadtech.bot.vcs.core.domain.entity;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.sadtech.bot.bitbucketbot.domain.TaskStatus;
import org.sadtech.bot.vcs.core.domain.TaskStatus;
import javax.persistence.CollectionTable;
import javax.persistence.Column;

2
src/main/java/org/sadtech/bot/bitbucketbot/domain/filter/PullRequestFilter.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/filter/PullRequestFilter.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.domain.filter;
package org.sadtech.bot.vcs.core.domain.filter;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;

4
src/main/java/org/sadtech/bot/bitbucketbot/domain/util/ReviewerChange.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/domain/util/ReviewerChange.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.bitbucketbot.domain.util;
package org.sadtech.bot.vcs.core.domain.util;
import lombok.Getter;
import lombok.NonNull;
import org.sadtech.bot.bitbucketbot.domain.ReviewerStatus;
import org.sadtech.bot.vcs.core.domain.ReviewerStatus;
/**
* TODO: Добавить описание класса.

2
src/main/java/org/sadtech/bot/bitbucketbot/exception/BitbucketBotException.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/exception/BitbucketBotException.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.exception;
package org.sadtech.bot.vcs.core.exception;
abstract class BitbucketBotException extends RuntimeException {

2
src/main/java/org/sadtech/bot/bitbucketbot/exception/CreateException.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/exception/CreateException.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.exception;
package org.sadtech.bot.vcs.core.exception;
public class CreateException extends BitbucketBotException {

2
src/main/java/org/sadtech/bot/bitbucketbot/exception/NotFoundException.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/exception/NotFoundException.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.exception;
package org.sadtech.bot.vcs.core.exception;
public class NotFoundException extends BitbucketBotException {

2
src/main/java/org/sadtech/bot/bitbucketbot/exception/RegException.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/exception/RegException.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.exception;
package org.sadtech.bot.vcs.core.exception;
public class RegException extends BitbucketBotException {

2
src/main/java/org/sadtech/bot/bitbucketbot/exception/UpdateException.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/exception/UpdateException.java
View File

@ -1,4 +1,4 @@
package org.sadtech.bot.bitbucketbot.exception;
package org.sadtech.bot.vcs.core.exception;
public class UpdateException extends BitbucketBotException {

4
src/main/java/org/sadtech/bot/bitbucketbot/repository/ChangeRepository.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/ChangeRepository.java
View File

@ -1,7 +1,7 @@
package org.sadtech.bot.bitbucketbot.repository;
package org.sadtech.bot.vcs.core.repository;
import lombok.NonNull;
import org.sadtech.bot.bitbucketbot.domain.change.Change;
import org.sadtech.bot.vcs.core.domain.change.Change;
import java.util.List;

4
src/main/java/org/sadtech/bot/bitbucketbot/repository/CommentRepository.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/CommentRepository.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.bitbucketbot.repository;
package org.sadtech.bot.vcs.core.repository;
import lombok.NonNull;
import org.sadtech.basic.context.repository.SimpleManagerRepository;
import org.sadtech.bot.bitbucketbot.domain.entity.Comment;
import org.sadtech.bot.vcs.core.domain.entity.Comment;
import java.time.LocalDateTime;
import java.util.List;

4
src/main/java/org/sadtech/bot/bitbucketbot/repository/PersonRepository.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/PersonRepository.java
View File

@ -1,7 +1,7 @@
package org.sadtech.bot.bitbucketbot.repository;
package org.sadtech.bot.vcs.core.repository;
import lombok.NonNull;
import org.sadtech.bot.bitbucketbot.domain.entity.Person;
import org.sadtech.bot.vcs.core.domain.entity.Person;
import java.util.List;
import java.util.Optional;

12
src/main/java/org/sadtech/bot/bitbucketbot/repository/PullRequestsRepository.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/PullRequestsRepository.java
View File

@ -1,13 +1,13 @@
package org.sadtech.bot.bitbucketbot.repository;
package org.sadtech.bot.vcs.core.repository;
import lombok.NonNull;
import org.sadtech.basic.context.repository.SimpleManagerRepository;
import org.sadtech.basic.context.repository.simple.FilterOperation;
import org.sadtech.bot.bitbucketbot.domain.IdAndStatusPr;
import org.sadtech.bot.bitbucketbot.domain.PullRequestStatus;
import org.sadtech.bot.bitbucketbot.domain.ReviewerStatus;
import org.sadtech.bot.bitbucketbot.domain.entity.PullRequest;
import org.sadtech.bot.bitbucketbot.domain.entity.PullRequestMini;
import org.sadtech.bot.vcs.core.domain.IdAndStatusPr;
import org.sadtech.bot.vcs.core.domain.PullRequestStatus;
import org.sadtech.bot.vcs.core.domain.ReviewerStatus;
import org.sadtech.bot.vcs.core.domain.entity.PullRequest;
import org.sadtech.bot.vcs.core.domain.entity.PullRequestMini;
import java.util.List;
import java.util.Optional;

4
src/main/java/org/sadtech/bot/bitbucketbot/repository/TaskRepository.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/TaskRepository.java
View File

@ -1,7 +1,7 @@
package org.sadtech.bot.bitbucketbot.repository;
package org.sadtech.bot.vcs.core.repository;
import org.sadtech.basic.context.repository.SimpleManagerRepository;
import org.sadtech.bot.bitbucketbot.domain.entity.Task;
import org.sadtech.bot.vcs.core.domain.entity.Task;
import java.time.LocalDateTime;
import java.util.List;

6
src/main/java/org/sadtech/bot/bitbucketbot/repository/impl/ChangeRepositoryImpl.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/impl/ChangeRepositoryImpl.java
View File

@ -1,8 +1,8 @@
package org.sadtech.bot.bitbucketbot.repository.impl;
package org.sadtech.bot.vcs.core.repository.impl;
import lombok.NonNull;
import org.sadtech.bot.bitbucketbot.domain.change.Change;
import org.sadtech.bot.bitbucketbot.repository.ChangeRepository;
import org.sadtech.bot.vcs.core.domain.change.Change;
import org.sadtech.bot.vcs.core.repository.ChangeRepository;
import org.springframework.stereotype.Repository;
import java.util.ArrayList;

8
src/main/java/org/sadtech/bot/bitbucketbot/repository/impl/CommentRepositoryImpl.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/impl/CommentRepositoryImpl.java
View File

@ -1,10 +1,10 @@
package org.sadtech.bot.bitbucketbot.repository.impl;
package org.sadtech.bot.vcs.core.repository.impl;
import lombok.NonNull;
import org.sadtech.basic.database.repository.manager.AbstractSimpleManagerRepository;
import org.sadtech.bot.bitbucketbot.domain.entity.Comment;
import org.sadtech.bot.bitbucketbot.repository.CommentRepository;
import org.sadtech.bot.bitbucketbot.repository.jpa.CommentRepositoryJpa;
import org.sadtech.bot.vcs.core.domain.entity.Comment;
import org.sadtech.bot.vcs.core.repository.CommentRepository;
import org.sadtech.bot.vcs.core.repository.jpa.CommentRepositoryJpa;
import org.springframework.stereotype.Repository;
import java.time.LocalDateTime;

8
src/main/java/org/sadtech/bot/bitbucketbot/repository/impl/PersonRepositoryImpl.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/impl/PersonRepositoryImpl.java
View File

@ -1,11 +1,11 @@
package org.sadtech.bot.bitbucketbot.repository.impl;
package org.sadtech.bot.vcs.core.repository.impl;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.sadtech.bot.bitbucketbot.domain.entity.Person;
import org.sadtech.bot.bitbucketbot.repository.PersonRepository;
import org.sadtech.bot.bitbucketbot.repository.jpa.PersonJpaRepository;
import org.sadtech.bot.vcs.core.domain.entity.Person;
import org.sadtech.bot.vcs.core.repository.PersonRepository;
import org.sadtech.bot.vcs.core.repository.jpa.PersonJpaRepository;
import org.springframework.dao.InvalidDataAccessResourceUsageException;
import org.springframework.stereotype.Repository;

18
src/main/java/org/sadtech/bot/bitbucketbot/repository/impl/PullRequestsRepositoryImpl.java → bot-core/src/main/java/org/sadtech/bot/vcs/core/repository/impl/PullRequestsRepositoryImpl.java
View File

@ -1,15 +1,15 @@
package org.sadtech.bot.bitbucketbot.repository.impl;
package org.sadtech.bot.vcs.core.repository.impl;
import lombok.NonNull;
import org.sadtech.basic.database.repository.manager.FilterManagerRepository;
import org.sadtech.bot.bitbucketbot.domain.IdAndStatusPr;
import org.sadtech.bot.bitbucketbot.domain.PullRequestStatus;
import org.sadtech.bot.bitbucketbot.domain.ReviewerStatus;
import org.sadtech.bot.bitbucketbot.domain.entity.PullRequest;
import org.sadtech.bot.bitbucketbot.domain.entity.PullRequestMini;
import org.sadtech.bot.bitbucketbot.repository.PullRequestsRepository;
import org.sadtech.bot.bitbucketbot.repository.jpa.PullRequestMiniRepositoryJpa;
import org.sadtech.bot.bitbucketbot.repository.jpa.PullRequestsRepositoryJpa;
import org.sadtech.bot.vcs.core.domain.IdAndStatusPr;
import org.sadtech.bot.vcs.core.domain.PullRequestStatus;
import org.sadtech.bot.vcs.core.domain.ReviewerStatus;
import org.sadtech.bot.vcs.core.domain.entity.PullRequest;
import org.sadtech.bot.vcs.core.domain.entity.PullRequestMini;
import org.sadtech.bot.vcs.core.repository.PullRequestsRepository;
import org.sadtech.bot.vcs.core.repository.jpa.PullRequestMiniRepositoryJpa;
import org.sadtech.bot.vcs.core.repository.jpa.PullRequestsRepositoryJpa;
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