Skip to content

Commit

Permalink
Merge branch 'refs/heads/develop' into feature/orgs
Browse files Browse the repository at this point in the history
# Conflicts:
#	project-properties.gradle
#	src/main/java/com/epam/ta/reportportal/jooq/JPublic.java
  • Loading branch information
grabsefx committed Jul 5, 2024
2 parents 17cc2dc + 2834dd5 commit e99ed4e
Show file tree
Hide file tree
Showing 11 changed files with 560 additions and 0 deletions.
1 change: 1 addition & 0 deletions project-properties.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ project.ext {
(migrationsUrl + '/migrations/86_notication_update.up.sql') : 'V086__notication_update.sql',
(migrationsUrl + '/migrations/88_add_retention_policy_launch.up.sql') : 'V088__add_retention_policy_launch.sql',
(migrationsUrl + '/migrations/89_add_group_enum_value.up.sql') : 'V089__add_group_enum_value.sql',
(migrationsUrl + '/migrations/90_analytics_data_table.up.sql') : 'V090__analytics_data_table.sql',
(migrationsUrl + '/migrations/200_migrate_org_roles.up.sql') : 'V200__migrate_org_roles.sql',
(migrationsUrl + '/migrations/201_drop_table_onboarding.up.sql') : 'V201__drop_table_onboarding.sql',
(migrationsUrl + '/migrations/202_update_project_table.up.sql') : 'V202__update_project_table.up.sql',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Copyright 2024 EPAM Systems
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.epam.ta.reportportal.dao;

import org.springframework.stereotype.Repository;
import com.epam.ta.reportportal.entity.analytics.AnalyticsData;

@Repository
public interface AnalyticsDataRepository extends ReportPortalRepository<AnalyticsData, Long> {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*
* Copyright 2024 EPAM Systems
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.epam.ta.reportportal.entity.analytics;

import com.epam.ta.reportportal.entity.Metadata;
import java.io.Serializable;
import java.time.Instant;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
import org.springframework.data.annotation.CreatedDate;

/**
* @author Siarhei Hrabko
*/
@Entity
@TypeDef(name = "meta", typeClass = Metadata.class)
@Table(name = "analytics_data", schema = "public")
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class AnalyticsData implements Serializable {

private static final long serialVersionUID = 923392982L;

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id", unique = true, nullable = false, precision = 64)
private Long id;

@Column(name = "type")
private String type;

@Column(name = "metadata")
@Type(type = "meta")
private Metadata metadata;

@Column(name = "created_at", nullable = false)
@CreatedDate
private Instant createdAt;

}
3 changes: 3 additions & 0 deletions src/main/java/com/epam/ta/reportportal/jooq/Indexes.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions src/main/java/com/epam/ta/reportportal/jooq/JPublic.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/main/java/com/epam/ta/reportportal/jooq/Keys.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/main/java/com/epam/ta/reportportal/jooq/Sequences.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/main/java/com/epam/ta/reportportal/jooq/Tables.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e99ed4e

Please sign in to comment.