Skip to content

Commit

Permalink
Cleanup: adjust param names; add uppercase into SQL scripts etc
Browse files Browse the repository at this point in the history
  • Loading branch information
andrei-punko committed Feb 1, 2024
1 parent 4ce8ebd commit d181623
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<java.version>17</java.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<spring-boot.version>3.2.1</spring-boot.version>
<spring-boot.version>3.2.2</spring-boot.version>

<springfox.version>3.0.0</springfox.version>
<swagger-core.version>2.2.20</swagger-core.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
@Mapper(componentModel = "spring", nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
public interface ArticleMapper {

ArticleDto toArticleDto(Article article);
ArticleDto toArticleDto(Article source);

Article toArticle(ArticleDto articleDto);
Article toArticle(ArticleDto source);

void toArticle(ArticleUpdateDto articleUpdateDto, @MappingTarget Article article);
void toArticle(ArticleUpdateDto source, @MappingTarget Article target);
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@AllArgsConstructor
@Data
@Entity
@Table(name = "articles")
@Table(name = "ARTICLES")
public class Article {

@Id
Expand Down
26 changes: 13 additions & 13 deletions src/main/resources/db/migration/V1__Create_tables.sql
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@

create table articles (
id int not null,
title varchar(100) not null,
summary varchar(255),
ts timestamp,
text varchar not null,
author varchar(50) not null,
date_created timestamp not null,
date_updated timestamp not null,
create table ARTICLES (
ID int not null,
TITLE varchar(100) not null,
SUMMARY varchar(255),
TS timestamp,
TEXT varchar not null,
AUTHOR varchar(50) not null,
DATE_CREATED timestamp not null,
DATE_UPDATED timestamp not null,
primary key (id)
);

create sequence article_id_seq START WITH 1 INCREMENT BY 1;
create sequence ARTICLE_ID_SEQ start with 1 increment by 1;

create index article_title_idx on articles(title);
create index article_date_created_idx on articles(date_created);
create index article_ts_idx on articles(ts);
create index ARTICLE_TITLE_IDX on ARTICLES(TITLE);
create index ARTICLE_DATE_CREATED_IDX on ARTICLES(DATE_CREATED);
create index ARTICLE_TS_IDX on ARTICLES(TS);
40 changes: 20 additions & 20 deletions src/main/resources/db/migration/V2__Populate_tables.sql
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@

insert into articles (id, title, summary, text, author, date_created, date_updated)
values (nextval('ARTICLE_ID_SEQ'), 'Игрок', 'Рассказ о страсти игромании', '', 'Федор Достоевский', current_timestamp, current_timestamp);
insert into ARTICLES (ID, TITLE, SUMMARY, TEXT, AUTHOR, DATE_CREATED, DATE_UPDATED)
values (nextval('ARTICLE_ID_SEQ'), 'Игрок', 'Рассказ о страсти игромании', '', 'Федор Достоевский', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);

insert into articles (id, title, summary, text, author, date_created, date_updated)
values (nextval('ARTICLE_ID_SEQ'), 'Преступление и наказание', 'Рассказ о убийце и его раскаянии', '', 'Федор Достоевский', current_timestamp, current_timestamp);
insert into ARTICLES (ID, TITLE, SUMMARY, TEXT, AUTHOR, DATE_CREATED, DATE_UPDATED)
values (nextval('ARTICLE_ID_SEQ'), 'Преступление и наказание', 'Рассказ о убийце и его раскаянии', '', 'Федор Достоевский', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);

insert into articles (id, title, summary, text, author, date_created, date_updated)
values (nextval('ARTICLE_ID_SEQ'), 'Келейные письма', 'Сборник писем', '', 'Тихон Задонский', current_timestamp, current_timestamp);
insert into ARTICLES (ID, TITLE, SUMMARY, TEXT, AUTHOR, DATE_CREATED, DATE_UPDATED)
values (nextval('ARTICLE_ID_SEQ'), 'Келейные письма', 'Сборник писем', '', 'Тихон Задонский', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);

insert into articles (id, title, summary, text, author, date_created, date_updated)
values (nextval('ARTICLE_ID_SEQ'), 'Чистый код', 'Книга для каждого программиста', '', 'Роберт Мартин', current_timestamp, current_timestamp);
insert into ARTICLES (ID, TITLE, SUMMARY, TEXT, AUTHOR, DATE_CREATED, DATE_UPDATED)
values (nextval('ARTICLE_ID_SEQ'), 'Чистый код', 'Книга для каждого программиста', '', 'Роберт Мартин', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);

insert into articles (id, title, summary, text, author, date_created, date_updated)
values (nextval('ARTICLE_ID_SEQ'), 'Моя жизнь во Христе', 'Дневниковые записи Иоанна Кронштадтского', '', 'Иоанн Сергиев', current_timestamp, current_timestamp);
insert into ARTICLES (ID, TITLE, SUMMARY, TEXT, AUTHOR, DATE_CREATED, DATE_UPDATED)
values (nextval('ARTICLE_ID_SEQ'), 'Моя жизнь во Христе', 'Дневниковые записи Иоанна Кронштадтского', '', 'Иоанн Сергиев', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);

insert into articles (id, title, summary, text, author, date_created, date_updated)
values (nextval('ARTICLE_ID_SEQ'), 'Слова подвижнические', 'Творения одного из лучших аскетов', '', 'Исаак Сирский', current_timestamp, current_timestamp);
insert into ARTICLES (ID, TITLE, SUMMARY, TEXT, AUTHOR, DATE_CREATED, DATE_UPDATED)
values (nextval('ARTICLE_ID_SEQ'), 'Слова подвижнические', 'Творения одного из лучших аскетов', '', 'Исаак Сирский', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);

insert into articles (id, title, summary, text, author, date_created, date_updated)
values (nextval('ARTICLE_ID_SEQ'), 'Современная практика православного благочестия', 'Руководство к духовной жизни', '', 'Николай Пестов', current_timestamp, current_timestamp);
insert into ARTICLES (ID, TITLE, SUMMARY, TEXT, AUTHOR, DATE_CREATED, DATE_UPDATED)
values (nextval('ARTICLE_ID_SEQ'), 'Современная практика православного благочестия', 'Руководство к духовной жизни', '', 'Николай Пестов', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);

insert into articles (id, title, summary, text, author, date_created, date_updated)
values (nextval('ARTICLE_ID_SEQ'), 'Мучение любви', 'Записки о монашеской жизни', '', 'Архимандрит Лазарь (Абашидзе)', current_timestamp, current_timestamp);
insert into ARTICLES (ID, TITLE, SUMMARY, TEXT, AUTHOR, DATE_CREATED, DATE_UPDATED)
values (nextval('ARTICLE_ID_SEQ'), 'Мучение любви', 'Записки о монашеской жизни', '', 'Архимандрит Лазарь (Абашидзе)', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);

insert into articles (id, title, summary, text, author, date_created, date_updated)
values (nextval('ARTICLE_ID_SEQ'), 'Отечник', 'Выписки из святых отцов', '', 'Игнатий Брянчанинов', current_timestamp, current_timestamp);
insert into ARTICLES (ID, TITLE, SUMMARY, TEXT, AUTHOR, DATE_CREATED, DATE_UPDATED)
values (nextval('ARTICLE_ID_SEQ'), 'Отечник', 'Выписки из святых отцов', '', 'Игнатий Брянчанинов', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);

insert into articles (id, title, summary, text, author, date_created, date_updated)
values (nextval('ARTICLE_ID_SEQ'), 'Душеполезные поучения', 'Азбука духовной жизни', '', 'Авва Дорофей', current_timestamp, current_timestamp);
insert into ARTICLES (ID, TITLE, SUMMARY, TEXT, AUTHOR, DATE_CREATED, DATE_UPDATED)
values (nextval('ARTICLE_ID_SEQ'), 'Душеполезные поучения', 'Азбука духовной жизни', '', 'Авва Дорофей', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

@ContextConfiguration(initializers = IntegrationTestInitializer.class)
@SpringBootTest
class SpringBootTemplateAppTests {
class SpringBootTemplateAppTest {

@Test
void contextLoads() {
Expand Down

0 comments on commit d181623

Please sign in to comment.