Skip to content
Merged
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
60 changes: 30 additions & 30 deletions generated/api.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions generated/external/academic_api/client.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions internal/handler/subject.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ func toSubjectQuery(params api.SubjectsV1ListParams) domain.SubjectQuery {
}

var grade []api.DottoFoundationV1Grade
if params.Grade != nil {
grade = *params.Grade
if params.Grades != nil {
grade = *params.Grades
}

var courses []api.DottoFoundationV1Course
Expand All @@ -63,28 +63,28 @@ func toSubjectQuery(params api.SubjectsV1ListParams) domain.SubjectQuery {
}

var class []api.DottoFoundationV1Class
if params.Class != nil {
class = *params.Class
if params.Classes != nil {
class = *params.Classes
}

var classification []api.DottoFoundationV1SubjectClassification
if params.Classification != nil {
classification = *params.Classification
if params.Classifications != nil {
classification = *params.Classifications
}

var semester []api.DottoFoundationV1CourseSemester
if params.Semester != nil {
semester = *params.Semester
if params.Semesters != nil {
semester = *params.Semesters
}

var requirementType []api.DottoFoundationV1SubjectRequirementType
if params.RequirementType != nil {
requirementType = *params.RequirementType
if params.RequirementTypes != nil {
requirementType = *params.RequirementTypes
}

var culturalSubjectCategory []api.DottoFoundationV1CulturalSubjectCategory
if params.CulturalSubjectCategory != nil {
culturalSubjectCategory = *params.CulturalSubjectCategory
if params.CulturalSubjectCategories != nil {
culturalSubjectCategory = *params.CulturalSubjectCategories
}

return domain.SubjectQuery{
Expand Down
5 changes: 5 additions & 0 deletions openapi/external/academic_api/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1221,11 +1221,16 @@ components:
type: object
required:
- subjectId
- roomIds
properties:
subjectId:
type: string
slot:
$ref: '#/components/schemas/DottoFoundationV1.TimetableSlot'
roomIds:
type: array
items:
type: string
servers:
- url: http://localhost:8080
description: Local
Expand Down
12 changes: 6 additions & 6 deletions openapi/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ paths:
schema:
type: string
explode: false
- name: grade
- name: grades
in: query
required: false
description: 学年
Expand All @@ -199,7 +199,7 @@ paths:
items:
$ref: '#/components/schemas/DottoFoundationV1.Course'
explode: false
- name: class
- name: classes
in: query
required: false
description: クラス; 大学院の学年を選択した場合は選択できない
Expand All @@ -208,7 +208,7 @@ paths:
items:
$ref: '#/components/schemas/DottoFoundationV1.Class'
explode: false
- name: classification
- name: classifications
in: query
required: false
description: '学部: 専門・教養; 大学院: 専門・研究指導'
Expand All @@ -217,7 +217,7 @@ paths:
items:
$ref: '#/components/schemas/DottoFoundationV1.SubjectClassification'
explode: false
- name: semester
- name: semesters
in: query
required: false
description: 開講時期
Expand All @@ -226,7 +226,7 @@ paths:
items:
$ref: '#/components/schemas/DottoFoundationV1.CourseSemester'
explode: false
- name: requirementType
- name: requirementTypes
in: query
required: false
description: 必修・選択・選択必修
Expand All @@ -235,7 +235,7 @@ paths:
items:
$ref: '#/components/schemas/DottoFoundationV1.SubjectRequirementType'
explode: false
- name: culturalSubjectCategory
- name: culturalSubjectCategories
in: query
required: false
description: 教養科目カテゴリ
Expand Down
Loading