diff --git a/klass-shared/src/main/java/no/ssb/klass/core/model/ClassificationAccessCounter.java b/klass-shared/src/main/java/no/ssb/klass/core/model/ClassificationAccessCounter.java index facbf222..4b86d5b5 100644 --- a/klass-shared/src/main/java/no/ssb/klass/core/model/ClassificationAccessCounter.java +++ b/klass-shared/src/main/java/no/ssb/klass/core/model/ClassificationAccessCounter.java @@ -5,13 +5,14 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.OneToOne; @Entity public class ClassificationAccessCounter { @Id - @GeneratedValue + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @Column(nullable = false) diff --git a/klass-shared/src/main/java/no/ssb/klass/core/repository/ClassificationFamilyRepositoryImpl.java b/klass-shared/src/main/java/no/ssb/klass/core/repository/ClassificationFamilyRepositoryImpl.java index 58bb1601..b838c6e8 100644 --- a/klass-shared/src/main/java/no/ssb/klass/core/repository/ClassificationFamilyRepositoryImpl.java +++ b/klass-shared/src/main/java/no/ssb/klass/core/repository/ClassificationFamilyRepositoryImpl.java @@ -57,7 +57,7 @@ public List findClassificationFamilySummaries(Strin "select family.id, family.name, family.icon_name, count(classification.id) from classification_family family " + "left outer join classification_series classification on classification.classification_family_id=family.id " + " and classification.deleted = false" - + " and (:section is null or :section = (select user.section from user user where user.id = classification.contact_person_id)) " + + " and (:section is null or :section = (select usr.section from user usr where usr.id = classification.contact_person_id)) " + " and (:classificationType is null or :classificationType = classification.classification_type) " + "group by family.id" // @formatter:on @@ -65,9 +65,9 @@ public List findClassificationFamilySummaries(Strin : classificationType.name()).getResultList(); for (Object[] columns : rows) { - result.add(new ClassificationFamilySummary(((BigInteger) columns[0]).longValue(), converter + result.add(new ClassificationFamilySummary((Long) columns[0], converter .convertToEntityAttribute((String) columns[1]), (String) columns[2], - ((BigInteger) columns[3]).longValue())); + (Long) columns[3])); } return result; } @@ -88,7 +88,7 @@ public List findPublicClassificationFamilySummaries + " and classification.copyrighted <> '1' " + " and (:classificationType is null or :classificationType = classification.classification_type) " + " and (:section is null or :section " - + " = (select user.section from user user where user.id = classification.contact_person_id)) " + + " = (select usr.section from user usr where usr.id = classification.contact_person_id)) " + " group by family.id" // @formatter:on ).setParameter("section", section).setParameter("classificationType", classificationType == null ? null diff --git a/klass-shared/src/test/java/no/ssb/klass/core/repository/StatisticalUnitRepositoryTest.java b/klass-shared/src/test/java/no/ssb/klass/core/repository/StatisticalUnitRepositoryTest.java index af053f2a..629b4698 100644 --- a/klass-shared/src/test/java/no/ssb/klass/core/repository/StatisticalUnitRepositoryTest.java +++ b/klass-shared/src/test/java/no/ssb/klass/core/repository/StatisticalUnitRepositoryTest.java @@ -62,10 +62,10 @@ public void getStaticalUnitsOverViewTest() { Integer.MAX_VALUE)); assertEquals(2, result.getContent().size()); List resultList = result.getContent(); - assertEquals("Duppeditt", resultList.get(0).getName()); - assertEquals(Long.valueOf(2), resultList.get(0).getCount()); - assertEquals("Dingseboms", resultList.get(1).getName()); - assertEquals(Long.valueOf(1), resultList.get(1).getCount()); + assertEquals("Dingseboms", resultList.get(0).getName()); + assertEquals(Long.valueOf(1), resultList.get(0).getCount()); + assertEquals("Duppeditt", resultList.get(1).getName()); + assertEquals(Long.valueOf(2), resultList.get(1).getCount()); } @Test