Database redesign #136

georgimld · 2024-11-27T16:31:41Z

Changes in this PR:

updated data model to combine all Comment tables (Comment, NewsComment, PostComment, ProjectComment, CollaborationComment) into a single table Comment
migrate data from old tables into new one (in the migration file)
update all types, requests and queries
add a separate CommentLike table (like for comments)
update the old Like comment (rename projectId -> objectId, add objectType) -> for now we only have project likes but we could extend it

How to test:

build all containers in main (build db from scratch e.g. docker compose up --build)
make sure your strapi has data
add some data to the database (either manually or via a postgres dump)
- psql "postgresql://inno:hub@localhost:5432/innohub" < ...path_to_dump.sql
- connect to psql via psql "postgresql://inno:hub@localhost:5432/innohub"
- look & check the old table format
do npm run prisma migrate deploy in the new branch (this migration should be applied 20241217173509_comment_model)
the result should be something like this:

make sure you update the cache by removing the "sync" entry from the redis UI, and then triggering the /api/redis/full-refresh endpoint

other useful psql commands:

to drop everything from the DB drop schema innohub CASCADE;
to set the "innohub" schema as the current search path in psql -> SET search_path TO innohub;

Closes #135

pecirep · 2025-01-27T12:48:15Z

app/common/types.ts

We should try to avoid type definitions that are independent of our Prisma Schema where possible. This would avoid having to use casts like in L49 of CollaborationQuestionCard.tsx, where we know the type is correct because the the database gives us a createdAt property for every comment but it doesn't align with the type we defined elsewhere.

moved to issue #158

andrea-smiesna · 2025-01-28T14:46:47Z

app/components/collaboration/CollaborationQuestionCard.tsx

@@ -41,9 +46,9 @@ export const CollaborationQuestionCard = ({
 }: CollaborationQuestionCardProps) => {
  const { title, description, authors, comments: projectComments } = content;
  const { setCollaborationCommentsAmount } = useProject();
-  const sortedProjectComments = sortDateByCreatedAtDesc(projectComments);
+  const sortedProjectComments = sortDateByCreatedAtDesc(projectComments as CollaborationCommentWithDate[]); //todo check


Remove the todo if it's done :)

andrea-smiesna · 2025-01-28T14:47:50Z

app/components/common/comments/CommentFooter.tsx

  return (
    <Stack direction={'row'}>
-      <UpvoteControls upvoteCount={upvoteCount} isUpvoted={isUpvoted} onUpvote={onUpvote} sx={{ mr: 0.5 }} />
+      {/* <UpvoteControls upvoteCount={upvoteCount} isLiked={isLiked} onUpvote={onUpvote} sx={{ mr: 0.5 }} /> */}


Is the "UpvoteControls" component used here?

replaced with LikeControls and removed UpvoteControls ✅

andrea-smiesna · 2025-01-28T14:48:14Z

app/components/common/comments/CommentFooter.tsx

-  upvoteCount,
-  isUpvoted,
-  onUpvote,
+  // likeCount,


Can be removed if it's not used

removed ✅

andrea-smiesna · 2025-01-28T14:48:37Z

app/messages/de.json

@@ -34,6 +34,7 @@
  "components_collaboration_comments_collaborationCommentCard_upvoteError": "Der Kommentar konnte nicht hochgestuft werden. Bitte versuche es später noch einmal.",
  "components_collaboration_comments_collaborationCommentCard_updateError": "Der Kommentar konnte nicht aktualisiert werden. Bitte versuche es später noch einmal.",
  "components_collaboration_comments_collaborationCommentCard_deleteError": "Der Kommentar konnte nicht gelöscht werden. Bitte versuche es später noch einmal.",
+  "components_collaboration_comments_collaborationCommentCard_questionMissing": "Die Frage konnte nicht gefunden werden. Bitte versuche es später noch einmal.",


The translation is not used anywhere within the collaboration comment card

removed ✅

andrea-smiesna · 2025-01-28T14:51:40Z

app/utils/newsFeed/redis/models.ts

-  commentId: string;
-  comment: string;
-  author?: string;
+  // commentId: string;


Can be removed

removed ✅

andrea-smiesna · 2025-01-28T14:52:08Z

app/utils/newsFeed/redis/redisMappings.ts

  return comments.map((comment: RedisHashedNewsComment) => {
+    //todo add likes


Remaining todo

removed ✅

andrea-smiesna · 2025-01-28T14:53:16Z

strapi/src/api/inno-user/content-types/inno-user/schema.json

@@ -73,11 +73,6 @@
      "relation": "manyToMany",
      "target": "api::opportunity.opportunity",
      "mappedBy": "participants"
-    },
-    "username": {


The username field should be kept in Strapi "InnoUser" collection

removed forgotten files ✅

andrea-smiesna · 2025-01-28T14:53:53Z

strapi/types/generated/contentTypes.d.ts

@@ -928,7 +928,6 @@ export interface ApiInnoUserInnoUser extends Schema.CollectionType {
      'manyToMany',
      'api::opportunity.opportunity'
    >;
-    username: Attribute.String & Attribute.Unique;


Related to the "username" field, should be updated automatically.

removed forgotten files ✅

andrea-smiesna · 2025-01-28T14:57:07Z

app/repository/db/comment.ts

+  return comment?.likes;
+}
+
+//todo check this ObjectType.COMMENT


Is this todo still relevant?

nope, removed (refactored too)

andrea-smiesna · 2025-01-28T15:02:27Z

app/utils/requests/project/requests.ts

-      const getUpvotes = comments.map(async (comment): Promise<Comment> => {
-        const { data: isUpvotedByUser } = await isProjectCommentUpvotedByUser({ commentId: comment.id });
+      const dbComments = await getCommentsByObjectId(dbClient, body.projectId);
+      const comments = await Promise.all(dbComments.map((comment) => mapToComment(comment)));


I think that we want the comments sorted by createdAt DESC (sortDateByCreatedAtDesc method) or sort them in the Comments Card.

not done, sorry :(

andrea-smiesna · 2025-01-28T15:26:44Z

app/services/collaborationCommentResponseService.ts

+    const commentCount = await getCommentResponseCount(dbClient, deletedResponse.parentId);
+    await updateCollaborationCommentInCache({ user, comment: { id: deletedResponse.parentId, commentCount } });
+  } else {
+    logger.info('no parentID');


I think that the logging can be removed

andrea-smiesna · 2025-01-28T15:31:56Z

app/services/commentService.ts

+  const body = { id: comment.objectId, commentCount };
+  return comment.objectType === 'POST'
+    ? await updatePostInCache({ post: body, user: author })
+    : await updateProjectUpdateInCache({ update: body });


Do you know why we're saving author of the POST, but not of the UPDATE to the cache?

andrea-smiesna · 2025-01-28T15:42:27Z

app/utils/requests/comments/mapping.ts

  const author = await getInnoUserByProviderId(comment.author);
+  const likedBy = await Promise.allSettled(
+    comment.likes.map(async (like) => await getInnoUserByProviderId(like.likedBy)),
+  ).then((results) => getFulfilledResults(results));


We have a helper function which makes the "promises" a bit less complicated syntax wise. Could you please change this to:
`const getLikedBy = comment.likes.map(async (like) => await getInnoUserByProviderId(like.likedBy));

const likedBy = await getPromiseResults(getLikedBy);`

andrea-smiesna · 2025-01-28T15:43:56Z

app/utils/requests/comments/mapping.ts

+  question: CollaborationQuestion,
+): Promise<CollaborationComment[]> => {
+  return await Promise.allSettled(
+    comments.map(async (comment) => await mapToCollborationComment(comment, question)),


Same here as on line 10

done too ✅

…file

georgimld self-assigned this Nov 27, 2024

georgimld added 2 commits December 17, 2024 19:48

refactor: refactor data model, types and requests for comments

90ac2c1

refactor: fix prisma migration, fix bugs

3e11355

georgimld force-pushed the 135-db-redesign branch from e79b89f to 3e11355 Compare December 20, 2024 10:34

georgimld added 6 commits January 15, 2025 09:39

fix: update migration to migrate data, fix bugs

710e241

fix: fix types and bugs, clean up code

a574a4c

feat: implement comment likes

82e3b8c

Merge remote-tracking branch 'origin/main' into 135-db-redesign

e78e07a

fix: fix merge issues

1021715

fix: fix merge issues

a5e6ca1

georgimld marked this pull request as ready for review January 27, 2025 12:21

andrea-smiesna self-requested a review January 27, 2025 12:25

pecirep reviewed Jan 27, 2025

View reviewed changes

andrea-smiesna reviewed Jan 28, 2025

View reviewed changes

georgimld added 2 commits January 29, 2025 17:35

fix: revert changes slipped through merged commit

238c41d

Merge remote-tracking branch 'origin/main' into 135-db-redesign

522fe95

georgimld mentioned this pull request Jan 30, 2025

Refactor Caching of News and Posts #159

Open

georgimld added 3 commits January 30, 2025 17:41

fix: fix comment likes for collab & project comments, clean up code

bc17449

refactor: rename table like to objectlike, clean up prisma migration …

9d688fc

…file

fix: remove todo

9339918

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Database redesign #136

Database redesign #136

georgimld commented Nov 27, 2024 •

edited

Loading

pecirep Jan 27, 2025

georgimld Jan 30, 2025

andrea-smiesna Jan 28, 2025

georgimld Jan 30, 2025

andrea-smiesna Jan 28, 2025

georgimld Jan 30, 2025

andrea-smiesna Jan 28, 2025

georgimld Jan 30, 2025

andrea-smiesna Jan 28, 2025

georgimld Jan 30, 2025

andrea-smiesna Jan 28, 2025

georgimld Jan 30, 2025

andrea-smiesna Jan 28, 2025

georgimld Jan 30, 2025

andrea-smiesna Jan 28, 2025

georgimld Jan 30, 2025

andrea-smiesna Jan 28, 2025

georgimld Jan 30, 2025

andrea-smiesna Jan 28, 2025

georgimld Jan 30, 2025

andrea-smiesna Jan 28, 2025

georgimld Jan 30, 2025

andrea-smiesna Jan 28, 2025

georgimld Jan 30, 2025

andrea-smiesna Jan 28, 2025

andrea-smiesna Jan 28, 2025

georgimld Jan 30, 2025

andrea-smiesna Jan 28, 2025

georgimld Jan 30, 2025

		return comments.map((comment: RedisHashedNewsComment) => {
		//todo add likes

Database redesign #136

Are you sure you want to change the base?

Database redesign #136

Conversation

georgimld commented Nov 27, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

georgimld commented Nov 27, 2024 •

edited

Loading