4591 - Original Data Point Comments Separation - Activity logs - #5218
Merged
mergify[bot] merged 11 commits intoNov 7, 2025
Conversation
yaguzmang
changed the title
minotogna
reviewed
Oct 30, 2025
Comment on lines
+44
to
+45
| export const ODP_COMMENT_COLUMN_EXTENT = `comments_${TableNames.extentOfForest.toLocaleLowerCase()}` | ||
| export const ODP_COMMENT_COLUMN_FOREST_CHARACTERISTICS = `comments_${TableNames.forestCharacteristics.toLocaleLowerCase()}` |
Member
There was a problem hiding this comment.
better a Record and in src/server/db/repository/assessmentCycle/originalDataPoint since they are used only there?
Comment on lines
+36
to
+40
| const message = | ||
| field === TableNames.extentOfForest | ||
| ? ActivityLogMessage.originalDataPointUpdateCommentExtentOfForest | ||
| : ActivityLogMessage.originalDataPointUpdateCommentForestCharacteristics | ||
|
|
minotogna
reviewed
Oct 31, 2025
| user: User | ||
| } | ||
|
|
||
| const ACTIVITY_LOG_MESSAGE_BY_FIELD: Record<OriginalDataPointCommentKey, ActivityLogMessage> = { |
minotogna
reviewed
Oct 31, 2025
| import { OriginalDataPoint, OriginalDataPointComments } from 'meta/assessment/originalDataPoint' | ||
| import { TableNames } from 'meta/assessment/table' | ||
|
|
||
| import { ODP_COMMENT_COLUMNS_RECORD } from 'server/repository/assessmentCycle/originalDataPoint/commentColumns' |
minotogna
reviewed
Oct 31, 2025
|
|
||
| import { ODP_COMMENT_COLUMNS_RECORD } from 'server/repository/assessmentCycle/originalDataPoint/commentColumns' | ||
|
|
||
| type OriginalDataPointDB = Record<string, unknown> |
Member
There was a problem hiding this comment.
this must specify the columns
minotogna
reviewed
Oct 31, 2025
| }) | ||
|
|
||
| if (!hasForestCharacteristicsComments) { | ||
| await DB.none(`alter table ${tableName} add column ${commentColumnForestCharacteristics} text`) |
Member
There was a problem hiding this comment.
by default comments should be empty string.
DDL is missing
minotogna
reviewed
Oct 31, 2025
Comment on lines
+22
to
+28
| if (!Objects.isNil(commentsExtentOfForest)) { | ||
| comments[TableNames.extentOfForest] = commentsExtentOfForest as string | ||
| } | ||
|
|
||
| if (!Objects.isNil(commentsForestCharacteristics)) { | ||
| comments[TableNames.forestCharacteristics] = commentsForestCharacteristics as string | ||
| } |
Member
There was a problem hiding this comment.
by default these values should not be null
minotogna
reviewed
Oct 31, 2025
| export { ColAdapter } from './col' | ||
| export type { FileDB } from './file' | ||
| export { FileAdapter } from './file' | ||
| export { OriginalDataPointAdapter } from './originalDataPoint' |
Member
There was a problem hiding this comment.
lets start not exporting from barrel files
yaguzmang
commented
Nov 6, 2025
minotogna
reviewed
Nov 6, 2025
| ] as ODPCommentColName<TableNames.forestCharacteristics> | ||
|
|
||
| export const OriginalDataPointAdapter = (row: OriginalDataPointDB): OriginalDataPoint => { | ||
| if (Objects.isNil(row)) return null |
Contributor
Author
There was a problem hiding this comment.
It can be null when a query returns no rows, so some tests fail without this check
Member
There was a problem hiding this comment.
Strange . Which query ? Do we use oneRoNone or map ?
Member
There was a problem hiding this comment.
Let's check this in the next pr @yaguzmang we merge this now . It was too big this pr to handle it properly
minotogna
approved these changes
Nov 7, 2025
mergify
Bot
merged commit Nov 7, 2025
c91be1e
into
4591-original-data-point---comments-area-separation-for-1a-and-1b
5 checks passed
mergify
Bot
deleted the
4591-original-data-point---comments-area-separation-activity-logs
branch
November 7, 2025 05:18
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.