Skip to content

Commit

Permalink
♻️ (org): Rename service to org
Browse files Browse the repository at this point in the history
  • Loading branch information
d135-1r43 committed Sep 8, 2024
1 parent 8f36b0d commit c591d74
Show file tree
Hide file tree
Showing 41 changed files with 62 additions and 63 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ on:
tags: [ 'verein-*.*.*' ]

env:
BASE_IMAGE_NAME: ghcr.io/hopps-app/hopps/vereine
BASE_IMAGE_NAME: ghcr.io/hopps-app/hopps/org

# prefix which needs to be in front of version tags
VERSION_TAG_PREFIX: 'verein-'
VERSION_TAG_PREFIX: 'org-'

jobs:
build-code-and-container:
Expand Down Expand Up @@ -56,6 +56,6 @@ jobs:
uses: docker/build-push-action@v6
with:
context: backend/app.hopps.vereine
file: backend/app.hopps.vereine/src/main/docker/Dockerfile.jvm
file: backend/app.hopps.org/src/main/docker/Dockerfile.jvm
push: true
tags: ${{ steps.meta.outputs.tags }} # tags from the docker/metadata-action
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<modelVersion>4.0.0</modelVersion>

<groupId>app.hopps</groupId>
<artifactId>vereine</artifactId>
<artifactId>org</artifactId>
<version>1.0.0-SNAPSHOT</version>

<name>Vereine</name>
<description>Microservice für Vereine und deren Mitglieder</description>
<description>Microservice for Organizations and their Members</description>

<properties>
<maven.compiler.release>21</maven.compiler.release>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package app.hopps.vereine.delegates;
package app.hopps.org.delegates;

import app.hopps.vereine.jpa.Member;
import app.hopps.org.jpa.Member;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.Response;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package app.hopps.vereine.delegates;
package app.hopps.org.delegates;

import app.hopps.vereine.jpa.Member;
import app.hopps.vereine.jpa.MemberRespository;
import app.hopps.vereine.jpa.Organization;
import app.hopps.vereine.jpa.OrganizationRepository;
import app.hopps.vereine.validation.NonUniqueConstraintViolation;
import app.hopps.org.jpa.Member;
import app.hopps.org.jpa.MemberRespository;
import app.hopps.org.jpa.Organization;
import app.hopps.org.jpa.OrganizationRepository;
import app.hopps.org.validation.NonUniqueConstraintViolation;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.validation.ConstraintViolation;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package app.hopps.vereine.delegates;
package app.hopps.org.delegates;

import jakarta.enterprise.context.ApplicationScoped;
import org.slf4j.LoggerFactory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package app.hopps.vereine.jpa;
package app.hopps.org.jpa;

import jakarta.persistence.Embeddable;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package app.hopps.vereine.jpa;
package app.hopps.org.jpa;

import io.quarkus.hibernate.orm.panache.PanacheEntity;
import jakarta.persistence.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package app.hopps.vereine.jpa;
package app.hopps.org.jpa;

import io.quarkus.hibernate.orm.panache.PanacheRepository;
import jakarta.enterprise.context.ApplicationScoped;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package app.hopps.vereine.jpa;
package app.hopps.org.jpa;

import io.quarkus.hibernate.orm.panache.PanacheEntity;
import jakarta.persistence.CascadeType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package app.hopps.vereine.jpa;
package app.hopps.org.jpa;

import io.quarkus.hibernate.orm.panache.PanacheRepository;
import jakarta.enterprise.context.ApplicationScoped;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package app.hopps.vereine.rest;
package app.hopps.org.rest;

import app.hopps.vereine.jpa.Member;
import app.hopps.vereine.rest.RestValidator.ValidationResult;
import app.hopps.org.jpa.Member;
import app.hopps.org.rest.RestValidator.ValidationResult;
import jakarta.inject.Inject;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Validator;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package app.hopps.vereine.rest;
package app.hopps.org.rest;

import app.hopps.vereine.jpa.Organization;
import app.hopps.vereine.rest.RestValidator.ValidationResult;
import app.hopps.org.jpa.Organization;
import app.hopps.org.rest.RestValidator.ValidationResult;
import jakarta.inject.Inject;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Validator;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package app.hopps.vereine.rest;
package app.hopps.org.rest;

import jakarta.annotation.Nonnull;
import jakarta.validation.ConstraintViolation;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package app.hopps.vereine.validation;
package app.hopps.org.validation;

import java.util.Collections;
import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package app.hopps.vereine.bpmn;
package app.hopps.org.bpmn;

import jakarta.enterprise.context.ApplicationScoped;
import org.kie.api.event.process.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package app.hopps.vereine.bpmn;
package app.hopps.org.bpmn;

import app.hopps.vereine.jpa.Member;
import app.hopps.vereine.jpa.Organization;
import app.hopps.org.jpa.Member;
import app.hopps.org.jpa.Organization;
import io.quarkus.test.junit.QuarkusTest;
import jakarta.inject.Inject;
import jakarta.inject.Named;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package app.hopps.vereine.bpmn;
package app.hopps.org.bpmn;

import app.hopps.vereine.delegates.CreationValidationDelegate;
import app.hopps.vereine.jpa.Member;
import app.hopps.vereine.jpa.Organization;
import app.hopps.org.delegates.CreationValidationDelegate;
import app.hopps.org.jpa.Member;
import app.hopps.org.jpa.Organization;
import io.quarkus.test.InjectMock;
import io.quarkus.test.junit.QuarkusTest;
import jakarta.inject.Inject;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package app.hopps.vereine.delegates;
package app.hopps.org.delegates;

import app.hopps.vereine.jpa.Member;
import app.hopps.org.jpa.Member;
import io.quarkus.test.junit.QuarkusTest;
import jakarta.inject.Inject;
import jakarta.ws.rs.core.Response;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package app.hopps.vereine.delegates;

import app.hopps.vereine.jpa.Member;
import app.hopps.vereine.jpa.MemberRespository;
import app.hopps.vereine.jpa.Organization;
import app.hopps.vereine.jpa.OrganizationRepository;
import app.hopps.vereine.validation.NonUniqueConstraintViolation;
import app.hopps.vereine.validation.NonUniqueConstraintViolation.NonUniqueConstraintViolationException;
package app.hopps.org.delegates;

import app.hopps.org.jpa.Member;
import app.hopps.org.jpa.MemberRespository;
import app.hopps.org.jpa.Organization;
import app.hopps.org.jpa.OrganizationRepository;
import app.hopps.org.validation.NonUniqueConstraintViolation;
import app.hopps.org.validation.NonUniqueConstraintViolation.NonUniqueConstraintViolationException;
import io.quarkus.narayana.jta.QuarkusTransaction;
import io.quarkus.test.junit.QuarkusTest;
import jakarta.inject.Inject;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package app.hopps.vereine.jpa;
package app.hopps.org.jpa;

import io.quarkus.test.junit.QuarkusTest;
import jakarta.inject.Inject;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package app.hopps.vereine.jpa;
package app.hopps.org.jpa;

import io.quarkus.narayana.jta.QuarkusTransaction;
import io.quarkus.narayana.jta.QuarkusTransactionException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package app.hopps.vereine.rest;
package app.hopps.org.rest;

import app.hopps.vereine.jpa.Member;
import app.hopps.org.jpa.Member;
import io.quarkus.test.common.http.TestHTTPEndpoint;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package app.hopps.vereine.rest;
package app.hopps.org.rest;

import io.quarkus.test.junit.QuarkusIntegrationTest;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package app.hopps.vereine.rest;
package app.hopps.org.rest;

import app.hopps.vereine.jpa.Organization;
import app.hopps.org.jpa.Organization;
import io.quarkus.test.common.http.TestHTTPEndpoint;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package app.hopps.vereine.rest;
package app.hopps.org.rest;

import io.quarkus.test.junit.QuarkusIntegrationTest;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package app.hopps.vereine.rest;
package app.hopps.org.rest;

import app.hopps.vereine.jpa.Organization;
import app.hopps.vereine.rest.RestValidator.ValidationResult;
import app.hopps.vereine.rest.RestValidator.Violation;
import app.hopps.org.jpa.Organization;
import app.hopps.org.rest.RestValidator.ValidationResult;
import app.hopps.org.rest.RestValidator.Violation;
import io.quarkus.test.junit.QuarkusTest;
import jakarta.inject.Inject;
import jakarta.validation.Validator;
import org.instancio.Instancio;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

import static app.hopps.vereine.rest.RestValidator.ValidationResult.Validity.INVALID;
import static app.hopps.vereine.rest.RestValidator.ValidationResult.Validity.VALID;
import static app.hopps.org.rest.RestValidator.ValidationResult.Validity.INVALID;
import static app.hopps.org.rest.RestValidator.ValidationResult.Validity.VALID;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.collection.IsIterableWithSize.iterableWithSize;
import static org.junit.jupiter.api.Assertions.assertEquals;
Expand Down
7 changes: 3 additions & 4 deletions backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
<packaging>pom</packaging>

<name>Hopps</name>
<description>Hopps wird eine cloudbasierte Open Source Buchhaltungssoftware mit AI, damit Vereine mehr Zeit für ihre
wesentlichen Ziele und Angebote haben und frustrierte Situationen mit der Buchhaltung der Vergangenheit
angehören.
<description>Hopps will be a cloud-based open-source accounting software with AI, so that clubs have more time for
their essential goals and offerings, and frustrating situations with accounting are a thing of the past.
</description>

<organization>
Expand Down Expand Up @@ -40,6 +39,6 @@
</licenses>

<modules>
<module>app.hopps.vereine</module>
<module>app.hopps.org</module>
</modules>
</project>

0 comments on commit c591d74

Please sign in to comment.