simplify files

Author: medvednikov

src/activity_service.v renamed to src/activity.v

@@ -2,6 +2,14 @@ module main
 
 import time
 
+struct Activity {
+mut:
+	id         int       [primary; sql: serial]
+	user_id    int
+	name       string
+	created_at time.Time
+}
+
 fn (app App) add_activity(user_id int, name string) ! {
 	activity := Activity{
 		user_id: user_id

src/activity_entities.v

@@ -3,6 +3,16 @@ module main
 import time
 import git
 
+struct Branch {
+mut:
+	id      int    [primary; sql: serial]
+	repo_id int    [unique: 'branch']
+	name    string [unique: 'branch']
+	author  string // author of latest commit on branch
+	hash    string // hash of latest commit on branch
+	date    int    // time of latest commit on branch
+}
+
 fn (mut app App) fetch_branches(repo Repo) ! {
 	branches_output := repo.git('branch -a')
 

src/admin_service.v renamed to src/admin.v

@@ -4,6 +4,27 @@ module main
 
 import time
 
+struct Commit {
+mut:
+	id         int    [primary; sql: serial]
+	author_id  int
+	author     string
+	hash       string [unique: 'commit']
+	created_at int
+	repo_id    int    [unique: 'commit']
+	branch_id  int    [unique: 'commit']
+	message    string
+}
+
+struct Change {
+mut:
+	file      string
+	additions int
+	deletions int
+	diff      string
+	message   string
+}
+
 fn (commit Commit) relative() string {
 	return time.unix(commit.created_at).relative()
 }

src/avatar_service.v renamed to src/avatar.v

@@ -2,6 +2,17 @@ module main
 
 import time
 
+// now only for commits
+struct FeedItem {
+	id          int
+	author_name string
+	created_at  time.Time
+	repo_name   string
+	repo_owner  string
+	branch_name string
+	message     string
+}
+
 const (
 	feed_items_per_page = 30
 )

src/avatar_service_test.v renamed to src/avatar_test.v

@@ -4,6 +4,23 @@ import time
 import math
 import os
 
+struct File {
+	id                 int    [primary; sql: serial]
+	repo_id            int    [unique: 'file']
+	name               string [unique: 'file']
+	parent_path        string [unique: 'file']
+	is_dir             bool
+	branch             string [unique: 'file']
+	contributors_count int
+	last_hash          string
+	size               int
+	views_count        int
+mut:
+	last_msg  string
+	last_time int
+	commit    Commit [skip]
+}
+
 fn (f File) url() string {
 	file_type := if f.is_dir { 'tree' } else { 'blob' }
 

src/branch_service.v renamed to src/branch.v

@@ -6,6 +6,20 @@ import vweb
 import json
 import net.http
 
+struct OAuthRequest {
+	client_id     string
+	client_secret string
+	code          string
+	state         string
+}
+
+struct GitHubUser {
+	username string [json: 'login']
+	name     string
+	email    string
+	avatar   string [json: 'avatar_url']
+}
+
 ['/oauth']
 pub fn (mut app App) handle_oauth() vweb.Result {
 	code := app.query['code']

src/branch_entities.v

@@ -2,6 +2,15 @@ module main
 
 import vweb
 
+struct LangStat {
+	id          int    [primary; sql: serial]
+	repo_id     int    [unique: 'langstat']
+	name        string [unique: 'langstat']
+	lines_count int
+	pct         int // out of 1000
+	color       string
+}
+
 const (
 	test_lang_stats = [
 		LangStat{

src/commit_service.v renamed to src/commit.v

@@ -2,6 +2,18 @@ module main
 
 import time
 
+struct Release {
+	id      int [primary; sql: serial]
+	repo_id int [unique: 'release']
+mut:
+	tag_id   int       [unique: 'release']
+	notes    string
+	tag_name string    [skip]
+	tag_hash string    [skip]
+	user     string    [skip]
+	date     time.Time
+}
+
 pub fn (mut app App) add_release(tag_id int, repo_id int, date time.Time, notes string) ! {
 	release := Release{
 		tag_id: tag_id

src/commit_entities.v

@@ -8,6 +8,38 @@ import git
 import highlight
 import validation
 
+struct Repo {
+	id                 int       [primary; sql: serial]
+	git_dir            string
+	name               string
+	user_id            int
+	user_name          string
+	clone_url          string    [skip]
+	primary_branch     string
+	description        string
+	is_public          bool
+	users_contributed  []string  [skip]
+	users_authorized   []string  [skip]
+	topics_count       int       [skip]
+	views_count        int
+	latest_update_hash string    [skip]
+	latest_activity    time.Time [skip]
+mut:
+	webhook_secret     string
+	tags_count         int
+	open_issues_count  int
+	open_prs_count     int
+	releases_count     int
+	branches_count     int
+	stars_count        int
+	lang_stats         []LangStat        [skip]
+	created_at         int
+	contributors_count int
+	labels             []Label           [skip]
+	status             RepoStatus        [skip]
+	msg_cache          map[string]string [skip]
+}
+
 // log_field_separator is declared as constant in case we need to change it later
 const (
 	max_git_res_size    = 1000

src/feed_service.v renamed to src/feed.v

@@ -2,6 +2,29 @@
 // Use of this source code is governed by a GPL license that can be found in the LICENSE file.
 module main
 
+enum SecurityLogKind {
+	registered
+	logged_in
+	registered_via_github
+	logged_in_via_github
+	wrong_password
+	wrong_oauth_state
+	empty_oauth_code
+	empty_oauth_email
+}
+
+struct SecurityLog {
+	id         int    [primary; sql: serial]
+	user_id    int
+	kind_id    int
+	ip         string
+	arg1       string
+	arg2       string
+	created_at int
+mut:
+	kind SecurityLogKind [skip]
+}
+
 fn (mut app App) add_security_log(log SecurityLog) ! {
 	new_log := SecurityLog{
 		...log