commit e2f523987a0b03bbd29fb684b895bdc281b03071 · hailey.at/photocopy

+26 -42
plc_models.go
···

       53
       53
        
       }

     

       54
       54
        
       

     

       55
       55
        
       type ClickhousePLCEntry struct {

     

       56
       56
       -
       	Did                      string    `ch:"did"`

     

       57
       57
       -
       	Cid                      string    `ch:"cid"`

     

       58
       58
       -
       	Nullified                bool      `ch:"nullified"`

     

       59
       59
       -
       	CreatedAt                time.Time `ch:"created_at"`

     

       60
       60
       -
       	PlcOpSig                 string    `ch:"plc_op_sig"`

     

       61
       61
       -
       	PlcOpPrev                *string   `ch:"plc_op_prev"`

     

       62
       62
       -
       	PlcOpType                string    `ch:"plc_op_type"`

     

       63
       63
       -
       	PlcOpServices            string    `ch:"plc_op_services"`

     

       64
       64
       -
       	PlcOpAlsoKnownAs         []string  `ch:"plc_op_also_known_as"`

     

       65
       65
       -
       	PlcOpRotationKeys        []string  `ch:"plc_op_rotation_keys"`

     

       66
       66
       -
       	PlcOpVerificationMethods string    `ch:"plc_op_verification_methods"`

     

       67
       67
       -
       	PlcTombSig               string    `ch:"plc_tomb_sig"`

     

       68
       68
       -
       	PlcTombPrev              string    `ch:"plc_tomb_prev"`

     

       69
       69
       -
       	PlcTombType              string    `ch:"plc_tomb_type"`

     

       70
       70
       -
       	LegacyOpSig              string    `ch:"legacy_op_sig"`

     

       71
       71
       -
       	LegacyOpPrev             string    `ch:"legacy_op_prev"`

     

       72
       72
       -
       	LegacyOpType             string    `ch:"legacy_op_type"`

     

       73
       73
       -
       	LegacyOpHandle           string    `ch:"legacy_op_handle"`

     

       74
       74
       -
       	LegacyOpService          string    `ch:"legacy_op_service"`

     

       75
       75
       -
       	LegacyOpSigningKey       string    `ch:"legacy_op_signing_key"`

     

       76
       76
       -
       	LegacyOpRecoveryKey      string    `ch:"legacy_op_recovery_key"`

     

       56
       56
       +
       	Did                 string    `ch:"did"`

     

       57
       57
       +
       	Cid                 string    `ch:"cid"`

     

       58
       58
       +
       	Nullified           bool      `ch:"nullified"`

     

       59
       59
       +
       	CreatedAt           time.Time `ch:"created_at"`

     

       60
       60
       +
       	PlcOpSig            string    `ch:"plc_op_sig"`

     

       61
       61
       +
       	PlcOpPrev           string    `ch:"plc_op_prev"`

     

       62
       62
       +
       	PlcOpType           string    `ch:"plc_op_type"`

     

       63
       63
       +
       	PlcOpServices       []string  `ch:"plc_op_services"`

     

       64
       64
       +
       	PlcOpAlsoKnownAs    []string  `ch:"plc_op_also_known_as"`

     

       65
       65
       +
       	PlcOpRotationKeys   []string  `ch:"plc_op_rotation_keys"`

     

       66
       66
       +
       	PlcTombSig          string    `ch:"plc_tomb_sig"`

     

       67
       67
       +
       	PlcTombPrev         string    `ch:"plc_tomb_prev"`

     

       68
       68
       +
       	PlcTombType         string    `ch:"plc_tomb_type"`

     

       69
       69
       +
       	LegacyOpSig         string    `ch:"legacy_op_sig"`

     

       70
       70
       +
       	LegacyOpPrev        string    `ch:"legacy_op_prev"`

     

       71
       71
       +
       	LegacyOpType        string    `ch:"legacy_op_type"`

     

       72
       72
       +
       	LegacyOpHandle      string    `ch:"legacy_op_handle"`

     

       73
       73
       +
       	LegacyOpService     string    `ch:"legacy_op_service"`

     

       74
       74
       +
       	LegacyOpSigningKey  string    `ch:"legacy_op_signing_key"`

     

       75
       75
       +
       	LegacyOpRecoveryKey string    `ch:"legacy_op_recovery_key"`

     

       77
       76
        
       }

     

       78
       77
        
       

     

       79
       78
        
       func (o *PLCOperationType) UnmarshalJSON(data []byte) error {

     
···

       134
       133
        
       	if e.Operation.PLCOperation != nil {

     

       135
       134
        
       		pop := e.Operation.PLCOperation

     

       136
       135
        
       		che.PlcOpSig = pop.Sig

     

       137
       137
       -
       		che.PlcOpPrev = pop.Prev

     

       136
       136
       +
       		if pop.Prev != nil {

     

       137
       137
       +
       			che.PlcOpPrev = *pop.Prev

     

       138
       138
       +
       		}

     

       138
       139
        
       		che.PlcOpType = pop.Type

     

       139
       140
        
       		che.PlcOpAlsoKnownAs = pop.AlsoKnownAs

     

       140
       141
        
       		che.PlcOpRotationKeys = pop.RotationKeys

     

       141
       142
        
       		if e.Operation.PLCOperation.Services == nil {

     

       142
       142
       -
       			ps := map[string]PLCService{}

     

       143
       143
       -
       			e.Operation.PLCOperation.Services = ps

     

       144
       144
       -
       		}

     

       145
       145
       -
       

     

       146
       146
       -
       		b, err := json.Marshal(e.Operation.PLCOperation.Services)

     

       147
       147
       -
       		if err != nil {

     

       148
       148
       -
       			return nil, fmt.Errorf("error marshaling services: %w", err)

     

       143
       143
       +
       			for _, s := range e.Operation.PLCOperation.Services {

     

       144
       144
       +
       				che.PlcOpServices = append(che.PlcOpServices, s.Endpoint)

     

       145
       145
       +
       			}

     

       149
       146
        
       		}

     

       150
       150
       -
       		che.PlcOpServices = string(b)

     

       151
       151
       -
       

     

       152
       152
       -
       		if e.Operation.PLCOperation.VerificationMethods == nil {

     

       153
       153
       -
       			vm := map[string]string{}

     

       154
       154
       -
       			e.Operation.PLCOperation.VerificationMethods = vm

     

       155
       155
       -
       		}

     

       156
       156
       -
       

     

       157
       157
       -
       		b, err = json.Marshal(e.Operation.PLCOperation.VerificationMethods)

     

       158
       158
       -
       		if err != nil {

     

       159
       159
       -
       			return nil, fmt.Errorf("error marshaling verification methods: %w", err)

     

       160
       160
       -
       		}

     

       161
       161
       -
       		che.PlcOpVerificationMethods = string(b)

     

       162
       162
       -
       

     

       163
       147
        
       		return che, nil

     

       164
       148
        
       	} else if e.Operation.PLCTombstone != nil {

     

       165
       149
        
       		che.PlcTombSig = e.Operation.PLCTombstone.Sig