From 82f8b4d838de3fb8eda5db9b23c5bc48ab281f9e Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Sat, 26 May 2018 16:42:17 -0700 Subject: remove golang API server Not following that path; this is to prevent future confusion. All code is still in version control. --- golang/api/handlers/editing.go | 96 ------------------------- golang/api/handlers/entities.go | 151 ---------------------------------------- 2 files changed, 247 deletions(-) delete mode 100644 golang/api/handlers/editing.go delete mode 100644 golang/api/handlers/entities.go (limited to 'golang/api') diff --git a/golang/api/handlers/editing.go b/golang/api/handlers/editing.go deleted file mode 100644 index 5c267e9e..00000000 --- a/golang/api/handlers/editing.go +++ /dev/null @@ -1,96 +0,0 @@ - -package handlers - -import ( - "github.com/go-pg/pg" - //"github.com/go-openapi/swag" - "github.com/go-openapi/runtime/middleware" - //log "github.com/sirupsen/logrus" - - //"git.archive.org/bnewbold/fatcat/golang/gen/models" - "git.archive.org/bnewbold/fatcat/golang/gen/restapi/operations" -) - -type Editor struct { - Id int64 - Username string - IsAdmin bool - ActiveEditgroupId int64 - ActiveEditgroup *Editgroup -} - -type Editgroup struct { - Id int64 - ExtraJson string - EditorId int64 - Editor *Editor - Description string -} - -type Changelog struct { - Id int64 - EditgroupId int64 - Editgroup *Editgroup - Timestamp string // XXX: timestamp -} - -func GetOrCreateEditgroup() Editgroup { - // XXX - eg := Editgroup{} - return eg -} - -//// -func NewGetEditorUsernameHandler(db *pg.DB) operations.GetEditorUsernameHandler { - return &getEditorUsername{db: db} -} -type getEditorUsername struct { - db *pg.DB -} -func (d *getEditorUsername) Handle(params operations.GetEditorUsernameParams) middleware.Responder { - return middleware.NotImplemented("operation .PostCreatorID has not yet been implemented") -} - -//// -func NewGetEditorUsernameChangelogHandler(db *pg.DB) operations.GetEditorUsernameChangelogHandler { - return &getEditorUsernameChangelog{db: db} -} -type getEditorUsernameChangelog struct { - db *pg.DB -} -func (d *getEditorUsernameChangelog) Handle(params operations.GetEditorUsernameChangelogParams) middleware.Responder { - return middleware.NotImplemented("operation .PostCreatorID has not yet been implemented") -} - -//// -func NewGetEditgroupIDHandler(db *pg.DB) operations.GetEditgroupIDHandler { - return &getEditgroupID{db: db} -} -type getEditgroupID struct { - db *pg.DB -} -func (d *getEditgroupID) Handle(params operations.GetEditgroupIDParams) middleware.Responder { - return middleware.NotImplemented("operation .PostCreatorID has not yet been implemented") -} - -//// -func NewPostEditgroupHandler(db *pg.DB) operations.PostEditgroupHandler { - return &postEditgroup{db: db} -} -type postEditgroup struct { - db *pg.DB -} -func (d *postEditgroup) Handle(params operations.PostEditgroupParams) middleware.Responder { - return middleware.NotImplemented("operation .PostEditgroupID has not yet been implemented") -} - -//// -func NewPostEditgroupIDAcceptHandler(db *pg.DB) operations.PostEditgroupIDAcceptHandler { - return &postEditgroupIDAccept{db: db} -} -type postEditgroupIDAccept struct { - db *pg.DB -} -func (d *postEditgroupIDAccept) Handle(params operations.PostEditgroupIDAcceptParams) middleware.Responder { - return middleware.NotImplemented("operation .PostEditgroupIDAcceptID has not yet been implemented") -} diff --git a/golang/api/handlers/entities.go b/golang/api/handlers/entities.go deleted file mode 100644 index 708aebdf..00000000 --- a/golang/api/handlers/entities.go +++ /dev/null @@ -1,151 +0,0 @@ - -package handlers - -import ( - "github.com/go-pg/pg" - "github.com/go-openapi/swag" - "github.com/go-openapi/runtime/middleware" - log "github.com/sirupsen/logrus" - - "git.archive.org/bnewbold/fatcat/golang/gen/models" - "git.archive.org/bnewbold/fatcat/golang/gen/restapi/operations" -) - -type CreatorRev struct { - Id int64 - ExtraJson string - Name string - Orcid string - tableName struct{} `sql:"creator_rev"` -} - -type CreatorIdent struct { - Id string - IsLive bool - RevId int64 - Rev *CreatorRev - RedirectId string - Redirect *CreatorIdent - tableName struct{} `sql:"creator_ident"` -} - -type CreatorEdit struct { - Id int64 - ExtraJson string - IdentId string - Ident *CreatorIdent - RevId int64 - Rev *CreatorRev - RedirectId string - Redirect *CreatorIdent - EditgroupId int64 - Editgroup *Editgroup - tableName struct{} `sql:"creator_edit"` -} - -func (ci *CreatorIdent) State() string { - if ci.IsLive && (ci.RedirectId == "") && (ci.RevId == 0) { - return "deleted" - } else if ci.IsLive && (ci.RedirectId != "") { - return "redirect" - } else if ci.IsLive && (ci.RedirectId == "") && (ci.RevId != 0) { - return "active" - } else if !ci.IsLive && (ci.RedirectId == "") && (ci.RevId != 0) { - return "wip" - } else { - log.Fatalf("Invalid CreatorIdent state: %v", ci) - panic("fail") - } -} - -//// -func NewGetCreatorIDHandler(db *pg.DB) operations.GetCreatorIDHandler { - return &getCreatorID{db: db} -} -type getCreatorID struct { - db *pg.DB -} -func (d *getCreatorID) Handle(params operations.GetCreatorIDParams) middleware.Responder { - // "get or 404" using params.ID. join creator_ident and creator_rev. - // populate result data - // return that - db_entity_ident := &CreatorIdent{} - err := d.db.Model(db_entity_ident). - Column("creator_ident.*", "Rev"). - Where("creator_ident.id = ?", swag.StringValue(¶ms.ID)). - First() - if err == pg.ErrNoRows { - return operations.NewGetCreatorIDNotFound().WithPayload(&models.Error{Message: swag.String("no such entity")}) - } else if err != nil { - log.Fatal(err) - } - api_entity := &models.CreatorEntity{ - Ident: db_entity_ident.Id, - State: db_entity_ident.State(), - Name: db_entity_ident.Rev.Name, - Orcid: db_entity_ident.Rev.Orcid, - } - return operations.NewGetCreatorIDOK().WithPayload(api_entity) -} - -//// -func NewGetCreatorLookupHandler(db *pg.DB) operations.GetCreatorLookupHandler { - return &getCreatorLookup{db: db} -} -type getCreatorLookup struct { - db *pg.DB -} -func (d *getCreatorLookup) Handle(params operations.GetCreatorLookupParams) middleware.Responder { - // get-or-create editgroup based on current editor (session) - // insert new rev, ident, and edit - return middleware.NotImplemented("operation .GetCreatorLookup has not yet been implemented") -} - -//// -func NewPostCreatorHandler(db *pg.DB) operations.PostCreatorHandler { - return &postCreator{db: db} -} -type postCreator struct { - db *pg.DB -} -func (d *postCreator) Handle(params operations.PostCreatorParams) middleware.Responder { - // get-or-create editgroup based on current editor (session) - var eg Editgroup - if true { - eg = Editgroup{Id: 1} - } else { - eg = GetOrCreateEditgroup() - } - ce := CreatorEdit{} - - // big honking SQL to update 3 tables in a single INSERT - _, err := d.db.QueryOne( - //Model(ce).ExecOne( - &ce, - `WITH rev AS ( INSERT INTO creator_rev (name, orcid) - VALUES (?, ?) - RETURNING id ), - ident AS ( INSERT INTO creator_ident (rev_id) - VALUES ((SELECT rev.id FROM rev)) - RETURNING id ) - INSERT INTO creator_edit (editgroup_id, ident_id, rev_id) VALUES - (?, (SELECT ident.id FROM ident), (SELECT rev.id FROM rev)) - RETURNING *`, - params.Body.Name, - params.Body.Orcid, - eg.Id) - if err != nil { - log.Fatal(err) - } - if err != nil { - log.Fatal(err) - } - // redirect? or return the edit? - api_edit:= models.EntityEdit { - ID: ce.Id, - Ident: ce.IdentId, - Revision: ce.RevId, - EditgroupID: ce.EditgroupId, - } - return operations.NewPostCreatorCreated().WithPayload(&api_edit) -} -- cgit v1.2.3