quiz grouping

internal/service/quiz_service.go

@@ -73,10 +73,10 @@ func NormalizeContentPath(raw string) string {
 }
 
 // resolveTarget works out what a link points at.
-func (s *QuizService) resolveTarget(ctx context.Context, raw, override string) (kind string, path *string, title string, err error) {
+func (s *QuizService) resolveTarget(ctx context.Context, raw, override string) (kind string, path *string, title string, year *int, err error) {
 	p := NormalizeContentPath(raw)
 	if p == "" {
-		return model.QuizStandalone, nil, "", nil
+		return model.QuizStandalone, nil, "", nil, nil
 	}
 	parts := strings.Split(strings.Trim(p, "/"), "/")
 
@@ -84,13 +84,14 @@ func (s *QuizService) resolveTarget(ctx context.Context, raw, override string) (
 	case len(parts) == 2 && parts[0] == "transcriptions":
 		t, err := s.content.TranscriptBySlug(ctx, parts[1])
 		if err != nil {
-			return "", nil, "", ErrQuizTarget
+			return "", nil, "", nil, ErrQuizTarget
 		}
 		kind = model.QuizLecture
 		if t.Type == "conversation" {
 			kind = model.QuizConversation
 		}
 		title = t.Name
+		year = t.Year
 
 	case len(parts) >= 3 && parts[0] == "books":
 		kind = model.QuizChapter
@@ -110,13 +111,13 @@ func (s *QuizService) resolveTarget(ctx context.Context, raw, override string) (
 		}
 
 	default:
-		return "", nil, "", ErrQuizTarget
+		return "", nil, "", nil, ErrQuizTarget
 	}
 
 	if o := strings.TrimSpace(override); o != "" {
 		title = o
 	}
-	return kind, &p, title, nil
+	return kind, &p, title, year, nil
 }
 
 func validateQuestions(qs []repository.QuestionInput) ([]repository.QuestionInput, error) {
@@ -166,7 +167,7 @@ func (s *QuizService) toInput(ctx context.Context, d QuizDraft, withQuestions bo
 		return in, ErrQuizTitle
 	}
 	var err error
-	if in.TargetKind, in.TargetPath, in.TargetTitle, err = s.resolveTarget(ctx, d.TargetURL, d.TargetTitle); err != nil {
+	if in.TargetKind, in.TargetPath, in.TargetTitle, in.TargetYear, err = s.resolveTarget(ctx, d.TargetURL, d.TargetTitle); err != nil {
 		return in, err
 	}
 	if withQuestions {