Skip to content
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

Jump to bottom

add child questions backend code #146

Merged
merged 17 commits into from
Nov 7, 2024
Merged

add child questions backend code #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
bdb291f
add child questions backend code from pr 138
MaHaWo Nov 6, 2024
4312006
update openapi.json & openapi-ts client
github-actions[bot] Nov 6, 2024
fe73ea3
add get_child and tests
MaHaWo Nov 6, 2024
c9f261f
update openapi.json & openapi-ts client
github-actions[bot] Nov 6, 2024
92e4d62
add tests
MaHaWo Nov 6, 2024
6bb422d
Merge branch 'add-childrenquestion-backend' of github.com:ssciwr/mond…
MaHaWo Nov 6, 2024
3eebee9
start unifying data models for questions, answers
MaHaWo Nov 6, 2024
b73dd50
unify class hierarchy of question, answer models
MaHaWo Nov 6, 2024
2fb4aa7
update openapi.json & openapi-ts client
github-actions[bot] Nov 6, 2024
70a5006
remove remark
MaHaWo Nov 6, 2024
e0a16f4
update openapi.json & openapi-ts client
github-actions[bot] Nov 6, 2024
a859859
correct mistakes and remove redundancies
MaHaWo Nov 7, 2024
0e97b19
adjust tests
MaHaWo Nov 7, 2024
0d9e557
update openapi.json & openapi-ts client
github-actions[bot] Nov 7, 2024
734c396
remove default questions b/c we decided on handling `child` data diff…
MaHaWo Nov 7, 2024
6bae592
add get_db_child function
MaHaWo Nov 7, 2024
c90409d
Merge branch 'add-childrenquestion-backend' of github.com:ssciwr/mond…
MaHaWo Nov 7, 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
246 changes: 200 additions & 46 deletions frontend/src/lib/client/schemas.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,33 @@ export const Body_verify_verify_auth_verify_postSchema = {
title: 'Body_verify_verify_auth_verify_post'
} as const;

export const ChildAnswerPublicSchema = {
properties: {
answer: {
type: 'string',
title: 'Answer'
},
additional_answer: {
anyOf: [
{
type: 'string'
},
{
type: 'null'
}
],
title: 'Additional Answer'
},
question_id: {
type: 'integer',
title: 'Question Id'
}
},
type: 'object',
required: ['answer', 'additional_answer', 'question_id'],
title: 'ChildAnswerPublic'
} as const;

export const ChildCreateSchema = {
properties: {
name: {
Expand Down Expand Up @@ -198,6 +225,131 @@ export const ChildPublicSchema = {
title: 'ChildPublic'
} as const;

export const ChildQuestionAdminSchema = {
properties: {
order: {
type: 'integer',
title: 'Order',
default: 0
},
component: {
type: 'string',
title: 'Component',
default: 'select'
},
type: {
type: 'string',
title: 'Type',
default: 'text'
},
options: {
type: 'string',
title: 'Options',
default: ''
},
additional_option: {
type: 'string',
title: 'Additional Option',
default: ''
},
id: {
type: 'integer',
title: 'Id'
},
text: {
additionalProperties: {
'$ref': '#/components/schemas/ChildQuestionText'
},
type: 'object',
title: 'Text',
default: {}
}
},
type: 'object',
required: ['id'],
title: 'ChildQuestionAdmin'
} as const;

export const ChildQuestionPublicSchema = {
properties: {
id: {
type: 'integer',
title: 'Id'
},
component: {
type: 'string',
title: 'Component',
default: 'select'
},
type: {
type: 'string',
title: 'Type',
default: 'text'
},
text: {
additionalProperties: {
'$ref': '#/components/schemas/QuestionTextPublic'
},
type: 'object',
title: 'Text',
default: {}
},
additional_option: {
type: 'string',
title: 'Additional Option',
default: ''
}
},
type: 'object',
required: ['id'],
title: 'ChildQuestionPublic'
} as const;

export const ChildQuestionTextSchema = {
properties: {
question: {
type: 'string',
title: 'Question',
default: ''
},
options_json: {
type: 'string',
title: 'Options Json',
default: ''
},
options: {
type: 'string',
title: 'Options',
default: ''
},
child_question_id: {
anyOf: [
{
type: 'integer'
},
{
type: 'null'
}
],
title: 'Child Question Id'
},
lang_id: {
anyOf: [
{
type: 'string',
maxLength: 2
},
{
type: 'null'
}
],
title: 'Lang Id'
}
},
type: 'object',
title: 'ChildQuestionText'
} as const;

export const ErrorModelSchema = {
properties: {
detail: {
Expand Down Expand Up @@ -612,16 +764,34 @@ export const MilestoneTextPublicSchema = {
title: 'MilestoneTextPublic'
} as const;

export const QuestionTextPublicSchema = {
properties: {
question: {
type: 'string',
title: 'Question',
default: ''
},
options_json: {
type: 'string',
title: 'Options Json',
default: ''
},
options: {
type: 'string',
title: 'Options',
default: ''
}
},
type: 'object',
title: 'QuestionTextPublic'
} as const;

export const UserAnswerPublicSchema = {
properties: {
answer: {
type: 'string',
title: 'Answer'
},
question_id: {
type: 'integer',
title: 'Question Id'
},
additional_answer: {
anyOf: [
{
Expand All @@ -632,16 +802,15 @@ export const UserAnswerPublicSchema = {
}
],
title: 'Additional Answer'
},
question_id: {
type: 'integer',
title: 'Question Id'
}
},
type: 'object',
required: ['answer', 'question_id', 'additional_answer'],
title: 'UserAnswerPublic',
description: `External data model for UserAnswers

Parameters
----------
SQLModel : Pydantic model basic sqlmodel pydantic type`
required: ['answer', 'additional_answer', 'question_id'],
title: 'UserAnswerPublic'
} as const;

export const UserCreateSchema = {
Expand Down Expand Up @@ -711,13 +880,10 @@ export const UserCreateSchema = {

export const UserQuestionAdminSchema = {
properties: {
id: {
type: 'integer',
title: 'Id'
},
order: {
type: 'integer',
title: 'Order'
title: 'Order',
default: 0
},
component: {
type: 'string',
Expand All @@ -731,7 +897,17 @@ export const UserQuestionAdminSchema = {
},
options: {
type: 'string',
title: 'Options'
title: 'Options',
default: ''
},
additional_option: {
type: 'string',
title: 'Additional Option',
default: ''
},
id: {
type: 'integer',
title: 'Id'
},
text: {
additionalProperties: {
Expand All @@ -740,15 +916,10 @@ export const UserQuestionAdminSchema = {
type: 'object',
title: 'Text',
default: {}
},
additional_option: {
type: 'string',
title: 'Additional Option',
default: ''
}
},
type: 'object',
required: ['id', 'order', 'options'],
required: ['id'],
title: 'UserQuestionAdmin'
} as const;

Expand All @@ -770,7 +941,7 @@ export const UserQuestionPublicSchema = {
},
text: {
additionalProperties: {
'$ref': '#/components/schemas/UserQuestionTextPublic'
'$ref': '#/components/schemas/QuestionTextPublic'
},
type: 'object',
title: 'Text',
Expand Down Expand Up @@ -799,6 +970,11 @@ export const UserQuestionTextSchema = {
title: 'Options Json',
default: ''
},
options: {
type: 'string',
title: 'Options',
default: ''
},
user_question_id: {
anyOf: [
{
Expand All @@ -821,34 +997,12 @@ export const UserQuestionTextSchema = {
}
],
title: 'Lang Id'
},
options: {
type: 'string',
title: 'Options',
default: ''
}
},
type: 'object',
title: 'UserQuestionText'
} as const;

export const UserQuestionTextPublicSchema = {
properties: {
question: {
type: 'string',
title: 'Question',
default: ''
},
options_json: {
type: 'string',
title: 'Options Json',
default: ''
}
},
type: 'object',
title: 'UserQuestionTextPublic'
} as const;

export const UserReadSchema = {
properties: {
id: {
Expand Down
Loading