Aux data #21

Puckoland · 2023-05-19T14:08:35Z

No description provided.

Medzikarp · 2023-06-07T18:31:19Z

...er/src/main/java/cz/cesnet/shongo/controller/booking/request/AbstractReservationRequest.java

+    @Type(type = "jsonb")
+    @Column(name = "aux_data", columnDefinition = "text")
+    public String getAuxData()


Máš to ako string. Na string nepotrebuješ jsonb. Ten využiješ keby si mal JsonNode, alebo List, a iné.
Naviac tam máš aj columDefinition z JPA a aj hibernatí @Type. :)

Jo a miesto toho možeš použiť DB agnostic @Clob od JPA. Ten by mal fungovať dobre s TEXT type v Postgresql.

Ako String to je iba kvoli tomu, ze API malo s JsonNode problemy (v DB je to skutocne jsonb). Preto tam musi byt aj @Type. Zatial som to teda urobil, ze entita ma JsonNode, API ma String a prevadza sa to v ramci fromApi()/toApi().

Ok, tak aspoň odstrániť ten columnDefinition = "text".

Ten tam zase musi byt kvoli testom, pretoze HSQLDB nema jsonb.

Medzikarp · 2023-06-07T18:32:07Z

shongo-controller/src/main/java/cz/cesnet/shongo/controller/booking/resource/Tag.java

+    @Type(type = "jsonb")
+    @Column(columnDefinition = "text")
+    public String getData()


Rovnaký problém ako u auxData.

Medzikarp · 2023-06-07T18:35:56Z

shongo-controller/src/main/java/cz/cesnet/shongo/controller/booking/resource/Tag.java

        this.name = name;
    }

+    @Type(type = "pgsql_enum")


Bude stačiť @Enumerated(EnumType.STRING) a @Column od JPA na definovanie typu.
Ten @Type(type = "pgsql_enum") je hibernatí duplicita.

Bolo to potrebne ked som vytvaral enum aj v postgrese. Ale pre konzistenciu som to zmenil a odstranil.

Medzikarp · 2023-07-25T15:18:32Z

...troller/src/main/java/cz/cesnet/shongo/controller/booking/request/auxdata/AuxDataFilter.java

+    public static Builder builder()
+    {
+        return new Builder();
+    }
+
+    public String getTagName()
+    {
+        return tagName;
+    }
+
+    public TagType getTagType()
+    {
+        return tagType;
+    }
+
+    public Boolean isEnabled()
+    {
+        return enabled;
+    }
+
+    public static class Builder
+    {
+
+        private String tagName;
+        private TagType tagType;
+        private boolean enabled;
+
+        private Builder()
+        {
+        }
+
+        public Builder tagName(String tagName)
+        {
+            this.tagName = tagName;
+            return this;
+        }
+
+        public Builder tagType(TagType tagType)
+        {
+            this.tagType = tagType;
+            return this;
+        }
+
+        public Builder enabled(boolean enabled)
+        {
+            this.enabled = enabled;
+            return this;
+        }
+
+        public AuxDataFilter build()
+        {
+            return new AuxDataFilter(tagName, tagType, enabled);
+        }
+    }
+}


Toto sa dá celkom dobre skomprimovať. https://projectlombok.org/features/Builder

O tom viem, akurat v momentalnej verzii shonga lombok nie je...
Aj tak som ho ale pridaval pri implementacii REST API, cize ho asi mozem pridat aj tu.

Medzikarp · 2023-09-29T09:46:44Z

Pls nepoužívaj git push -f :) Aspoň nie kým nie je pull request resolved.

Medzikarp · 2023-09-29T09:50:48Z

...main/java/cz/cesnet/shongo/controller/booking/request/AbstractReservationRequestAuxData.java

+@Setter
+@Entity
+@Immutable
+@Table(name = "arr_aux_data")


Tu vytváraš tabuľku v DB s názvom arr_aux_data, ale zároveň v init.sql vytváraš view s rovnakým názvom. Ten view je zdá sa mi už len zabudnutý pozostatok na zmazanie?

arr_aux_data ma skutocne byt view (ktory jednoducho mapuje aux_data na jednotlive fieldy, aby som to nemusel robit v jave). V init.sql ho definujem a entita je potom vytvorena na pracu s nim.

Nejak nikde nevidím kde sa ten view používa. A mal by sa volať nejak inak ako tá entita.
Snažím sa rozbehnúť projekt lokálne a dostávam potom error pri inicializácii že entita už existuje:
Exception in thread "main" javax.persistence.PersistenceException: org.hibernate.exception.SQLGrammarException: could not execute statement at org.hibernate.internal.ExceptionConverterImpl.convert(ExceptionConverterImpl.java:154) at org.hibernate.internal.ExceptionConverterImpl.convert(ExceptionConverterImpl.java:181) at org.hibernate.query.internal.AbstractProducedQuery.executeUpdate(AbstractProducedQuery.java:1614) at cz.cesnet.shongo.controller.util.NativeQuery.executeNativeUpdate(NativeQuery.java:275) at cz.cesnet.shongo.controller.Controller.initializeDatabase(Controller.java:945) at cz.cesnet.shongo.controller.Controller.main(Controller.java:1081) Caused by: org.hibernate.exception.SQLGrammarException: could not execute statement at org.hibernate.exception.internal.SQLStateConversionDelegate.convert(SQLStateConversionDelegate.java:103) at org.hibernate.exception.internal.StandardSQLExceptionConverter.convert(StandardSQLExceptionConverter.java:42) at org.hibernate.engine.jdbc.spi.SqlExceptionHelper.convert(SqlExceptionHelper.java:113) at org.hibernate.engine.jdbc.spi.SqlExceptionHelper.convert(SqlExceptionHelper.java:99) at org.hibernate.engine.jdbc.internal.ResultSetReturnImpl.executeUpdate(ResultSetReturnImpl.java:200) at org.hibernate.engine.query.spi.NativeSQLQueryPlan.performExecuteUpdate(NativeSQLQueryPlan.java:107) at org.hibernate.internal.SessionImpl.executeNativeUpdate(SessionImpl.java:1491) at org.hibernate.query.internal.NativeQueryImpl.doExecuteUpdate(NativeQueryImpl.java:295) at org.hibernate.query.internal.AbstractProducedQuery.executeUpdate(AbstractProducedQuery.java:1605) ... 3 more Caused by: org.postgresql.util.PSQLException: ERROR: "arr_aux_data" is not a view

Pouziva sa v ReservationRequestManager ako nahrada AuxDataService, ktora sa ti predtym nepozdavala:

private List<AuxDataMerged> getAuxData(AbstractReservationRequest reservationRequest, AuxDataFilter filter) { String queryString = "SELECT arr.tagName, rt.tag.type, arr.enabled, arr.data, rt.tag.data" + " FROM AbstractReservationRequestAuxData arr" + " JOIN ResourceSpecification res_spec ON res_spec.id = arr.specification.id" + " JOIN ResourceTag rt ON rt.resource.id = res_spec.resource.id" + " WHERE rt.tag.name = arr.tagName" + " AND arr.id = :id"; .... }

Ten error vyskakuje preto, ze najprv sa vytvori table kvoli JPA az potom sa zavola init.sql kde sa vytvara ten view.
Pridaval som to kvoli tomu aj do migration, ale zabudol som to pushnut, moja chyba.

Medzikarp · 2023-09-29T10:01:10Z

...main/java/cz/cesnet/shongo/controller/booking/request/AbstractReservationRequestAuxData.java

+@Setter
+@Entity
+@Immutable


@immutable (ktorý je mimochodom od Hibernate) a @Setter nad jedným POJO nedáva zmysel.
Najvačší zmysel mi dáva pridávať k všetkým @entity
@DaTa (namiesto @Getter a @Setter)
@NoArgsConstructor (potrebný pre Hibernate)

@Immutable sa pouziva, pretoze je to entita k viewu. Je ale pravda, ze @Setter nedava zmysel.

Puckoland self-assigned this May 19, 2023

Medzikarp reviewed Jun 7, 2023

View reviewed changes

Puckoland force-pushed the auxData branch 2 times, most recently from 002cb71 to 4e81e85 Compare July 10, 2023 22:10

Puckoland added 6 commits July 11, 2023 23:12

[controller] tag can now hold additional data

4fdfb66

[controller] add auxData to reservation request

b7f30c4

[controller] add aux_data to reservation_request_summary

5e983cf

[controller] add new tag data to reservation request summary

8e94a32

email notifications from tags

91f2e4f

change Tag.data type to JsonNode

b6755ff

Puckoland force-pushed the auxData branch from 4e81e85 to b6755ff Compare July 11, 2023 21:33

auxiliary data API

aa4c051

Medzikarp reviewed Jul 25, 2023

View reviewed changes

Puckoland added 13 commits July 25, 2023 19:35

add lombok dependency

c5373c6

use lombok

bf8d924

use lombok 2

474de5e

add default value to auxData

455186b

merge aux data with tag data in sql query

6b60d23

use auxdatamerged directly

b16f0ad

remove auxdata service

1f2dde4

move ReservationRequestManager in ReservationNotification to parameter

b6c6091

add DefaultAuxData

e76f4f5

validate emails

55571ec

impl ReservationAuxData

80597f4

test fix

6246c3c

add view creation to DB migration

d656db7

Medzikarp reviewed Sep 29, 2023

View reviewed changes

Aux data #21

Are you sure you want to change the base?

Aux data #21

Uh oh!

Conversation

Puckoland commented May 19, 2023

Uh oh!

Medzikarp Jun 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Medzikarp Jun 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Medzikarp Jun 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Medzikarp commented Sep 29, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Medzikarp Sep 29, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Medzikarp Jun 7, 2023 •

edited

Loading

Medzikarp Jun 8, 2023 •

edited

Loading

Medzikarp Jun 7, 2023 •

edited

Loading

Medzikarp commented Sep 29, 2023 •

edited

Loading

Medzikarp Sep 29, 2023 •

edited

Loading