Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #54

Merged
merged 126 commits into from
Apr 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
84c2914
fix: config http headers
BettyB979 Nov 6, 2023
33c3758
Merge branch 'main' into config_http_headers
BettyB979 Nov 6, 2023
2b5775a
build: wip: bump to spring boot 3
BettyB979 Nov 10, 2023
4b95df8
Update DefaultSecurityContext.java
BettyB979 Nov 13, 2023
c89adbb
fix: tests
BettyB979 Nov 15, 2023
c31d3c7
refactor: versions in pom
BettyB979 Nov 15, 2023
84a2373
test: add coverage with jacoco
BettyB979 Nov 15, 2023
b3586fb
test: jacoco coverage
BettyB979 Nov 15, 2023
510b895
refactor: public urls
BettyB979 Nov 15, 2023
85c9086
refactor: public urls
BettyB979 Nov 15, 2023
ddb7454
Merge branch 'config_http_headers' of https://github.com/InseeFr/Plat…
BettyB979 Nov 17, 2023
99fd9ae
fix: rollback refactor
BettyB979 Nov 17, 2023
981c995
ci: bump java to 21
BettyB979 Nov 17, 2023
82070e6
refactor: optimize pom, use Slf4j
BettyB979 Nov 22, 2023
530374a
fix: campaign controller test
BettyB979 Nov 22, 2023
1d13e72
refactor: toList
BettyB979 Nov 22, 2023
276974b
refactor: rename User to AuthUser
BettyB979 Nov 22, 2023
121a3af
refactor: check habilitation
BettyB979 Nov 22, 2023
090c270
refactor: user domain
BettyB979 Nov 22, 2023
0215e3f
fix: tests
BettyB979 Nov 22, 2023
8c91c68
refactor: user domain
BettyB979 Nov 22, 2023
26041ca
refator: remove Autowired
BettyB979 Nov 23, 2023
03632ef
ci: add code coverage analysis
BettyB979 Nov 23, 2023
d6717ea
ci: add sonar analysis
BettyB979 Nov 23, 2023
fabeb16
ci: fix conf jacoco
BettyB979 Nov 23, 2023
6e24ebf
ci: add sonar url and organization
BettyB979 Nov 23, 2023
ca97075
ci: delete code ql analysis
BettyB979 Nov 23, 2023
f5a06f4
fix: sonar bugs
BettyB979 Nov 24, 2023
9e50528
test: fix: user test
BettyB979 Nov 24, 2023
bdcf068
fix: sonar bugs
BettyB979 Nov 24, 2023
44b19a1
Update pom.xml
BettyB979 Nov 24, 2023
2f26c14
Update ContactController.java
BettyB979 Nov 24, 2023
458a558
Update Dataloader.java
BettyB979 Nov 24, 2023
fa35d05
refactor: dataloader poc
BettyB979 Nov 27, 2023
00304d6
refactor: dataloaderpoc
BettyB979 Nov 27, 2023
f220b13
refactor: improve exception in user service
BettyB979 Nov 27, 2023
805736d
refactor: add validatoin to contact domain dto
BettyB979 Nov 27, 2023
976fbcf
build: spring boot 3.2.0
BettyB979 Nov 27, 2023
45e9f8f
refactor: validation for contact dto
BettyB979 Nov 27, 2023
b494786
fix: replacer @data lombok with @getter @setter in entities
BettyB979 Dec 4, 2023
02de5b4
refactor: handle exceptions with controller advice
BettyB979 Dec 6, 2023
f18db93
fix: exception handler to get body
BettyB979 Dec 6, 2023
6275ce1
refactor: handle exceptions in controller
BettyB979 Dec 6, 2023
8a65a0d
refactor: contact domain
BettyB979 Dec 6, 2023
2747030
fix: payload for noauth mode
BettyB979 Dec 6, 2023
03e49f2
refactor: contct controllers
BettyB979 Dec 6, 2023
1ff6bf1
refactor: contact controllers
BettyB979 Dec 6, 2023
e23448b
refactor: handle exceptions in controller of matadata domain
BettyB979 Dec 11, 2023
a15d071
fix: cors?
BettyB979 Dec 19, 2023
326d4cb
fix: property in tests
BettyB979 Dec 20, 2023
bf4f843
Merge branch 'main' into upgrade
BettyB979 Dec 20, 2023
a01a764
fix: tests
BettyB979 Dec 20, 2023
0692a11
ci: ci for develop branch
BettyB979 Dec 20, 2023
0a75da6
Merge pull request #41 from InseeFr/upgrade
BettyB979 Dec 20, 2023
146aecd
build: version 1.1.0
BettyB979 Dec 20, 2023
032efa2
Merge pull request #42 from InseeFr/upgrade
BettyB979 Dec 20, 2023
62fed6b
Update ci-rc.yml
BettyB979 Dec 20, 2023
85cad34
Merge pull request #43 from InseeFr/upgrade
BettyB979 Dec 20, 2023
732e713
Update sonar.yml
BettyB979 Dec 20, 2023
40d1cd5
Merge pull request #44 from InseeFr/upgrade
BettyB979 Dec 20, 2023
43d942e
fix: property name
BettyB979 Dec 20, 2023
700b2e7
Merge pull request #45 from InseeFr/upgrade
BettyB979 Dec 20, 2023
5a25baa
build: version 1.1.1
BettyB979 Dec 21, 2023
2f7d339
Merge pull request #46 from InseeFr/upgrade
BettyB979 Dec 21, 2023
e29e284
Update pom.xml
BettyB979 Jan 17, 2024
eb95725
fix: tests (#48)
BettyB979 Jan 17, 2024
3fe50aa
Update pom.xml
BettyB979 Jan 24, 2024
6304112
chore: spring boot 3.2.1 to 3.2.2
BettyB979 Jan 25, 2024
3a5c158
fix: use sequence strategy instead of @GeneratedValue
BettyB979 Feb 7, 2024
ab727a9
Feat/add get surveys endpoint (#49)
EricThuaud Feb 8, 2024
3aca094
modify surveyunits get format
EricThuaud Feb 12, 2024
4cd4d27
Feat searchsurveys campaignspartitioningsbysurvey endpoints (#50)
EricThuaud Feb 13, 2024
12449ac
fix - add types for front to get periodicities and periods
Feb 15, 2024
4fd208c
chore - upgrade version
Feb 15, 2024
087a72d
fix - correct endpoint pathvariable name
Feb 16, 2024
16a8e28
Merge branch 'develop' into use_specific_sequences
BettyB979 Feb 17, 2024
ae7c591
wip: update dataloader to init data
BettyB979 Feb 17, 2024
e452411
Feat improve user model endpoints (#51)
EricThuaud Feb 20, 2024
bfcbef2
fix: add indexes
BettyB979 Feb 21, 2024
a8e4102
feat: dataloader for DV
BettyB979 Feb 21, 2024
7eb7f6f
fix:: add demo profile
BettyB979 Feb 21, 2024
d4281b0
Update DataloaderPoc.java
BettyB979 Feb 21, 2024
fa86b78
Feat add users endpoint without pagination (#52)
EricThuaud Feb 21, 2024
993b724
Update DataloaderPoc.java
BettyB979 Feb 21, 2024
b762de1
Update DataloaderPoc.java
BettyB979 Feb 21, 2024
96a955a
Update DataloaderPoc.java
BettyB979 Feb 21, 2024
a866a4b
Update DataloaderPoc.java
BettyB979 Feb 21, 2024
c6a3dfb
fix: add demo profile to load data on start
BettyB979 Feb 23, 2024
bfc6df7
Merge branch 'develop' into demo_data
BettyB979 Feb 23, 2024
8ec1fc4
Update DataloaderPoc.java
BettyB979 Feb 23, 2024
ee79f59
Update pom.xml
BettyB979 Feb 23, 2024
5b450cc
Merge pull request #53 from InseeFr/demo_data
EricThuaud Feb 23, 2024
ac22520
fix: period and periodicitis en french
BettyB979 Feb 27, 2024
d053dc1
fix: sonar issue
BettyB979 Feb 27, 2024
1530d50
build: version 1.1.12 with spring boot 3.2.3
BettyB979 Feb 27, 2024
1f5a23e
feat: improve search contact endpoint
BettyB979 Feb 28, 2024
074aa1b
feat: improve search contact endpoint
BettyB979 Feb 28, 2024
9226bc9
fix: distinct surveys uits and sources in list
BettyB979 Feb 28, 2024
604b00b
feat: improve search contact endpoint
BettyB979 Feb 28, 2024
b4c3f27
feat: improve get contact accreditations
BettyB979 Feb 28, 2024
c355842
feat: add filter opened partitionings
BettyB979 Feb 28, 2024
649e64b
feat: add questioningId in get contact accreditations
BettyB979 Feb 28, 2024
a07b72e
feat: add endpoint get contacts of a survey unit
BettyB979 Feb 28, 2024
28eda90
feat: add endpoint get contacts of a survey unit
BettyB979 Feb 28, 2024
2f5c3ef
fix: contact accreditations
BettyB979 Mar 4, 2024
26fdb53
Update SearchSurveyUnitController.java
BettyB979 Mar 5, 2024
2c86675
feat: add endpoint search partitionings by survey units
BettyB979 Mar 5, 2024
ee7eb57
feat: add search survey unit
BettyB979 Mar 6, 2024
95e981d
fix: path names
BettyB979 Mar 6, 2024
66e0f40
fix: events for getLastQuestioningEvents
BettyB979 Mar 11, 2024
a1dc36a
Update SurveyUnitPartitioningDto.java
BettyB979 Mar 11, 2024
8e9f22a
fix: search contact (pageNo to page and add city and phone)
BettyB979 Mar 13, 2024
5df0db8
build: version 2.0.0
BettyB979 Mar 13, 2024
2193b06
refactor: search contacts
BettyB979 Mar 14, 2024
80767f2
refactor: search contacts
BettyB979 Mar 14, 2024
393494f
Merge branch 'develop' into contact_endpoints
BettyB979 Mar 14, 2024
5cd4c60
fix: add sort param in search contact
BettyB979 Mar 15, 2024
45e1786
feat: add usual company Name
BettyB979 Mar 15, 2024
08f6100
Merge pull request #55 from InseeFr/contact_endpoints
EricThuaud Mar 18, 2024
c5bbaa2
feat: improve search contacts (add city and function)
BettyB979 Mar 19, 2024
89156c1
fix: search contact by function containing
BettyB979 Mar 19, 2024
1afddd3
Update renovate.json (#57)
BettyB979 Mar 27, 2024
e87ec4a
Merge branch 'main' into develop
BettyB979 Mar 27, 2024
f2df1d3
fix: merge main into develop
BettyB979 Mar 27, 2024
5b86d81
Update Dockerfile (#58)
BettyB979 Apr 4, 2024
5a2a68e
Update pom.xml
BettyB979 Apr 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 89 additions & 0 deletions .github/workflows/ci-rc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
name: ci-rc
on:
push:
branches: [develop]
pull_request:
branches: [develop]
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 21
- name: Build with Maven
run: mvn -B clean package
- name: Upload jar
uses: actions/upload-artifact@v3
with:
name: jar
path: target/*.jar

get_version:
needs: build
if: |
github.event_name == 'push'
runs-on: ubuntu-latest
outputs:
version: ${{steps.version.outputs.version}}
steps:
- name: Checkout current branch
uses: actions/checkout@v3
with:
ref: ${{ github.ref }}
- name: Get current version
id: version
run: echo "version=$(mvn -f pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout)" >> "$GITHUB_OUTPUT"
- run: echo ${{steps.version.outputs.version}}

release:
needs: get_version
runs-on: ubuntu-latest
steps:
- name: Checkout current branch
uses: actions/checkout@v3
with:
ref: ${{ github.ref }}
- uses: softprops/action-gh-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{needs.get_version.outputs.version}}-rc
target_commitish: ${{ github.head_ref || github.ref }}
name: Release ${{needs.get_version.outputs.version}}-rc
draft: false
generate_release_notes: true
prerelease: false


docker:
needs: get_version
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.ref }}
- name: Download jar
id: download
uses: actions/download-artifact@v3
with:
name: jar
path: target
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- uses: docker/build-push-action@v4
with:
platforms: linux/amd64,linux/arm64
context: .
push: true
tags: |
inseefr/platine-management-back-office:${{ needs.get_version.outputs.version }}-rc
inseefr/platine-management-back-office:latest
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 17
java-version: 21
- name: Build with Maven
run: mvn -B clean package
- name: Upload jar
Expand Down
76 changes: 0 additions & 76 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

39 changes: 39 additions & 0 deletions .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Sonar Analysis

on:
push:
branches:
- main
- develop
pull_request:
types: [opened, synchronize, reopened]
jobs:
build:
name: Build and analyze
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
java-version: 21
distribution: 'temurin'
- name: Cache SonarCloud packages
uses: actions/cache@v3
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Maven packages
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn clean verify -Pcoverage sonar:sonar -Dsonar.projectKey=InseeFr_Platine-Management-Back-Office --no-transfer-progress
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
*.log.*

### STS ###
.apt_generated
Expand Down
19 changes: 14 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
FROM eclipse-temurin:17.0.7_7-jre
WORKDIR /application
RUN rm -rf /application
ADD target/*.jar /application/app.jar
ENTRYPOINT ["java", "-jar", "/application/app.jar"]
FROM eclipse-temurin:21.0.2_13-jre-alpine

WORKDIR /opt/app/
COPY ./target/*.jar /opt/app/app.jar

# Setup a non-root user context (security)
RUN addgroup -g 1000 tomcatgroup
RUN adduser -D -s / -u 1000 tomcatuser -G tomcatgroup
RUN mkdir /opt/app/temp-files
RUN chown -R 1000:1000 /opt/app

USER 1000

ENTRYPOINT ["java", "-jar", "/opt/app/app.jar"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ REST API for communication between DB and Platine-Management UI and Platine-My-S

For building and running the application you need:

- JDK 11
- JDK 21
- Maven 3

## Install and excute unit tests
Expand Down
Loading
Loading