Skip to content

Commit

Permalink
SAK-47231 Conversations: Restrict ids to 36 chars (sakaiproject#10486)
Browse files Browse the repository at this point in the history 
https://sakaiproject.atlassian.net/browse/SAK-47231
  • Loading branch information
@adrianfish
adrianfish authored Apr 28, 2022
1 parent eea095b commit 5ce808f
Show file tree
Hide file tree
Showing 12 changed files with 36 additions and 34 deletions.
8 changes: 4 additions & 4 deletions ...ions/api/src/main/java/org/sakaiproject/conversations/api/model/ConversationsComment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
import lombok.Setter;

@Entity
@Table(name = "CONV_COMMENTS", indexes = { @Index(columnList = "POST_ID"),
@Index(columnList = "SITE_ID"),
@Index(columnList = "TOPIC_ID") })
@Table(name = "CONV_COMMENTS", indexes = { @Index(name = "conv_comments_post_idx", columnList = "POST_ID"),
@Index(name = "conv_comments_site_idx", columnList = "SITE_ID"),
@Index(name = "conv_comments_topic_idx", columnList = "TOPIC_ID") })
@Getter
@Setter
public class ConversationsComment implements PersistableEntity<String> {
Expand All @@ -47,7 +47,7 @@ public class ConversationsComment implements PersistableEntity<String> {
@Column(name = "SITE_ID", length = 99, nullable = false)
private String siteId;

@Column(name = "POST_ID", nullable = false)
@Column(name = "POST_ID", length = 36, nullable = false)
private String postId;

@Column(name = "TOPIC_ID", length = 36, nullable = false)
Expand Down
16 changes: 8 additions & 8 deletions ...sations/api/src/main/java/org/sakaiproject/conversations/api/model/ConversationsPost.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
import lombok.Setter;

@Entity
@Table(name = "CONV_POSTS", indexes = { @Index(columnList = "TOPIC_ID"),
@Index(columnList = "TOPIC_ID, CREATOR"),
@Index(columnList = "SITE_ID"),
@Index(columnList = "PARENT_POST_ID"),
@Index(columnList = "PARENT_THREAD_ID") })
@Table(name = "CONV_POSTS", indexes = { @Index(name = "conv_posts_topic_idx", columnList = "TOPIC_ID"),
@Index(name = "conv_posts_topic_creator_idx", columnList = "TOPIC_ID, CREATOR"),
@Index(name = "conv_posts_site_idx", columnList = "SITE_ID"),
@Index(name = "conv_posts_parent_post_idx", columnList = "PARENT_POST_ID"),
@Index(name = "conv_posts_parent_thread_idx", columnList = "PARENT_THREAD_ID") })
@Getter
@Setter
public class ConversationsPost implements PersistableEntity<String> {
Expand All @@ -47,14 +47,14 @@ public class ConversationsPost implements PersistableEntity<String> {
@GenericGenerator(name = "uuid", strategy = "uuid2")
private String id;

@Column(name = "TOPIC_ID", nullable = false)
@Column(name = "TOPIC_ID", length = 36, nullable = false)
private String topicId;

@Column(name = "PARENT_POST_ID")
@Column(name = "PARENT_POST_ID", length = 36)
private String parentPostId;

// This holds the oldest ancestor, the thread starter, in this thread of posts
@Column(name = "PARENT_THREAD_ID")
@Column(name = "PARENT_THREAD_ID", length = 36)
private String parentThreadId;

@Column(name = "SITE_ID", length = 99, nullable = false)
Expand Down
4 changes: 2 additions & 2 deletions ...ations/api/src/main/java/org/sakaiproject/conversations/api/model/ConversationsTopic.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@

@Entity
@Table(name = "CONV_TOPICS", indexes = {
@Index(columnList = "SITE_ID"),
@Index(columnList = "SITE_ID, CREATOR")
@Index(name = "conv_topics_site_idx", columnList = "SITE_ID"),
@Index(name = "conv_topics_site_creator_idx", columnList = "SITE_ID, CREATOR")
}
)
@Getter
Expand Down
5 changes: 3 additions & 2 deletions conversations/api/src/main/java/org/sakaiproject/conversations/api/model/PostReaction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
@Entity
@Table(name = "CONV_POST_REACTIONS",
uniqueConstraints = { @UniqueConstraint(name = "UniquePostReactions", columnNames = { "POST_ID", "USER_ID", "REACTION" }) },
indexes = { @Index(columnList = "POST_ID"), @Index(columnList = "POST_ID, USER_ID") })
indexes = { @Index(name = "conv_post_reactions_post_idx", columnList = "POST_ID"),
@Index(name = "conv_post_reactions_post_user_idx", columnList = "POST_ID, USER_ID") })
@Getter
@Setter
public class PostReaction implements PersistableEntity<Long> {
Expand All @@ -43,7 +44,7 @@ public class PostReaction implements PersistableEntity<Long> {
@Column(name = "ID")
private Long id;

@Column(name = "POST_ID", nullable = false)
@Column(name = "POST_ID", length = 36, nullable = false)
private String postId;

@Column(name = "USER_ID", length = 99, nullable = false)
Expand Down
4 changes: 2 additions & 2 deletions ...sations/api/src/main/java/org/sakaiproject/conversations/api/model/PostReactionTotal.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

@Entity
@Table(name = "CONV_POST_REACTION_TOTALS",
indexes = { @Index(columnList = "POST_ID") },
indexes = { @Index(name = "conv_post_reaction_totals_post_idx", columnList = "POST_ID") },
uniqueConstraints = { @UniqueConstraint(name = "UniquePostReactionTotals", columnNames = { "POST_ID", "REACTION" }) })
@Getter
@Setter
Expand All @@ -42,7 +42,7 @@ public class PostReactionTotal implements PersistableEntity<Long> {
@Column(name = "ID")
private Long id;

@Column(name = "POST_ID", nullable = false)
@Column(name = "POST_ID", length = 36, nullable = false)
private String postId;

@Column(name = "REACTION", nullable = false)
Expand Down
12 changes: 6 additions & 6 deletions conversations/api/src/main/java/org/sakaiproject/conversations/api/model/PostStatus.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@

@Entity
@Table(name = "CONV_POST_STATUS",
indexes = { @Index(columnList = "USER_ID"),
@Index(columnList = "POST_ID"),
@Index(columnList = "POST_ID, USER_ID"),
@Index(columnList = "TOPIC_ID, USER_ID") },
indexes = { @Index(name = "conv_post_status_user_idx", columnList = "USER_ID"),
@Index(name = "conv_post_status_post_idx", columnList = "POST_ID"),
@Index(name = "conv_post_status_post_user_idx", columnList = "POST_ID, USER_ID"),
@Index(name = "conv_post_status_topic_user_idx", columnList = "TOPIC_ID, USER_ID") },
uniqueConstraints = { @UniqueConstraint(name = "UniquePostStatus", columnNames = { "POST_ID", "USER_ID" }) })
@Getter
@Setter
Expand All @@ -46,10 +46,10 @@ public class PostStatus implements PersistableEntity<Long> {
@Column(name = "ID")
private Long id;

@Column(name = "TOPIC_ID", nullable = false)
@Column(name = "TOPIC_ID", length = 36, nullable = false)
private String topicId;

@Column(name = "POST_ID", nullable = false)
@Column(name = "POST_ID", length = 36, nullable = false)
private String postId;

@Column(name = "USER_ID", length = 99, nullable = false)
Expand Down
2 changes: 1 addition & 1 deletion conversations/api/src/main/java/org/sakaiproject/conversations/api/model/Settings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import lombok.Setter;

@Entity
@Table(name = "CONV_SETTINGS", indexes = @Index(columnList = "SITE_ID", unique = true))
@Table(name = "CONV_SETTINGS", indexes = @Index(name = "conv_settings_site_idx", columnList = "SITE_ID", unique = true))
@Getter
@Setter
public class Settings implements PersistableEntity<Long> {
Expand Down
2 changes: 1 addition & 1 deletion conversations/api/src/main/java/org/sakaiproject/conversations/api/model/Tag.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import lombok.Setter;

@Entity
@Table(name = "CONV_TAGS", indexes = { @Index(columnList = "SITE_ID") })
@Table(name = "CONV_TAGS", indexes = { @Index(name = "conv_tags_site_idx", columnList = "SITE_ID") })
@Getter
@Setter
public class Tag implements PersistableEntity<Long> {
Expand Down
5 changes: 3 additions & 2 deletions conversations/api/src/main/java/org/sakaiproject/conversations/api/model/TopicReaction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
@Entity
@Table(name = "CONV_TOPIC_REACTIONS",
uniqueConstraints = { @UniqueConstraint(name = "UniqueTopicReactions", columnNames = { "TOPIC_ID", "USER_ID", "REACTION" }) },
indexes = { @Index(columnList = "TOPIC_ID, USER_ID"), @Index(columnList = "TOPIC_ID") })
indexes = { @Index(name = "conv_topic_reactions_topic_user_idx", columnList = "TOPIC_ID, USER_ID"),
@Index(name = "conv_topic_reactions_topic_idx",columnList = "TOPIC_ID") })
@Getter
@Setter
public class TopicReaction implements PersistableEntity<Long> {
Expand All @@ -43,7 +44,7 @@ public class TopicReaction implements PersistableEntity<Long> {
@Column(name = "ID")
private Long id;

@Column(name = "TOPIC_ID", nullable = false)
@Column(name = "TOPIC_ID", length = 36, nullable = false)
private String topicId;

@Column(name = "USER_ID", length = 99, nullable = false)
Expand Down
4 changes: 2 additions & 2 deletions ...ations/api/src/main/java/org/sakaiproject/conversations/api/model/TopicReactionTotal.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

@Entity
@Table(name = "CONV_TOPIC_REACTION_TOTALS",
indexes = { @Index(columnList = "TOPIC_ID") },
indexes = { @Index(name = "conv_topic_reaction_totals_topic_idx", columnList = "TOPIC_ID") },
uniqueConstraints = { @UniqueConstraint(name = "UniqueTopicReactionTotals", columnNames = { "TOPIC_ID", "REACTION" }) })
@Getter
@Setter
Expand All @@ -42,7 +42,7 @@ public class TopicReactionTotal implements PersistableEntity<Long> {
@Column(name = "ID")
private Long id;

@Column(name = "TOPIC_ID", nullable = false)
@Column(name = "TOPIC_ID", length = 36, nullable = false)
private String topicId;

@Column(name = "REACTION", nullable = false)
Expand Down
4 changes: 2 additions & 2 deletions conversations/api/src/main/java/org/sakaiproject/conversations/api/model/TopicStatus.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
@Entity
@Table(name = "CONV_TOPIC_STATUS",
uniqueConstraints = { @UniqueConstraint(name = "UniqueTopicStatus", columnNames = { "TOPIC_ID", "USER_ID" }) },
indexes = { @Index(columnList = "TOPIC_ID, USER_ID") })
indexes = { @Index(name = "conv_topic_status_topic_user_idx", columnList = "TOPIC_ID, USER_ID") })
@Getter
@Setter
public class TopicStatus implements PersistableEntity<Long> {
Expand All @@ -44,7 +44,7 @@ public class TopicStatus implements PersistableEntity<Long> {
@Column(name = "SITE_ID", nullable = false)
private String siteId;

@Column(name = "TOPIC_ID", nullable = false)
@Column(name = "TOPIC_ID", length = 36, nullable = false)
private String topicId;

@Column(name = "USER_ID", length = 99, nullable = false)
Expand Down
4 changes: 2 additions & 2 deletions conversations/api/src/main/java/org/sakaiproject/conversations/api/model/UserStatistics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import lombok.Getter;

@Entity
@Table(name = "CONV_USER_STATISTICS", indexes = @Index(columnList = "USER_ID"))
@Table(name = "CONV_USER_STATISTICS", indexes = @Index(name = "conv_user_stats_user_idx", columnList = "USER_ID"))
@Getter
public class UserStatistics {

Expand All @@ -37,7 +37,7 @@ public class UserStatistics {
@Column(name = "USER_ID", length = 99, nullable = false)
private String userId;

@Column(name = "TOPIC_ID")
@Column(name = "TOPIC_ID", length = 36)
private String topicId;

@Column(name = "NUMBER_OF_POSTS")
Expand Down

0 comments on commit 5ce808f

Please sign in to comment.