Skip to content

Feature for auto trim whitespace. #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
riflowth merged 3 commits into from
Jun 11, 2024
Merged

Feature for auto trim whitespace. #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d692935
feat: add `autoTrim` option in to struct
teelyjc Jun 8, 2024
ca9ab55
feat: assignment auto trim options
teelyjc Jun 8, 2024
4696434
fix: typo json
teelyjc Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions domain/assignment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,20 @@ const (
)

type Assignment struct {
Id int `json:"id" db:"id"`
WorkspaceId int `json:"-" db:"workspace_id"`
Name string `json:"name" db:"name"`
Description string `json:"description" db:"description"`
DetailUrl string `json:"detailUrl" db:"detail_url"`
MemoryLimit int `json:"memoryLimit" db:"memory_limit"`
TimeLimit int `json:"timeLimit" db:"time_limit"`
Level AssignmentLevel `json:"level" db:"level"`
CreatedAt time.Time `json:"createdAt" db:"created_at"`
UpdatedAt time.Time `json:"updatedAt" db:"updated_at"`
PublishDate time.Time `json:"publishDate" db:"publish_date"`
DueDate *time.Time `json:"dueDate" db:"due_date"`
IsDeleted bool `json:"-" db:"is_deleted"`
Id int `json:"id" db:"id"`
WorkspaceId int `json:"-" db:"workspace_id"`
Name string `json:"name" db:"name"`
Description string `json:"description" db:"description"`
DetailUrl string `json:"detailUrl" db:"detail_url"`
MemoryLimit int `json:"memoryLimit" db:"memory_limit"`
TimeLimit int `json:"timeLimit" db:"time_limit"`
Level AssignmentLevel `json:"level" db:"level"`
CreatedAt time.Time `json:"createdAt" db:"created_at"`
UpdatedAt time.Time `json:"updatedAt" db:"updated_at"`
PublishDate time.Time `json:"publishDate" db:"publish_date"`
IsAutoTrimEnabled bool `json:"isAutoTrimEnabled" db:"is_auto_trim_enabled"`
DueDate *time.Time `json:"dueDate" db:"due_date"`
IsDeleted bool `json:"-" db:"is_deleted"`

// Always aggregation
Testcases []Testcase `json:"testcases"`
Expand Down
2 changes: 2 additions & 0 deletions other/db/migrations/000012_add-assignment-auto-trim-whitespace.down.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE `assignment`
DROP `is_auto_trim_enabled`;
2 changes: 2 additions & 0 deletions other/db/migrations/000012_add-assignment-auto-trim-whitespace.up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE `assignment`
ADD `is_auto_trim_enabled` BOOLEAN NOT NULL DEFAULT false AFTER `updated_at`;
5 changes: 3 additions & 2 deletions platform/amqp/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ type GradeRequestMessage struct {
}

type GradeSettingsMessage struct {
TimeLimit int `json:"timeLimit"`
MemoryLimit int `json:"memoryLimit"`
TimeLimit int `json:"timeLimit"`
MemoryLimit int `json:"memoryLimit"`
IsAutoTrimEnabled bool `json:"isAutoTrimEnabled"`
}

type GradeTestMessage struct {
Expand Down
5 changes: 3 additions & 2 deletions platform/amqp/publisher/grading.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@ func (p *gradingPublisher) Grade(assignment *domain.AssignmentWithStatus, submis
SourceUrl: sourceUrl,
Test: testcases,
Settings: payload.GradeSettingsMessage{
TimeLimit: assignment.TimeLimit,
MemoryLimit: assignment.MemoryLimit,
TimeLimit: assignment.TimeLimit,
MemoryLimit: assignment.MemoryLimit,
IsAutoTrimEnabled: assignment.IsAutoTrimEnabled,
},
Metadata: payload.GradeMetadataMessage{
AssignmentId: assignment.Id,
Expand Down