Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,14 @@ dependencies {
implementation "org.springframework.boot:spring-boot-starter-security"
implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
implementation "org.springframework.boot:spring-boot-starter-web"
implementation 'org.springframework.boot:spring-boot-starter-websocket'

developmentOnly 'org.springframework.boot:spring-boot-devtools'
implementation 'com.puppycrawl.tools:checkstyle:10.14.1'
implementation 'com.google.guava:guava:30.1-jre'
implementation 'org.kohsuke:github-api:1.321'


testImplementation "org.springframework.boot:spring-boot-starter-test"
testImplementation "org.springframework.boot:spring-boot-test"
testImplementation "org.springframework.security:spring-security-test"
Expand All @@ -221,6 +229,10 @@ dependencies {
// jhipster-needle-gradle-dependency - JHipster will add additional dependencies here
}

configurations {
all*.exclude group: 'com.google.guava', module: 'guava'
}

if (project.hasProperty("gae")) {
task createPom {
def basePath = 'build/resources/main/META-INF/maven'
Expand Down
24 changes: 24 additions & 0 deletions checkstyle-temp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">
<module name="Checker">

<!-- Configure checker to use UTF-8 encoding -->
<property name="charset" value="UTF-8"/>
<!-- Configure checker to run on files with these extensions -->
<property name="fileExtensions" value="java"/>

<module name="TreeWalker">
<module name="JavadocMethod"/>
<module name="MethodName"/>
<module name="ParameterName"/>
<module name="LocalVariableName"/>
<!-- Add more modules as needed -->
</module>
<!-- Allow suppression with comments
// CHECKSTYLE:OFF
... ignored content ...
// CHECKSTYLE:ON
-->
<module name="SuppressWithPlainTextCommentFilter"/>
</module>
4 changes: 2 additions & 2 deletions checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<!-- Configure checker to run on files with these extensions -->
<property name="fileExtensions" value=""/>
<!-- For detailed checkstyle configuration, see https://github.com/spring-io/nohttp/tree/master/nohttp-checkstyle -->
<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
</module>
<!-- <module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">-->
<!-- </module>-->
<!-- Allow suppression with comments
// CHECKSTYLE:OFF
... ignored content ...
Expand Down
57 changes: 22 additions & 35 deletions jdls/initial-entities-jdl.jdl
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,32 @@ entity User {
}


entity Assessment {
title String required,
entity Assignment {
description TextBlob,
languageFramework String,
technology String,
image byte[],
url String,
difficultyLevel String,
timeLimit Integer
type String required,
validationCriteria String required,
timeLimit Integer,
question String required,
maxPoints Integer required,
deadline ZonedDateTime required
deadline ZonedDateTime required,
evaluationType String required
}

entity Category {
id Long,
assignmentType String,
image String
}


entity UserAssessment {
status AssessmentStatus required,
entity UserAssignment {
status AssignmentStatus required,
assignedAt Instant required,
deadline Instant
}

enum AssessmentStatus {
enum AssignmentStatus {
ASSIGNED
COMPLETED
}
Expand All @@ -38,32 +42,19 @@ enum AssessmentStatus {
entity Submission {
githubUrl String required,
screenshots ImageBlob,
videoExplanation String,
textDescription String,
feedback TextBlob,
pointsScored Integer
pointsScored Integer,
timeTaken Instant
}

// Relationships
relationship ManyToOne {
Assessment{assignedToUser} to User,
UserAssessment{submittedByUser} to User,
Submission{forAssignment} to UserAssessment
}


entity Question {
questionText TextBlob required,
codeSnippet TextBlob,
resources String,
points Integer
UserAssignment{user} to User,
Submission{forAssignment} to UserAssignment,
Assignment{type} to Category
}

entity ValidationRule {
description TextBlob required,
validationScript TextBlob,
ruleType String required
}

entity SubmissionResult {
totalPoints Integer,
Expand All @@ -79,12 +70,8 @@ entity AuditLog {


relationship ManyToOne {
Question{assessment} to Assessment,
Submission{user} to User,
Submission{assessment} to Assessment,
ValidationRule{assessment} to Assessment,
UserAssessment{user} to User,
UserAssessment{assessment} to Assessment,
UserAssignment{user} to User,
UserAssignment{assignment} to Assignment,
SubmissionResult{submission} to Submission,
AuditLog{user} to User
}
Expand Down
Loading