work in progres

.github/workflows/CD.yaml

@@ -1,114 +1,114 @@
-name: CD
-
-on:
-  push:
-    branches:
-      - CT-1305
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  build-and-push:
-    name: Build and push Docker image
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    outputs:
-      tags: ${{ steps.meta.outputs.tags }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        uses: docker/metadata-action@v5
-        id: meta
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: type=sha,enable=true,priority=100,prefix=shaF-,suffix=,format=short
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  deploy-to-aks:
-    name: deploy for ${{ matrix.org }} to ${{ matrix.cluster }}
-    runs-on: ubuntu-latest
-    needs: build-and-push
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      matrix:
-        org:
-          - fintlabs-no
-#          - rogfk-no
-#          - viken-no
-#          - visma-com
-        cluster:
-#          - aks-alpha-fint-2021-11-18
-          - aks-beta-fint-2021-11-23
-#          - aks-api-fint-2022-02-08
-#          - aks-pwf-fint-2021-10-20
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Get environment
-        uses: actions/github-script@v6
-        id: environment
-        with:
-          script: return '${{ matrix.cluster }}'.split('-')[1]
-          result-encoding: string
-
-      - name: Get resource group name
-        uses: actions/github-script@v6
-        id: resource-group
-        with:
-          script: return 'rg-aks-${{ steps.environment.outputs.result }}'
-          result-encoding: string
-
-      - name: Bake manifests with Kustomize
-        id: bake
-        uses: azure/k8s-bake@v2
-        with:
-          renderEngine: 'kustomize'
-          kustomizationPath: 'kustomize/overlays/${{ steps.environment.outputs.result }}/${{ matrix.org }}'
-
-      - uses: azure/login@v1
-        with:
-          creds: "${{ secrets[format('AKS_{0}_FINT_GITHUB', steps.environment.outputs.result)] }}"
-
-      - uses: azure/use-kubelogin@v1.1
-        with:
-          kubelogin-version: 'v0.0.26'
-
-      - name: Set the target cluster
-        uses: azure/aks-set-context@v3
-        with:
-          cluster-name: '${{ matrix.cluster }}'
-          resource-group: '${{ steps.resource-group.outputs.result }}'
-          admin: 'true'
-          use-kubelogin: 'true'
-
-      - name: Deploy
-        uses: azure/k8s-deploy@v4.9
-        with:
-          action: deploy
-          manifests: ${{ steps.bake.outputs.manifestsBundle }}
-          images: ${{ needs.build-and-push.outputs.tags }}
-          namespace: ${{ matrix.org }}
+#name: CD
+#
+#on:
+#  push:
+#    branches:
+#      - CT-1305
+#
+#env:
+#  REGISTRY: ghcr.io
+#  IMAGE_NAME: ${{ github.repository }}
+#
+#jobs:
+#  build-and-push:
+#    name: Build and push Docker image
+#    runs-on: ubuntu-latest
+#    permissions:
+#      contents: read
+#      packages: write
+#    outputs:
+#      tags: ${{ steps.meta.outputs.tags }}
+#    steps:
+#      - name: Checkout repository
+#        uses: actions/checkout@v4
+#
+#      - name: Login to Docker Hub
+#        uses: docker/login-action@v3
+#        with:
+#          registry: ${{ env.REGISTRY }}
+#          username: ${{ github.actor }}
+#          password: ${{ secrets.GITHUB_TOKEN }}
+#
+#      - name: Extract metadata (tags, labels) for Docker
+#        uses: docker/metadata-action@v5
+#        id: meta
+#        with:
+#          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+#          tags: type=sha,enable=true,priority=100,prefix=shaF-,suffix=,format=short
+#
+#      - name: Build and push Docker image
+#        uses: docker/build-push-action@v4
+#        with:
+#          context: .
+#          push: true
+#          tags: ${{ steps.meta.outputs.tags }}
+#          labels: ${{ steps.meta.outputs.labels }}
+#
+#  deploy-to-aks:
+#    name: deploy for ${{ matrix.org }} to ${{ matrix.cluster }}
+#    runs-on: ubuntu-latest
+#    needs: build-and-push
+#    permissions:
+#      contents: read
+#      packages: write
+#    strategy:
+#      matrix:
+#        org:
+#          - fintlabs-no
+##          - rogfk-no
+##          - viken-no
+##          - visma-com
+#        cluster:
+##          - aks-alpha-fint-2021-11-18
+#          - aks-beta-fint-2021-11-23
+##          - aks-api-fint-2022-02-08
+##          - aks-pwf-fint-2021-10-20
+#
+#    steps:
+#      - name: Checkout repository
+#        uses: actions/checkout@v4
+#
+#      - name: Get environment
+#        uses: actions/github-script@v6
+#        id: environment
+#        with:
+#          script: return '${{ matrix.cluster }}'.split('-')[1]
+#          result-encoding: string
+#
+#      - name: Get resource group name
+#        uses: actions/github-script@v6
+#        id: resource-group
+#        with:
+#          script: return 'rg-aks-${{ steps.environment.outputs.result }}'
+#          result-encoding: string
+#
+#      - name: Bake manifests with Kustomize
+#        id: bake
+#        uses: azure/k8s-bake@v2
+#        with:
+#          renderEngine: 'kustomize'
+#          kustomizationPath: 'kustomize/overlays/${{ steps.environment.outputs.result }}/${{ matrix.org }}'
+#
+#      - uses: azure/login@v1
+#        with:
+#          creds: "${{ secrets[format('AKS_{0}_FINT_GITHUB', steps.environment.outputs.result)] }}"
+#
+#      - uses: azure/use-kubelogin@v1.1
+#        with:
+#          kubelogin-version: 'v0.0.26'
+#
+#      - name: Set the target cluster
+#        uses: azure/aks-set-context@v3
+#        with:
+#          cluster-name: '${{ matrix.cluster }}'
+#          resource-group: '${{ steps.resource-group.outputs.result }}'
+#          admin: 'true'
+#          use-kubelogin: 'true'
+#
+#      - name: Deploy
+#        uses: azure/k8s-deploy@v4.9
+#        with:
+#          action: deploy
+#          manifests: ${{ steps.bake.outputs.manifestsBundle }}
+#          images: ${{ needs.build-and-push.outputs.tags }}
+#          namespace: ${{ matrix.org }}

.github/workflows/CI.yaml

@@ -1,51 +1,51 @@
-name: CI
-
-on:
-  push:
-    branches:
-    - CT-1305
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@main
-
-      - name: Get repo name
-        id: get_repo
-        run: echo ::set-output name=REPO::${GITHUB_REPOSITORY#*/}
-
-      - name: Setup Java 17
-        uses: actions/setup-java@v3.12.0
-        with:
-          distribution: 'adopt'
-          java-version: '17'
-
-      - name: Gradle Wrapper Validation
-        uses: gradle/wrapper-validation-action@v1.1.0
-
-      - name: Gradle Setup
-        uses: gradle/gradle-build-action@v2.8.0
-        with:
-          gradle-version: wrapper
-
-      - name: Gradle build
-        run: |
-          ./gradlew build
-          mkdir data
-          cp ./build/libs/${GITHUB_REPOSITORY#*/}-*.jar ./data/app.jar
-
-      - name: Upload Build Artifact
-        uses: actions/upload-artifact@v3.1.3
-        with:
-          name: ${{steps.get_repo.outputs.REPO}}
-          path: ./data/app.jar
-
-#      - name: Trigger CD
-#        if: github.ref == 'refs/heads/CT-1305'
-#        uses: peter-evans/repository-dispatch@v2
+#name: CI
+#
+#on:
+#  push:
+#    branches:
+#    - CT-1305
+#
+#jobs:
+#  build:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Checkout repository
+#        uses: actions/checkout@main
+#
+#      - name: Get repo name
+#        id: get_repo
+#        run: echo ::set-output name=REPO::${GITHUB_REPOSITORY#*/}
+#
+#      - name: Setup Java 17
+#        uses: actions/setup-java@v3.12.0
 #        with:
-#          token: ${{ secrets.GITHUBACTION_TOKEN }}
-#          repository: ${{ github.repository }}
-#          event-type: trigger-cd
+#          distribution: 'adopt'
+#          java-version: '17'
+#
+#      - name: Gradle Wrapper Validation
+#        uses: gradle/wrapper-validation-action@v1.1.0
+#
+#      - name: Gradle Setup
+#        uses: gradle/gradle-build-action@v2.8.0
+#        with:
+#          gradle-version: wrapper
+#
+#      - name: Gradle build
+#        run: |
+#          ./gradlew build
+#          mkdir data
+#          cp ./build/libs/${GITHUB_REPOSITORY#*/}-*.jar ./data/app.jar
+#
+#      - name: Upload Build Artifact
+#        uses: actions/upload-artifact@v3.1.3
+#        with:
+#          name: ${{steps.get_repo.outputs.REPO}}
+#          path: ./data/app.jar
+#
+##      - name: Trigger CD
+##        if: github.ref == 'refs/heads/CT-1305'
+##        uses: peter-evans/repository-dispatch@v2
+##        with:
+##          token: ${{ secrets.GITHUBACTION_TOKEN }}
+##          repository: ${{ github.repository }}
+##          event-type: trigger-cd

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version '2.7.11'
+    id 'org.springframework.boot' version '2.7.12'
     id 'io.spring.dependency-management' version '1.1.0'
     id 'java'
     id 'groovy'
@@ -37,18 +37,17 @@ dependencies {
     implementation 'io.netty:netty-resolver-dns-native-macos:4.1.86.Final:osx-aarch_64'
 
     implementation 'no.fintlabs:fint-core-infra-models:1.1.1'
-    implementation 'no.fintlabs:fint-core-adapter-common:0.1.2'
+    implementation 'no.fintlabs:fint-core-adapter-common:0.1.3-rc-1'
     implementation "no.fint:fint-personvern-resource-model-java:${apiVersion}"
     implementation "no.fint:fint-felles-resource-model-java:${apiVersion}"
     implementation 'no.fint:fint-event-model:3.0.2'
     implementation 'no.fint:fint-model-resource:0.4.1'
     implementation 'no.fintlabs:fint-metamodell-model-java:1.1.0'
 
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.postgresql:postgresql'
 
-    //org.springframework.data.jpa
 
-    implementation 'org.springframework.data:spring-data-commons'
 
     runtimeOnly 'org.springframework.boot:spring-boot-actuator'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'

docker-compose.yaml

@@ -0,0 +1,25 @@
+version: '3.7'
+services:
+  db:
+    image: postgres:14.10
+    restart: always
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=fint-personvern-kodeverk-adapter
+    ports:
+      - '5432:5432'
+    volumes:
+      - ~/.db-data/:/var/lib/postgresql/data
+  pgadmin:
+    container_name: fint-personvern-kodeverk-adapter
+    image: dpage/pgadmin4
+    restart: always
+    environment:
+      PGADMIN_DEFAULT_EMAIL: admin@admin.com
+      PGADMIN_DEFAULT_PASSWORD: root
+    ports:
+      - "5050:80"
+volumes:
+  db:
+    driver: local

src/main/java/no/fintlabs/model/personopplysning/PersonopplysningJpaRepository.java

@@ -0,0 +1,9 @@
+package no.fintlabs.model.personopplysning;
+
+import no.fintlabs.model.personopplysning.model.PersonopplysningEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PersonopplysningJpaRepository extends JpaRepository<PersonopplysningEntity, String> {
+}