Skip to content

Commit 1a08ae6

Browse files
committed
refactor: include classroom in get scores api response
1 parent f91fb52 commit 1a08ae6

20 files changed

Lines changed: 193 additions & 786 deletions

File tree

api/model/api/api.go

Lines changed: 1 addition & 500 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/model/model/model.go

Lines changed: 54 additions & 135 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/pack/academic.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ func BuildScore(res *model.Score) *academicModel.Score {
3131
Term: res.Term,
3232
ExamType: res.ExamType,
3333
ElectiveType: res.ElectiveType,
34+
Classroom: res.Classroom,
3435
}
3536
}
3637

api/router/api/api.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/academic/build.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env bash
2+
RUN_NAME="academic"
3+
4+
mkdir -p output/bin
5+
cp script/* output/
6+
chmod +x output/bootstrap.sh
7+
8+
if [ "$IS_SYSTEM_TEST_ENV" != "1" ]; then
9+
go build -o output/bin/${RUN_NAME}
10+
else
11+
go test -c -covermode=set -o output/bin/${RUN_NAME} -coverpkg=./...
12+
fi

cmd/academic/handler.go

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package main
2+
3+
import (
4+
"context"
5+
academic "github.com/west2-online/fzuhelper-server/kitex_gen/academic"
6+
)
7+
8+
// AcademicServiceImpl implements the last service interface defined in the IDL.
9+
type AcademicServiceImpl struct{}
10+
11+
// GetScores implements the AcademicServiceImpl interface.
12+
func (s *AcademicServiceImpl) GetScores(ctx context.Context, req *academic.GetScoresRequest) (resp *academic.GetScoresResponse, err error) {
13+
// TODO: Your code here...
14+
return
15+
}
16+
17+
// GetGPA implements the AcademicServiceImpl interface.
18+
func (s *AcademicServiceImpl) GetGPA(ctx context.Context, req *academic.GetGPARequest) (resp *academic.GetGPAResponse, err error) {
19+
// TODO: Your code here...
20+
return
21+
}
22+
23+
// GetCredit implements the AcademicServiceImpl interface.
24+
func (s *AcademicServiceImpl) GetCredit(ctx context.Context, req *academic.GetCreditRequest) (resp *academic.GetCreditResponse, err error) {
25+
// TODO: Your code here...
26+
return
27+
}
28+
29+
// GetUnifiedExam implements the AcademicServiceImpl interface.
30+
func (s *AcademicServiceImpl) GetUnifiedExam(ctx context.Context, req *academic.GetUnifiedExamRequest) (resp *academic.GetUnifiedExamResponse, err error) {
31+
// TODO: Your code here...
32+
return
33+
}
34+
35+
// GetPlan implements the AcademicServiceImpl interface.
36+
func (s *AcademicServiceImpl) GetPlan(ctx context.Context, req *academic.GetPlanRequest) (resp *academic.GetPlanResponse, err error) {
37+
// TODO: Your code here...
38+
return
39+
}

cmd/academic/script/bootstrap.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#! /usr/bin/env bash
2+
CURDIR=$(cd $(dirname $0); pwd)
3+
4+
if [ "X$1" != "X" ]; then
5+
RUNTIME_ROOT=$1
6+
else
7+
RUNTIME_ROOT=${CURDIR}
8+
fi
9+
10+
export KITEX_RUNTIME_ROOT=$RUNTIME_ROOT
11+
export KITEX_LOG_DIR="$RUNTIME_ROOT/log"
12+
13+
if [ ! -d "$KITEX_LOG_DIR/app" ]; then
14+
mkdir -p "$KITEX_LOG_DIR/app"
15+
fi
16+
17+
if [ ! -d "$KITEX_LOG_DIR/rpc" ]; then
18+
mkdir -p "$KITEX_LOG_DIR/rpc"
19+
fi
20+
21+
exec "$CURDIR/bin/academic"

idl/model.thrift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ struct Score {
110110
6: required string term // 学期
111111
7: required string exam_type // 考试类型
112112
8: required string elective_type // 选修类型
113+
9: required string classroom // 上课地点
113114
}
114115

115116
// 绩点排名

internal/academic/pack/score.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ func BuildScores(data []*jwch.Mark) []*model.Score {
4242
Term: data[i].Semester,
4343
ExamType: data[i].ExamType,
4444
ElectiveType: data[i].ElectiveType,
45+
Classroom: data[i].Classroom,
4546
}
4647
}
4748

@@ -68,6 +69,7 @@ func BuildScoresYjsy(data []*yjsy.Mark) []*model.Score {
6869
Term: data[i].Semester,
6970
ExamType: data[i].ExamType,
7071
ElectiveType: data[i].ElectiveType,
72+
Classroom: data[i].Classroom,
7173
}
7274
}
7375

internal/academic/service/get_scores.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ func (s *AcademicService) handleScoreChange(stuID string, scores []*jwch.Mark) (
189189
Term: scores[i].Semester,
190190
Teacher: scores[i].Teacher,
191191
ElectiveType: scores[i].ElectiveType,
192+
Classroom: scores[i].Classroom,
192193
CourseHash: courseHash,
193194
})
194195
if err != nil {

0 commit comments

Comments
 (0)