Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
templateService
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Bazarbay Tulenov
templateService
Commits
6dd750a8
Commit
6dd750a8
authored
Dec 26, 2023
by
Bazarbay Tulenov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
commit add cors filter
parent
f2b61cc8
Pipeline
#335
failed with stage
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
6 deletions
+24
-6
src/main/java/kz/project/printedFormsService/config/AppConfig.java
...java/kz/project/printedFormsService/config/AppConfig.java
+17
-0
src/main/java/kz/project/printedFormsService/data/entity/DocumentEntity.java
...oject/printedFormsService/data/entity/DocumentEntity.java
+1
-1
src/main/java/kz/project/printedFormsService/service/impl/DocumentsServiceImpl.java
...rintedFormsService/service/impl/DocumentsServiceImpl.java
+6
-3
src/main/java/kz/project/printedFormsService/service/impl/TemplateServiceImpl.java
...printedFormsService/service/impl/TemplateServiceImpl.java
+0
-2
No files found.
src/main/java/kz/project/printedFormsService/config/AppConfig.java
View file @
6dd750a8
package
kz.project.printedFormsService.config
;
import
org.springframework.amqp.core.AmqpTemplate
;
import
org.springframework.amqp.rabbit.connection.ConnectionFactory
;
import
org.springframework.amqp.rabbit.core.RabbitTemplate
;
import
org.springframework.amqp.support.converter.Jackson2JsonMessageConverter
;
import
org.springframework.amqp.support.converter.MessageConverter
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.web.cors.CorsConfiguration
;
...
...
@@ -24,4 +29,16 @@ public class AppConfig implements WebMvcConfigurer {
corsConfiguration
.
addAllowedHeader
(
"*"
);
return
corsConfiguration
;
}
@Bean
public
MessageConverter
messageConverter
(){
return
new
Jackson2JsonMessageConverter
();
}
@Bean
public
AmqpTemplate
amqpTemplate
(
ConnectionFactory
connectionFactory
){
RabbitTemplate
rabbitTemplate
=
new
RabbitTemplate
(
connectionFactory
);
rabbitTemplate
.
setMessageConverter
(
messageConverter
());
return
rabbitTemplate
;
}
}
src/main/java/kz/project/printedFormsService/data/entity/DocumentEntity.java
View file @
6dd750a8
...
...
@@ -21,7 +21,7 @@ public class DocumentEntity {
private
Long
id
;
@ManyToOne
@JoinColumn
(
name
=
"template_id"
,
referencedColumnName
=
"template_id"
,
insertable
=
false
,
updatable
=
false
)
@JoinColumn
(
name
=
"template_id"
)
private
TemplateEntity
template
;
@CreationTimestamp
...
...
src/main/java/kz/project/printedFormsService/service/impl/DocumentsServiceImpl.java
View file @
6dd750a8
...
...
@@ -7,6 +7,7 @@ import kz.project.printedFormsService.data.dto.DocumentByTemplateDto;
import
kz.project.printedFormsService.data.entity.DocumentEntity
;
import
kz.project.printedFormsService.data.entity.TemplateEntity
;
import
kz.project.printedFormsService.data.repository.DocumentJdbcRepository
;
import
kz.project.printedFormsService.data.repository.DocumentRepository
;
import
kz.project.printedFormsService.data.repository.TemplateRepository
;
import
kz.project.printedFormsService.exception.ValidationException
;
import
kz.project.printedFormsService.service.DocumentsService
;
...
...
@@ -14,6 +15,7 @@ import kz.project.printedFormsService.service.TemplateService;
import
lombok.RequiredArgsConstructor
;
import
org.jetbrains.annotations.NotNull
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
...
...
@@ -26,6 +28,7 @@ public class DocumentsServiceImpl implements DocumentsService {
private
final
DocumentJdbcRepository
documentJdbcRepository
;
private
final
TemplateService
templateService
;
private
final
DocumentRepository
documentRepository
;
@Override
public
@NotNull
DocumentByDateDto
getDocumentCountsByDate
(
@NotNull
LocalDate
startDate
,
@NotNull
LocalDate
endDate
,
@NotNull
Set
<
String
>
projects
)
{
...
...
@@ -68,15 +71,15 @@ public class DocumentsServiceImpl implements DocumentsService {
.
build
()
);
}
@Transactional
@Override
public
void
saveDocument
(
Long
templateId
)
throws
ValidationException
,
JsonProcessingException
{
DocumentEntity
documentEntity
=
new
DocumentEntity
();
TemplateEntity
templateEntity
=
templateService
.
getTemplateEntity
(
templateId
);
DocumentEntity
documentEntity
=
new
DocumentEntity
();
documentEntity
.
setTemplate
(
templateEntity
);
documentEntity
.
setProject
(
templateEntity
.
getProject
());
documentEntity
.
setCreatedAt
(
LocalDateTime
.
now
());
document
JdbcRepository
.
saveDocument
(
documentEntity
);
document
Repository
.
save
(
documentEntity
);
}
...
...
src/main/java/kz/project/printedFormsService/service/impl/TemplateServiceImpl.java
View file @
6dd750a8
...
...
@@ -5,7 +5,6 @@ import kz.project.printedFormsService.data.dto.TemplateDataForReportDto;
import
kz.project.printedFormsService.data.dto.TemplateDto
;
import
kz.project.printedFormsService.data.dto.TemplateResponseDto
;
import
kz.project.printedFormsService.data.dto.TemplateShortDto
;
import
kz.project.printedFormsService.data.entity.DocumentEntity
;
import
kz.project.printedFormsService.data.entity.TemplateEntity
;
import
kz.project.printedFormsService.data.entity.TemplateFileInfoEntity
;
import
kz.project.printedFormsService.data.repository.DTemplateTypeRepository
;
...
...
@@ -23,7 +22,6 @@ import org.springframework.web.multipart.MultipartFile;
import
java.io.IOException
;
import
java.nio.charset.StandardCharsets
;
import
java.time.LocalDateTime
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment