Feature/storage filesystem

.gitignore

@@ -52,3 +52,5 @@ gradlew.bat
 
 ## Lombok plugin
 lombok.config
+
+workdir

core-dto/src/main/java/space/shefer/receipt/platform/core/dto/ReportItemFilter.java

@@ -14,7 +14,7 @@
 @Builder(toBuilder = true)
 public class ReportItemFilter {
   @Nullable
-  private List<Long> receiptIds;
+  private List<String> receiptIds;
   @Nullable
   private Double minPrice;
   @Nullable

core-dto/src/main/java/space/shefer/receipt/platform/core/dto/ReportMetaFilter.java

@@ -20,7 +20,7 @@
 public class ReportMetaFilter {
 
   @Nullable
-  List<Long> ids;
+  List<String> ids;
 
   @Schema(
     description = DateUtil.RECEIPT_DATETIME_DESCRIPTION,

core/src/main/java/space/shefer/receipt/platform/core/ReceiptCoreConfiguration.java

@@ -5,9 +5,7 @@
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import space.shefer.receipt.fnssdk.config.EnableFnsSdk;
 
-@EnableFnsSdk
 @ComponentScan
 @EnableJpaRepositories
 @EnableJpaAuditing

core/src/main/java/space/shefer/receipt/platform/core/entity/BaseUuidIdEntity.java

@@ -7,7 +7,6 @@
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import javax.persistence.Column;
 import javax.persistence.EntityListeners;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
@@ -23,15 +22,12 @@ public class BaseUuidIdEntity {
   @Id
   @GeneratedValue(generator = "uuid")
   @GenericGenerator(name = "uuid", strategy = "uuid2")
-  @Column(name = "id", unique = true)
   protected String id;
 
   @CreatedDate
-  @Column(name = "created_at", nullable = false)
   protected LocalDateTime createdAt;
 
   @LastModifiedDate
-  @Column(name = "updated_at", nullable = true)
   protected LocalDateTime updatedAt;
 
 }

core/src/main/java/space/shefer/receipt/platform/core/entity/Item.java

@@ -1,20 +1,26 @@
 package space.shefer.receipt.platform.core.entity;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
+import lombok.Builder;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-@Entity
-@Table(name = "item")
-@Data
 @AllArgsConstructor
+@Entity
+@Getter
 @NoArgsConstructor
-public class Item extends BaseUuidIdEntity{
+@Setter
+@Builder
+@Table(name = "item")
+@ToString
+public class Item extends BaseUuidIdEntity {
 
   private String text;
 

core/src/main/java/space/shefer/receipt/platform/core/entity/Receipt.java

@@ -2,12 +2,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import space.shefer.receipt.platform.core.dto.ReceiptStatus;
 
 import javax.annotation.Nullable;
-import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
@@ -20,35 +21,30 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@Entity
-@Table(name = "receipt")
-@Data
-@Builder
 @AllArgsConstructor
+@Builder
+@Entity
+@Getter
 @NoArgsConstructor
+@Setter
+@Table(name = "receipt")
+@ToString
 public class Receipt extends BaseUuidIdEntity {
 
-  @Column(name = "date", nullable = false)
   private LocalDateTime date;
 
-  @Column(name = "fn", nullable = false)
   private String fn;
 
-  @Column(name = "fd", nullable = false)
   private String fd;
 
-  @Column(name = "fp", nullable = false)
   private String fp;
 
-  @Column(name = "sum", nullable = false)
   private Double sum;
 
   @Nullable
-  @Column(name = "provider")
   private String provider;
 
   @Enumerated(EnumType.STRING)
-  @Column(name = "status", nullable = false)
   private ReceiptStatus status;
 
   @Builder.Default
@@ -57,23 +53,19 @@ public class Receipt extends BaseUuidIdEntity {
   private List<Item> items = new ArrayList<>();
 
   @Nullable
-  @Column(name = "merchant_name")
   private String merchantName;
 
   @Nullable
-  @Column(name = "merchant_inn")
   private String merchantInn;
 
   @Nullable
-  @Column(name = "merchant_place_address")
   private String merchantPlaceAddress;
 
   @Nullable
   @ManyToOne
   @JoinColumn(name = "user_profile_id")
   private UserProfile userProfile;
-
-  @Column(name = "load_attempts", nullable = false, columnDefinition = "INT DEFAULT 0")
+
   private long loadAttempts;
 
 }

core/src/main/resources/application.properties

@@ -5,6 +5,8 @@ spring.datasource.password=
 
 # The SQL dialect makes Hibernate generate better SQL for the chosen database
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+spring.jpa.properties.psysical_naming_strategy=com.vladmihalcea.hibernate.type.util.CamelCaseToSnakeCaseNamingStrategy
+
 
 # Hibernate ddl auto (create, create-drop, validate, update)
 spring.jpa.hibernate.ddl-auto=update

core/src/test/java/space/shefer/receipt/platform/core/repository/ItemRepositorySlowTest.java

@@ -29,10 +29,10 @@ public class ItemRepositorySlowTest {
   @Test
   public void getItems_defaultFilter() {
     List<Item> itemsInitial = asList(
-      new Item(null, "text1", 1001.0, 101.0, null),
-      new Item(null, "text2", 1002.0, 102.0, null),
-      new Item(null, "text3", 1003.0, 103.0, null),
-      new Item(null, "text4", 1004.0, 104.0, null)
+      new Item("text1", 1001.0, 101.0, null),
+      new Item("text2", 1002.0, 102.0, null),
+      new Item("text3", 1003.0, 103.0, null),
+      new Item("text4", 1004.0, 104.0, null)
     );
     repository.saveAll(itemsInitial);
     List<Item> itemsAll = repository.findAll();
@@ -56,19 +56,19 @@ public void getItems_fullFilter() {
     double priceMax = priceOk + 5;
     double priceMin = priceOk - 5;
     // OK
-    repository.save(new Item(null, "text1", priceOk, 101.0, receiptOk));
+    repository.save(new Item("text1", priceOk, 101.0, receiptOk));
     // OK
-    repository.save(new Item(null, "text1", priceMin, 101.0, receiptOk));
+    repository.save(new Item("text1", priceMin, 101.0, receiptOk));
     // OK
-    repository.save(new Item(null, "text1", priceMax, 101.0, receiptOk));
+    repository.save(new Item("text1", priceMax, 101.0, receiptOk));
     // Wrong text
-    repository.save(new Item(null, "text2", priceOk, 101.0, receiptOk));
+    repository.save(new Item("text2", priceOk, 101.0, receiptOk));
     // Wrong receipt
-    repository.save(new Item(null, "text1", priceOk, 101.0, null));
+    repository.save(new Item("text1", priceOk, 101.0, null));
     // Price less than minimal
-    repository.save(new Item(null, "text1", priceMin - 1, 101.0, receiptOk));
+    repository.save(new Item("text1", priceMin - 1, 101.0, receiptOk));
     // Price greater than maximal
-    repository.save(new Item(null, "text1", priceMax + 1, 101.0, receiptOk));
+    repository.save(new Item("text1", priceMax + 1, 101.0, receiptOk));
     {
       ReportItemFilter filter = new ReportItemFilter();
       filter.setReceiptIds(asList(receiptOk.getId()));
@@ -77,9 +77,9 @@ public void getItems_fullFilter() {
       filter.setTextEquals("text1");
       List<Item> actual = repository.getItems(filter);
       assertEquals(3, actual.size());
-      assertSimilar(new Item(null, "text1", priceOk, 101.0, receiptOk), actual.get(0));
-      assertSimilar(new Item(null, "text1", priceMin, 101.0, receiptOk), actual.get(1));
-      assertSimilar(new Item(null, "text1", priceMax, 101.0, receiptOk), actual.get(2));
+      assertSimilar(new Item("text1", priceOk, 101.0, receiptOk), actual.get(0));
+      assertSimilar(new Item("text1", priceMin, 101.0, receiptOk), actual.get(1));
+      assertSimilar(new Item("text1", priceMax, 101.0, receiptOk), actual.get(2));
     }
   }